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.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 {
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 client => "deliantra",
752 client => "$DC::VERSION $] $^O", 812 clientversion => $DC::VERSION,
753 813
754 map_widget => $MAPWIDGET, 814 map_widget => $MAPWIDGET,
755 statusbox => $STATUSBOX, 815 statusbox => $STATUSBOX,
756 map => $MAP, 816 map => $MAP,
757 mapmap => $MAPMAP, 817 mapmap => $MAPMAP,
763 823
764 on_connect => sub { 824 on_connect => sub {
765 if ($_[0]) { 825 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 826 DC::lowdelay fileno $CONN->{fh};
767 827
768 status "login successful"; 828 status "successfully connected to the server";
769 } else { 829 } else {
770 undef $CONN; 830 undef $CONN;
771 status "unable to connect: $!"; 831 status "unable to connect: $!";
772 stop_game(); 832 stop_game();
773 } 833 }
775 ; 835 ;
776} 836}
777 837
778sub start_game { 838sub start_game {
779 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.";
780 844
781 $LOGIN_BUTTON->set_text ("Logout"); 845 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide; 846 $SETUP_DIALOG->hide;
783
784 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
785 847
786 $MAP = new DC::Map; 848 $MAP = new DC::Map;
787 849
788 # hack to make SURE we find the IP address all right 850 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable. 851 # can be removed once AnyEvent::DNS is proven stable.
790 if ($host eq "gameserver.deliantra.net") { 852 if ($host eq "gameserver.deliantra.net") {
791 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 853 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792 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) {
793 status "dns failure, using hardcoded address"; 858 status "dns failure, using hardcoded address";
794 $host = "129.13.162.95"; 859 $host = "129.13.162.95";
860 }
795 } 861 }
796 862
797 dc_connect $host, $port; 863 dc_connect $host, $port;
798 }; 864 };
799 } else { 865 } else {
800 dc_connect $host, $port; 866 dc_connect $host, $port;
801 } 867 }
802} 868}
803 869
804sub stop_game { 870sub stop_game {
871 crash "stop_game";
872
805 $LOGIN_BUTTON->set_text ("Login / Register"); 873 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 874 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 875 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 876 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 877 $SPELL_LIST->clear_spells;
823} 891}
824 892
825sub graphics_setup { 893sub graphics_setup {
826 my $vbox = new DC::UI::VBox; 894 my $vbox = new DC::UI::VBox;
827 895
896 {
897 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
898
828 $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]);
829 900
830 my $row = 0; 901 my $row = 0;
831 902
832 $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");
833 $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,
834 can_events => 1, 905 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 906 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 907
837 $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");
838 $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,
839 can_events => 1, 910 can_events => 1,
840 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 "
841 . "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 "
842 . "by selecting a different video mode, changing the settings below or " 913 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card."); 914 . "by installing the right driver for your graphics card.");
844 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
845 my $vidmode_tooltip = 929 my $vidmode_tooltip =
846 "<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). "
847 . "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>.";
848 932
849 $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");
850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 934 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 935
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 936 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
937 c_rescale => 1,
853 force_w => $WIDTH * 0.1, expand => 1, 938 force_w => $WIDTH * 0.1, expand => 1,
854 range => [ ($CFG->{sdl_mode}) x 3 ], 939 range => [ ($CFG->{sdl_mode}) x 3 ],
855 tooltip => $vidmode_tooltip); 940 tooltip => $vidmode_tooltip);
856 $hbox->add (my $mode_label = new DC::UI::Label 941 $hbox->add (my $mode_label = new DC::UI::Label
857 height => 0.8, template => "9999x9999@9+9", 942 height => 0.8, template => "9999x9999@9+9",
858 can_events => 1, tooltip => $vidmode_tooltip); 943 can_events => 1, tooltip => $vidmode_tooltip);
859 944
860 $MODE_SLIDER->connect (changed => sub { 945 $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) = @_; 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) = @_;
898 $CFG->{disable_alpha} = $value; 983 $CFG->{disable_alpha} = $value;
899 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 984 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
985 0
900 0 986 }
901 } 987 );
902 );
903 988
904 $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");
905 $table->add_at (1, $row++, new DC::UI::CheckBox 990 $table->add_at (1, $row++, new DC::UI::CheckBox
906 state => $CFG->{texture_compression}, 991 state => $CFG->{texture_compression},
907 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 "
908 . "will save a lot of memory and increase performance. The compression algorithm " 993 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
909 . "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 "
910 . "forced OpenGL 1.1 mode.", 995 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
912 ); 997 );
913 998
914 $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");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 1000 $table->add_at (1, $row++, new DC::UI::CheckBox
916 state => $CFG->{fast}, 1001 state => $CFG->{fast},
917 tooltip => "Lower the visual quality considerably to speed up rendering.", 1002 tooltip => "Lower the visual quality considerably to speed up rendering.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1003 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
919 ); 1004 );
920 1005
921 $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");
922 $table->add_at (1, $row++, new DC::UI::Slider 1007 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1008 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.", 1009 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 }, 1010 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
926 ); 1011 );
927 1012
928 $table->add_at (1, $row++, new DC::UI::Button 1013 $table->add_at (1, $row++, new DC::UI::Button
929 expand => 1, text => "Apply", 1014 expand => 1, text => "Apply",
930 tooltip => "Apply the video settings above.", 1015 tooltip => "Apply the video settings above.",
931 on_activate => sub { 1016 on_activate => sub {
932 video_shutdown (); 1017 video_shutdown ();
933 video_init (); 1018 video_init ();
1019 0
934 0 1020 }
935 } 1021 );
936 ); 1022 }
937 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;
938 $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");
939 $table->add_at (1, $row++, new DC::UI::CheckBox 1031 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{smooth_movement}, 1032 state => $CFG->{smooth_movement},
941 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. "
942 . "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, "
943 . "then disable this option. Changes take effect immdiately.", 1035 . "then disable this option. Changes take effect immdiately.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
945 ); 1037 );
946 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
947 $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");
948 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1051 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
950 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1052 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
951 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 }
952 ); 1054 );
953 1055
954 $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");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 1057 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{map_smoothing}, 1058 state => $CFG->{map_smoothing},
957 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. "
958 . "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. "
959 . "Changes take effect at next login only.", 1061 . "Changes take effect at next login only.",
960 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1062 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
961 ); 1063 );
962 1064
963 $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");
964 $table->add_at (1, $row++, new DC::UI::CheckBox 1066 $table->add_at (1, $row++, new DC::UI::CheckBox
965 state => $CFG->{fow_enable}, 1067 state => $CFG->{fow_enable},
966 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.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1069 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
968 ); 1070 );
969 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
970 $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");
971 $table->add_at (1, $row++, new DC::UI::Slider 1088 $table->add_at (1, $row++, new DC::UI::Slider
972 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1089 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.", 1090 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 } 1091 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
975 ); 1092 );
976 1093
977 $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");
978 $table->add_at (1, $row++, new DC::UI::Slider 1095 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1096 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, " 1097 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.", 1098 . "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 }, 1099 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
983 ); 1100 );
984 1101
985 $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");
986 $table->add_at (1, $row++, new DC::UI::Slider 1103 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1104 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.", 1105 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
989 on_changed => sub { 1106 on_changed => sub {
990 $CFG->{gauge_fontsize} = $_[1]; 1107 $CFG->{gauge_fontsize} = $_[1];
991 &set_gauge_window_fontsize; 1108 &set_gauge_window_fontsize;
1109 0
992 0 1110 }
993 } 1111 );
994 );
995 1112
996 $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");
997 $table->add_at (1, $row++, new DC::UI::Slider 1114 $table->add_at (1, $row++, new DC::UI::Slider
998 range => [$CFG->{gauge_size}, 0.2, 0.8], 1115 range => [$CFG->{gauge_size}, 0.2, 0.8],
999 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.",
1000 on_changed => sub { 1117 on_changed => sub {
1001 $CFG->{gauge_size} = $_[1]; 1118 $CFG->{gauge_size} = $_[1];
1002 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1119 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1120 0
1003 0 1121 }
1004 } 1122 );
1005 ); 1123 }
1006 1124
1007 $vbox 1125 $vbox
1008} 1126}
1009 1127
1010our $AUDIO_HW_CHUNKSIZE; 1128our $AUDIO_HW_CHUNKSIZE;
1023 1141
1024 my $text = !$freq 1142 my $text = !$freq
1025 ? "audio is off" 1143 ? "audio is off"
1026 : "audio is enabled\n" 1144 : "audio is enabled\n"
1027 . "frequency (Hz): $freq\n" 1145 . "frequency (Hz): $freq\n"
1028 . "channels: $chans"; 1146 . "channels: $chans\n"
1147 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1148 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1029 1149
1030 $AUDIO_INFO->set_text ($text); 1150 $AUDIO_INFO->set_text ($text);
1031} 1151}
1032 1152
1033sub audio_setup { 1153sub audio_setup {
1173} 1293}
1174 1294
1175sub make_gauge_window { 1295sub make_gauge_window {
1176 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1296 my $gh = int $HEIGHT * $CFG->{gauge_size};
1177 1297
1178 my $win = new DC::UI::Frame ( 1298 $GAUGES->{win} = my $win = new DC::UI::Frame (
1179 force_x => 0, 1299 force_x => 0,
1180 force_y => "max", 1300 force_y => "max",
1181 force_w => $WIDTH, 1301 force_w => $WIDTH,
1182 force_h => $gh, 1302 force_h => $gh,
1183 ); 1303 );
1199 (new DC::UI::Empty expand => 1), 1319 (new DC::UI::Empty expand => 1),
1200 (my $hb = new DC::UI::HBox), 1320 (my $hb = new DC::UI::HBox),
1201 ], 1321 ],
1202 ); 1322 );
1203 1323
1204 $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");
1205 $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");
1206 $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");
1207 $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");
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 1328
1220 &set_gauge_window_fontsize; 1329 &set_gauge_window_fontsize;
1221 1330
1222 $win 1331 $win
1223} 1332}
1564 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]),
1565 ); 1674 );
1566 1675
1567 $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");
1568 $table->add_at (1, 4, new DC::UI::Entry 1677 $table->add_at (1, 4, new DC::UI::Entry
1569 text => $CFG->{profile}{default}{user}, 1678 text => $PROFILE->{user},
1570 tooltip => "The name of your character on the server.", 1679 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 } 1680 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1572 ); 1681 );
1573 1682
1574 $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");
1575 $table->add_at (1, 5, new DC::UI::Entry 1684 $table->add_at (1, 5, new DC::UI::Entry
1576 text => $CFG->{profile}{default}{password}, 1685 text => $PROFILE->{password},
1577 hidden => 1, 1686 hidden => 1,
1578 tooltip => "The password for your character.", 1687 tooltip => "The password for your character.",
1579 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1688 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1580 ); 1689 );
1581 1690
1582 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1691 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1583 expand => 1, 1692 expand => 1,
1584 text => "Login / Register", 1693 text => "Login / Register",
1589 1 1698 1
1590 }, 1699 },
1591 ); 1700 );
1592 1701
1593 $vbox->add (new DC::UI::FancyFrame 1702 $vbox->add (new DC::UI::FancyFrame
1594 label => "Registering", 1703 label => "How to Play",
1595 min_h => 200, 1704 min_h => 240,
1596 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1705 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597 markup => 1706 markup =>
1707 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1708 . "Then register a new account (or use an existing one if you have one). "
1598 "To register a new account, choose a username that hasn't been taken yet and " 1709 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1599 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1710 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1600 ), 1711 ),
1601 ); 1712 );
1602 1713
1603 $vbox 1714 $vbox
1618 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1729 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1619 1730
1620 $vbox->add ( 1731 $vbox->add (
1621 $HOST_ENTRY = new DC::UI::Entry 1732 $HOST_ENTRY = new DC::UI::Entry
1622 expand => 1, 1733 expand => 1,
1623 text => $CFG->{profile}{default}{host}, 1734 text => $PROFILE->{host},
1624 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>)",
1625 on_changed => sub { 1736 on_changed => sub {
1626 my ($self, $value) = @_; 1737 my ($self, $value) = @_;
1627 $CFG->{profile}{default}{host} = $value; 1738 $PROFILE->{host} = $value;
1628 1 1739 1
1629 } 1740 }
1630 ); 1741 );
1631 1742
1632 if (0) { #d# disabled 1743 if (0) { #d# disabled
1675 1786
1676 my $row = 0; 1787 my $row = 0;
1677 1788
1678 $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");
1679 $table->add_at (1, $row++, new DC::UI::CheckBox 1790 $table->add_at (1, $row++, new DC::UI::CheckBox
1791 c_colspan => 2,
1680 state => $CFG->{show_tips}, 1792 state => $CFG->{show_tips},
1681 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?",
1682 on_changed => sub { 1794 on_changed => sub {
1683 my ($self, $value) = @_; 1795 my ($self, $value) = @_;
1684 $CFG->{show_tips} = $value; 1796 $CFG->{show_tips} = $value;
1686 } 1798 }
1687 ); 1799 );
1688 1800
1689 $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");
1690 $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,
1691 text => $CFG->{logview_max_par}, 1804 text => $CFG->{logview_max_par},
1692 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 "
1693 . "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 "
1694 . "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.",
1695 on_changed => sub { 1808 on_changed => sub {
1697 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1810 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1698 0 1811 0
1699 }, 1812 },
1700 ); 1813 );
1701 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
1702 $table 1837 $table
1703} 1838}
1704 1839
1705sub autopickup_setup { 1840sub autopickup_setup {
1706 my $r = new DC::UI::ScrolledWindow ( 1841 my $r = new DC::UI::ScrolledWindow (
1712 col_expand => [0, 1, 0, 1], 1847 col_expand => [0, 1, 0, 1],
1713 ); 1848 );
1714 1849
1715 for ( 1850 for (
1716 ["General", 0, 0, 1851 ["General", 0, 0,
1717 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1718 ["Inhibit autopickup" => PICKUP_INHIBIT], 1852# ["Inhibit autopickup" => PICKUP_INHIBIT],
1719 ["Stop before pickup" => PICKUP_STOP], 1853 ["Stop before pickup" => PICKUP_STOP],
1720 ["Debug autopickup" => PICKUP_DEBUG], 1854 ["Debug autopickup" => PICKUP_DEBUG],
1721 ], 1855 ],
1722 ["Weapons", 0, 6, 1856 ["Weapons", 0, 6,
1723 ["All weapons" => PICKUP_ALLWEAPON], 1857 ["All weapons" => PICKUP_ALLWEAPON],
1771 $::CFG->{pickup} |= $mask; 1905 $::CFG->{pickup} |= $mask;
1772 } else { 1906 } else {
1773 $::CFG->{pickup} &= ~$mask; 1907 $::CFG->{pickup} &= ~$mask;
1774 } 1908 }
1775 1909
1776 $::CONN->send_command ("pickup $::CFG->{pickup}") 1910 $::CONN->send_pickup ($::CFG->{pickup})
1777 if defined $::CONN; 1911 if defined $::CONN;
1778 1912
1779 0 1913 0
1780 }); 1914 });
1781 1915
1798 }); 1932 });
1799 1933
1800 $table->add_at (3, 18, new DC::UI::Button 1934 $table->add_at (3, 18, new DC::UI::Button
1801 text => "set", 1935 text => "set",
1802 on_activate => sub { 1936 on_activate => sub {
1803 $::CONN->send_command ("pickup $::CFG->{pickup}") 1937 $::CONN->send_pickup ($::CFG->{pickup})
1804 if defined $::CONN; 1938 if defined $::CONN;
1805 0 1939 0
1806 }); 1940 });
1807 1941
1808 $r 1942 $r
1809} 1943}
1810 1944
1811my %SORT_ORDER = ( 1945my %SORT_ORDER = (
1812 type => sub { 1946 type => sub {
1947 use sort 'stable';
1813 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1948 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1814 }, 1949 },
1815 mtime => sub { 1950 mtime => sub {
1951 use sort 'stable';
1816 my $NOW = time; 1952 my $NOW = time;
1817 sort { 1953 sort {
1818 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;
1819 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;
1820 1956
1821 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1957 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1822 or $btime <=> $atime 1958 or $btime <=> $atime
1823 or $a->{type} <=> $b->{type} 1959 or $a->{type} <=> $b->{type}
1824 } @_ 1960 } @_
1825 }, 1961 },
1826 weight => sub { sort { 1962 weight => sub {
1963 use sort 'stable';
1964 sort {
1827 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1965 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1828 or $a->{type} <=> $b->{type} 1966 or $a->{type} <=> $b->{type}
1829 } @_ }, 1967 } @_
1968 },
1830); 1969);
1831 1970
1832sub inventory_widget { 1971sub inventory_widget {
1833 my $hb = new DC::UI::HBox homogeneous => 1; 1972 my $hb = new DC::UI::HBox homogeneous => 1;
1834 1973
1921 $PL_NOTEBOOK->set_current_page ($widget); 2060 $PL_NOTEBOOK->set_current_page ($widget);
1922 $PL_WINDOW->show; 2061 $PL_WINDOW->show;
1923 } 2062 }
1924} 2063}
1925 2064
1926sub player_window { 2065sub make_playerbook {
1927 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2066 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1928 x => "center", 2067 x => "center",
1929 y => "center", 2068 y => "center",
1930 force_w => $WIDTH * 9/10, 2069 force_w => $WIDTH * 9/10,
1931 force_h => $HEIGHT * 9/10, 2070 force_h => $HEIGHT * 9/10,
1965 "License, Author and Source info for media sent by the server."); 2104 "License, Author and Source info for media sent by the server.");
1966 2105
1967 $ntb->set_current_page ($INVENTORY_PAGE); 2106 $ntb->set_current_page ($INVENTORY_PAGE);
1968 2107
1969 $plwin->add ($ntb); 2108 $plwin->add ($ntb);
1970 $plwin
1971} 2109}
1972 2110
1973sub keyboard_setup { 2111sub keyboard_setup {
1974 DC::Macro::keyboard_setup 2112 DC::Macro::keyboard_setup
1975} 2113}
1976 2114
1977sub help_window { 2115sub make_help_window {
1978 my $win = new DC::UI::Toplevel 2116 my $win = new DC::UI::Toplevel
1979 x => 'center', 2117 x => 'center',
1980 y => 'center', 2118 y => 'center',
1981 z => 4, 2119 z => 4,
1982 name => 'doc_browser', 2120 name => 'doc_browser',
2071 2209
2072 $load_node->((DC::Pod::find @path)[0]); 2210 $load_node->((DC::Pod::find @path)[0]);
2073 $win->show; 2211 $win->show;
2074 }; 2212 };
2075 2213
2076 $win 2214 $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} 2215}
2099 2216
2100sub open_quit_dialog { 2217sub open_quit_dialog {
2101 unless ($QUIT_DIALOG) { 2218 unless ($QUIT_DIALOG) {
2102 $QUIT_DIALOG = new DC::UI::Toplevel 2219 $QUIT_DIALOG = new DC::UI::Toplevel
2124 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2241 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2125 ); 2242 );
2126 $hb->add (new DC::UI::Button 2243 $hb->add (new DC::UI::Button
2127 text => "Quit anyway", 2244 text => "Quit anyway",
2128 expand => 1, 2245 expand => 1,
2129 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2246 on_activate => sub {
2247 crash "Quit anyway";
2248 EV::unloop EV::UNLOOP_ALL;
2249 },
2130 ); 2250 );
2131 } 2251 }
2132 2252
2133 $QUIT_DIALOG->show; 2253 $QUIT_DIALOG->show;
2134 $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;
2135} 2363}
2136 2364
2137sub show_tip_of_the_day { 2365sub show_tip_of_the_day {
2138 # find all tips 2366 # find all tips
2139 my @tod = DC::Pod::find tip_of_the_day => "*"; 2367 my @tod = DC::Pod::find tip_of_the_day => "*";
2192 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2420 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2193 and die "SDL::Init failed!\n"; 2421 and die "SDL::Init failed!\n";
2194} 2422}
2195 2423
2196sub video_init { 2424sub video_init {
2425 DC::set_theme $CFG->{uitheme};
2426
2197 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2427 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2198 $SDL_REINIT = 0; 2428 $SDL_REINIT = 0;
2199 2429
2200 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2430 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2201 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2431 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2202 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2432 @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)"; 2433 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2204 2434
2205 @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;
2206 2436
2207 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2437 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2208 $CFG->{sdl_mode} = 0; 2438 $CFG->{sdl_mode} = 0; # lowest resolution by default
2439
2440 # now choose biggest mode <= 1024x768
2209 for (reverse 0 .. $#SDL_MODES) { 2441 for (0 .. $#SDL_MODES) {
2210 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2442 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2443 $CFG->{sdl_mode} = $_;
2444 }
2211 } 2445 }
2212 } 2446 }
2213 2447
2214 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2448 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2215 2449
2216 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2450 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2217 $FULLSCREEN = $CFG->{fullscreen}; 2451 $FULLSCREEN = $CFG->{fullscreen};
2218 $FAST = $CFG->{fast}; 2452 $FAST = $CFG->{fast};
2219 2453
2454 # 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 2455 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2456 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2221 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2457 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2222 2458
2223 $SDL_ACTIVE = 1; 2459 $SDL_ACTIVE = 1;
2224 $LAST_REFRESH = time - 0.01; 2460 $LAST_REFRESH = time - 0.01;
2225 2461
2272 2508
2273 (new DC::UI::Frame 2509 (new DC::UI::Frame
2274 bg => [0, 0, 0, 0.4], 2510 bg => [0, 0, 0, 0.4],
2275 force_x => 0, 2511 force_x => 0,
2276 force_y => "max", 2512 force_y => "max",
2277 child => (my $LR = new DC::UI::VBox), 2513 child => (my $LL = new DC::UI::VBox),
2278 )->show; 2514 )->show;
2279 2515
2280 $LR->add ($STATUSBOX); 2516 $LL->add ($STATUSBOX);
2281 $LR->add ($MODBOX); 2517 $LL->add ($MODBOX);
2282 $LR->add (new DC::UI::Label 2518 $LL->add (new DC::UI::Label
2283 align => 0, 2519 align => 0,
2284 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2520 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2285 fontsize => 0.5, 2521 fontsize => 0.5,
2286 fg => [1, 1, 0, 0.7], 2522 fg => [1, 1, 0, 0.7],
2287 ); 2523 );
2288 2524
2289 DC::UI::Toplevel->new ( 2525 DC::UI::Toplevel->new (
2290 title => "Minimap", 2526 title => "Minimap",
2291 name => "mapmap", 2527 name => "mapmap",
2292 x => 0, 2528 x => 0,
2293 y => $FONTSIZE + 8, 2529 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2294 border_bg => [1, 1, 1, 192/255], 2530 border_bg => [1, 1, 1, 192/255],
2295 bg => [1, 1, 1, 0], 2531 bg => [1, 1, 1, 0],
2296 child => ($MAPMAP = new DC::MapWidget::MapMap 2532 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.", 2533 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2298 ), 2534 ),
2299 )->show; 2535 )->show;
2300 2536
2301 $MAPWIDGET = new DC::MapWidget; 2537 $MAPWIDGET = new DC::MapWidget;
2302 $MAPWIDGET->connect (activate_console => sub { 2538 $MAPWIDGET->connect (activate_console => sub {
2327 $METASERVER = metaserver_dialog; 2563 $METASERVER = metaserver_dialog;
2328 # 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
2329 $MESSAGE_WINDOW = new DC::UI::Dockbar 2565 $MESSAGE_WINDOW = new DC::UI::Dockbar
2330 name => "message_window2", 2566 name => "message_window2",
2331 title => 'Messages', 2567 title => 'Messages',
2568 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2332 force_w => $::WIDTH * 0.6, 2569 force_w => $::WIDTH * 0.6,
2333 force_h => $::HEIGHT * 0.25, 2570 force_h => $::HEIGHT * 0.25,
2334 ; 2571 ;
2335 2572
2336 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2573 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2356 . "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 "
2357 . "binding editor closes"); 2594 . "binding editor closes");
2358 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2595 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2359 "Some debuggin' options. Do not ask."); 2596 "Some debuggin' options. Do not ask.");
2360 2597
2361 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2598 make_help_window;
2599 make_menubar;
2362 2600
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; 2601 $SETUP_DIALOG->show;
2403 $MESSAGE_WINDOW->show; 2602 $MESSAGE_WINDOW->show;
2404 } 2603 }
2405 2604
2406 $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]);
2407 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2606 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2408 2607
2409 $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;
2410 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2611 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2411 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2612 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2412 2613
2413 $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]);
2414} 2615}
2442my $want_refresh = EV::prepare_ns \&force_refresh; 2643my $want_refresh = EV::prepare_ns \&force_refresh;
2443 2644
2444my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2645my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2445 $NOW = EV::now; 2646 $NOW = EV::now;
2446 2647
2447 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2648 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2448 for DC::poll_events; 2649 for DC::poll_events;
2449 2650
2450 if (%animate_object) { 2651 if (%animate_object) {
2451 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2652 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2452 $WANT_REFRESH = 1; 2653 $WANT_REFRESH = 1;
2464sub animation_stop { 2665sub animation_stop {
2465 my ($widget) = @_; 2666 my ($widget) = @_;
2466 delete $animate_object{$widget}; 2667 delete $animate_object{$widget};
2467} 2668}
2468 2669
2469%SDL_CB = (
2470 DC::SDL_QUIT => sub { 2670$SDL_CB[DC::SDL_QUIT] = sub {
2671 crash "SDL_QUIT";
2471 EV::unloop EV::UNLOOP_ALL; 2672 EV::unloop EV::UNLOOP_ALL;
2472 }, 2673};
2473 DC::SDL_VIDEORESIZE => sub { 2674$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2474 },
2475 DC::SDL_VIDEOEXPOSE => sub { 2675$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2476 DC::UI::full_refresh; 2676 DC::UI::full_refresh;
2477 }, 2677};
2478 DC::SDL_ACTIVEEVENT => sub { 2678$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2479# not useful, as APPACTIVE includes only iconified state, not unmapped 2679# 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# 2680# 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# 2681# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2482# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2682# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2483# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2683# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2484# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2684# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2485 }, 2685};
2486 DC::SDL_KEYDOWN => sub { 2686$SDL_CB[DC::SDL_KEYDOWN] = sub {
2487 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2687 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2488 # alt-enter 2688 # alt-enter
2489 video_shutdown; 2689 video_shutdown;
2490 $FULLSCREEN_ENABLE->toggle; 2690 $FULLSCREEN_ENABLE->toggle;
2491 video_init; 2691 video_init;
2492 } else { 2692 } else {
2493 &DC::UI::feed_sdl_key_down_event; 2693 &DC::UI::feed_sdl_key_down_event;
2494 } 2694 }
2495 update_modbox; 2695 update_modbox;
2496 }, 2696};
2497 DC::SDL_KEYUP => sub { 2697$SDL_CB[DC::SDL_KEYUP] = sub {
2498 &DC::UI::feed_sdl_key_up_event; 2698 &DC::UI::feed_sdl_key_up_event;
2499 update_modbox; 2699 update_modbox;
2500 }, 2700};
2501 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2701$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2502 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2702$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2503 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2703$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2504 DC::SDL_USEREVENT => sub { 2704$SDL_CB[DC::SDL_USEREVENT] = sub {
2505 if ($_[0]{code} == 1) { 2705 if ($_[0]{code} == 1) {
2506 audio_channel_finished $_[0]{data1}; 2706 audio_channel_finished $_[0]{data1};
2507 } elsif ($_[0]{code} == 0) { 2707 } elsif ($_[0]{code} == 0) {
2508 audio_music_finished; 2708 audio_music_finished;
2509 }
2510 }, 2709 }
2511); 2710};
2512 2711
2513############################################################################# 2712#############################################################################
2514 2713
2515$SIG{INT} = $SIG{TERM} = sub { 2714$SIG{INT} = $SIG{TERM} = sub {
2516 EV::unloop; 2715 EV::unloop;
2517 #d# TODO calling exit here hangs the process in some futex 2716 #d# TODO calling exit here hangs the process in some futex
2518}; 2717};
2519 2718
2520{ 2719# due to mac os x + sdl combined braindamage, we need this contortion
2720sub main {
2721 {
2521 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2722 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2522 2723
2523 if (-e "$Deliantra::VARDIR/client.cf") { 2724 if (-e "$Deliantra::VARDIR/client.cf") {
2524 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2725 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2525 } else { 2726 } else {
2526 #TODO: compatibility cruft 2727 #TODO: compatibility cruft
2527 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2728 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2528 print STDERR "INFO: used old configuration file\n"; 2729 print STDERR "INFO: used old configuration file\n";
2529 } 2730 }
2530 2731
2531 DC::DB::Server::run; 2732 DC::DB::Server::run;
2532 2733
2533 if ($CFG->{db_schema} < 1) { 2734 if ($CFG->{db_schema} < 1) {
2534 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2735 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2535 DC::DB::nuke_db; 2736 DC::DB::nuke_db;
2536 $CFG->{db_schema} = 1; 2737 $CFG->{db_schema} = 1;
2537 DC::write_cfg; 2738 DC::write_cfg;
2538 } 2739 }
2539 2740
2540 DC::DB::open_db; 2741 DC::DB::open_db;
2541 2742
2542 DC::UI::set_layout ($::CFG->{layout}); 2743 DC::UI::set_layout ($::CFG->{layout});
2543 2744
2544 my %DEF_CFG = ( 2745 my %DEF_CFG = (
2746 config_autosave => 1,
2545 sdl_mode => 0, 2747 sdl_mode => undef,
2546 fullscreen => 1, 2748 fullscreen => 1,
2547 fast => 0, 2749 fast => 0,
2548 force_opengl11 => undef, 2750 force_opengl11 => undef,
2549 disable_alpha => 0, 2751 disable_alpha => 0,
2550 smooth_movement => 1, 2752 smooth_movement => 1,
2753 smooth_transitions => 1,
2551 texture_compression => 1, 2754 texture_compression => 1,
2552 map_scale => 1, 2755 map_scale => 1,
2553 fow_enable => 1, 2756 fow_enable => 1,
2554 fow_intensity => 0, 2757 fow_intensity => 0,
2758 fow_texture => 0,
2555 map_smoothing => 1, 2759 map_smoothing => 1,
2556 gui_fontsize => 1, 2760 gui_fontsize => 1,
2557 log_fontsize => 0.7, 2761 log_fontsize => 0.7,
2558 gauge_fontsize => 1, 2762 gauge_fontsize => 1,
2559 gauge_size => 0.35, 2763 gauge_size => 0.35,
2560 stat_fontsize => 0.7, 2764 stat_fontsize => 0.7,
2561 mapsize => 100, 2765 mapsize => 100,
2562 audio_enable => 1, 2766 audio_enable => 1,
2563 audio_hw_channels => 0, 2767 audio_hw_channels => 0,
2564 audio_hw_frequency => 0, 2768 audio_hw_frequency => 0,
2565 audio_hw_chunksize => 0, 2769 audio_hw_chunksize => 0,
2566 audio_mix_channels => 8, 2770 audio_mix_channels => 8,
2567 effects_enable => 1, 2771 effects_enable => 1,
2568 effects_volume => 1, 2772 effects_volume => 1,
2569 bgm_enable => 1, 2773 bgm_enable => 1,
2570 bgm_volume => 0.5, 2774 bgm_volume => 0.5,
2571 output_rate => "", 2775 output_rate => "",
2572 pickup => 0, 2776 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2573 inv_sort => "mtime", 2777 inv_sort => "mtime",
2574 default => "profile", # default profile 2778 default => "profile", # default profile
2575 show_tips => 1, 2779 show_tips => 1,
2576 logview_max_par => 1000, 2780 logview_max_par => 1000,
2577 shift_fire_stop => 0, 2781 shift_fire_stop => 0,
2782 uitheme => "wood",
2783 map_shift_x => -24, # arbitrary
2784 map_shift_y => +24, # arbitrary
2578 ); 2785 );
2579 2786
2580 while (my ($k, $v) = each %DEF_CFG) { 2787 while (my ($k, $v) = each %DEF_CFG) {
2581 $CFG->{$k} = $v unless exists $CFG->{$k}; 2788 $CFG->{$k} = $v unless exists $CFG->{$k};
2582 } 2789 }
2583 2790
2584 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2791 my @args = @ARGV;
2585 $PROFILE = $CFG->{profile}{default};
2586 2792
2587 # convert old bindings (only default profile matters) 2793 my $profile = 'default';
2588 if (my $bindings = delete $PROFILE->{bindings}) { 2794
2589 while (my ($mod, $syms) = each %$bindings) { 2795 for (my $i = 0; $i < @args; $i++) {
2590 while (my ($sym, $cmds) = each %$syms) { 2796 if ($args[$i] =~ /^--?profile$/) {
2591 push @{ $PROFILE->{macro} }, { 2797 $profile = $args[$i + 1];
2592 accelkey => [$mod*1, $sym*1], 2798 splice @args, $i, 2, ();
2593 action => $cmds,
2594 }; 2799 $i = 0;
2800 } elsif ($args[$i] =~ /^--?h/) {
2801 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2802 exit 0;
2595 } 2803 }
2596 } 2804 }
2597 }
2598 2805
2806 $CFG->{profile}{$profile} ||= {};
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;
2813
2814 # convert old bindings (only default profile matters)
2815 if (my $bindings = delete $PROFILE->{bindings}) {
2816 while (my ($mod, $syms) = each %$bindings) {
2817 while (my ($sym, $cmds) = each %$syms) {
2818 push @{ $PROFILE->{macro} }, {
2819 accelkey => [$mod*1, $sym*1],
2820 action => $cmds,
2821 };
2822 }
2823 }
2824 }
2825
2599 sdl_init; 2826 sdl_init;
2600 2827
2601 { 2828 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2829 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2830
2831 {
2602 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2832 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2603 DejaVuSans.ttf 2833 DejaVuSans.ttf
2604 DejaVuSansMono.ttf 2834 DejaVuSansMono.ttf
2605 DejaVuSans-Bold.ttf 2835 DejaVuSans-Bold.ttf
2606 DejaVuSansMono-Bold.ttf 2836 DejaVuSansMono-Bold.ttf
2607 DejaVuSans-Oblique.ttf 2837 DejaVuSans-Oblique.ttf
2608 DejaVuSansMono-Oblique.ttf 2838 DejaVuSansMono-Oblique.ttf
2609 DejaVuSans-BoldOblique.ttf 2839 DejaVuSans-BoldOblique.ttf
2610 DejaVuSansMono-BoldOblique.ttf 2840 DejaVuSansMono-BoldOblique.ttf
2841 mona.ttf
2611 ); 2842 );
2612 2843
2613 DC::add_font $_ for @fonts; 2844 DC::add_font $_ for @fonts;
2614 2845
2615 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2846 $FONT_PROP = new_from_file DC::Font $fonts[0];
2616 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2847 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2617 2848
2618 $FONT_PROP->make_default; 2849 $FONT_PROP->make_default;
2619 2850
2620 DC::pango_init; 2851 DC::pango_init;
2621 } 2852 }
2622 2853
2623# compare mono (ft) vs. rgba (cairo) 2854# compare mono (ft) vs. rgba (cairo)
2624# ft - 1.8s, cairo 3s, even in alpha-only mode 2855# ft - 1.8s, cairo 3s, even in alpha-only mode
2625# for my $rgba (0..1) { 2856# for my $rgba (0..1) {
2626# my $t1 = Time::HiRes::time; 2857# my $t1 = Time::HiRes::time;
2631# } 2862# }
2632# my $t2 = Time::HiRes::time; 2863# my $t2 = Time::HiRes::time;
2633# warn $t2-$t1; 2864# warn $t2-$t1;
2634# } 2865# }
2635 2866
2636 video_init; 2867 video_init;
2637 audio_init; 2868 audio_init;
2638} 2869 }
2639 2870
2640show_tip_of_the_day if $CFG->{show_tips}; 2871 show_tip_of_the_day if $CFG->{show_tips};
2641 2872
2642our $STARTUP_CANCEL = EV::idle sub { 2873 our $STARTUP_CANCEL = EV::idle sub {
2643 undef $::STARTUP_CANCEL; 2874 undef $::STARTUP_CANCEL;
2644 $startup_done->(); 2875 $startup_done->();
2645}; 2876 };
2646 2877
2647delete $SIG{__DIE__}; 2878 delete $SIG{__DIE__};
2648EV::loop; 2879 EV::loop;
2649 2880
2881 DC::write_cfg if $CFG->{config_autosave};
2882
2650#video_shutdown; 2883 #video_shutdown;
2651#audio_shutdown; 2884 #audio_shutdown;
2885
2652DC::OpenGL::quit; 2886 DC::OpenGL::quit;
2653DC::SDL_Quit; 2887 DC::SDL_Quit;
2654DC::DB::Server::stop; 2888 DC::DB::Server::stop;
2889}
2890
2891DC::SDL_braino; # see sub above
2655 2892
2656=head1 NAME 2893=head1 NAME
2657 2894
2658deliantra - A Deliantra MORPG game client 2895deliantra - A Deliantra MORPG game client
2659 2896
2660=head1 SYNOPSIS 2897=head1 SYNOPSIS
2661 2898
2662Just run it - no commandline arguments are supported. 2899 deliantra [--profile name] [host [user [password]]]
2900 deliantra --help
2663 2901
2664=head1 USAGE 2902=head1 USAGE
2665 2903
2666deliantra 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
2667be used in fullscreen mode and interactively. 2905is supposed to be used in fullscreen mode and interactively.
2668 2906
2669=head1 DEBUGGING 2907=head1 DEBUGGING
2670
2671 2908
2672CFPLUS_DEBUG - environment variable 2909CFPLUS_DEBUG - environment variable
2673 2910
2674 1 draw borders around widgets 2911 1 draw borders around widgets
2675 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