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.43 by root, Wed May 21 23:35:55 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
92use AnyEvent::Util ();
93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
95
102use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
103 98
104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 99use DC;
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
105use DC::OpenGL (); 113use DC::OpenGL ();
106use DC::Protocol; 114use DC::Protocol;
107use DC::DB; 115use DC::DB;
108use DC::UI; 116use DC::UI;
109use DC::UI::Canvas; 117use DC::UI::Canvas;
110use DC::UI::Inventory; 118use DC::UI::Inventory;
111use DC::UI::SpellList; 119use DC::UI::SpellList;
112use DC::UI::Dockable; 120use DC::UI::Dockable;
113use DC::UI::Dockbar; 121use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 122use DC::UI::ChatView;
116use DC::MessageDistributor; 123use DC::MessageDistributor;
117use DC::Pod; 124use DC::Pod;
118use DC::MapWidget; 125use DC::MapWidget;
119use DC::Macro; 126use DC::Macro;
120 127
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
123 130
124$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
125 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
126}; 134};
127 135
128my $MAX_FPS = 60; 136my $MAX_FPS = 60;
129 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
130our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
131 141
132our $LAST_REFRESH; 142our $LAST_REFRESH;
133our $NOW; 143our $NOW;
134 144
135our $CFG; 145our $CFG;
136our $CONN;
137our $PROFILE; # current profile 146our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 148
140our $WANT_REFRESH; 149our $WANT_REFRESH;
141 150
151our $MODE_SLIDER;
152our $CAVEAT_LABEL;
153
142our @SDL_MODES; 154our @SDL_MODES;
155our $SDL_REINIT = 1;
143our $WIDTH; 156our $WIDTH;
144our $HEIGHT; 157our $HEIGHT;
145our $FULLSCREEN; 158our $FULLSCREEN;
146our $FONTSIZE; 159our $FONTSIZE;
147 160
148our $FONT_PROP; 161our $FONT_PROP;
149our $FONT_FIXED; 162our $FONT_FIXED;
150 163
164our $CONN;
165
151our $MAP; 166our $MAP;
152our $MAPMAP; 167our $MAPMAP;
153our $MAPWIDGET; 168our $MAPWIDGET;
154our $COMPLETER; 169our $COMPLETER;
155our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
156our $METASERVER; 174our $METASERVER;
157our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
158our $QUIT_DIALOG; 176our $QUIT_DIALOG;
159our $HOST_ENTRY; 177our $HOST_ENTRY;
160our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
186our $FLOORBOX; 204our $FLOORBOX;
187our $GAUGES; 205our $GAUGES;
188our $STATWIDS; 206our $STATWIDS;
189 207
190our $SDL_ACTIVE; 208our $SDL_ACTIVE;
191our %SDL_CB; 209our @SDL_CB;
192 210
193our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 212our $STATUSBOX;
195our $MODBOX; 213our $MODBOX;
196our $DEBUG_STATUS; 214our $DEBUG_STATUS;
197 215
198our $INV; 216our $INV;
199our $INVR; 217our $INVR;
200our $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}
201 259
202############################################################################# 260#############################################################################
203 261
204sub status { 262sub status {
205 $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]);
287 or return; 345 or return;
288 346
289 $meta->{data} 347 $meta->{data}
290 or return; 348 or return;
291 349
292 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
293 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
294 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
295 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
296 &audio_music_push ($face); 354 &audio_music_push ($face);
297 } 355 }
298 } else { 356 } else {
299 # fetch from database 357 # fetch from database
300 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
301 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
302 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
303 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;
304 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
305 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
306 364
307 audio_sound_push ($face); 365 audio_sound_push ($face);
308 }; 366 };
355 413
356 audio_music_update_volume; 414 audio_music_update_volume;
357 415
358 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
359 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
360 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
361 ? 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
362 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
363 424
364 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
365 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
366 427
367 my $NOW = time; 428 my $NOW = time;
368 429
369 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
370 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
479 sub audio_tab_update; 540 sub audio_tab_update;
480 audio_tab_update; 541 audio_tab_update;
481} 542}
482 543
483sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
484 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
485 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
486 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
487 553
488 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
725 791
726 $vbox->add (@dialog); 792 $vbox->add (@dialog);
727 $dialog->show; 793 $dialog->show;
728} 794}
729 795
730sub start_game { 796sub dc_connect {
731 status "logging in..."; 797 my ($host, $port) = @_;
732 798
733 $LOGIN_BUTTON->set_text ("Logout");
734 $SETUP_DIALOG->hide;
735
736 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 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;
737 801
738 my ($host, $port) = split /:/, $PROFILE->{host};
739
740 $MAP = new DC::Map;
741
742 $CONN = eval { 802 $CONN =
743 local $SIG{__DIE__};
744
745 new DC::Protocol 803 new DC::Protocol
746 host => $host, 804 host => $host,
747 port => $port || 13327, 805 port => $port,
748 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
749 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
750 mapw => $mapsize, 808 mapw => $mapw,
751 maph => $mapsize, 809 maph => $maph,
752 810
811 client => "deliantra",
753 client => "$DC::VERSION $] $^O", 812 clientversion => $DC::VERSION,
754 813
755 map_widget => $MAPWIDGET, 814 map_widget => $MAPWIDGET,
756 statusbox => $STATUSBOX, 815 statusbox => $STATUSBOX,
757 map => $MAP, 816 map => $MAP,
758 mapmap => $MAPMAP, 817 mapmap => $MAPMAP,
759 query => \&server_query, 818 query => \&server_query,
760 819
761 setup_req => { 820 setup_req => {
762 smoothing => $CFG->{map_smoothing}*1, 821 smoothing => $CFG->{map_smoothing}*1,
763 }, 822 },
764 };
765 823
766 if ($CONN) { 824 on_connect => sub {
825 if ($_[0]) {
767 DC::lowdelay fileno $CONN->{fh}; 826 DC::lowdelay fileno $CONN->{fh};
768 827
769 status "login successful"; 828 status "successfully connected to the server";
829 } else {
830 undef $CONN;
831 status "unable to connect: $!";
832 stop_game();
833 }
834 },
835 ;
836}
837
838sub start_game {
839 status "logging in...";
840
841 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
842 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
843 or return status "$server: unable to parse server address, try an empty field.";
844
845 $LOGIN_BUTTON->set_text ("Logout");
846 $SETUP_DIALOG->hide;
847
848 $MAP = new DC::Map;
849
850 # hack to make SURE we find the IP address all right
851 # can be removed once AnyEvent::DNS is proven stable.
852 if ($host eq "gameserver.deliantra.net") {
853 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
854 if ($_[0] ne "80.101.114.108") { # Perl
855 status "dns failure, trying differently";
856 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
857 unless (defined $host) {
858 status "dns failure, using hardcoded address";
859 $host = "129.13.162.95";
860 }
861 }
862
863 dc_connect $host, $port;
864 };
770 } else { 865 } else {
771 warn $@; 866 dc_connect $host, $port;
772 status "unable to connect";
773 stop_game();
774 } 867 }
775} 868}
776 869
777sub stop_game { 870sub stop_game {
871 crash "stop_game";
872
778 $LOGIN_BUTTON->set_text ("Login / Register"); 873 $LOGIN_BUTTON->set_text ("Login / Register");
779 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 874 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
780 $SETUP_DIALOG->show; 875 $SETUP_DIALOG->show;
781 $PL_WINDOW->hide; 876 $PL_WINDOW->hide;
782 $SPELL_LIST->clear_spells; 877 $SPELL_LIST->clear_spells;
796} 891}
797 892
798sub graphics_setup { 893sub graphics_setup {
799 my $vbox = new DC::UI::VBox; 894 my $vbox = new DC::UI::VBox;
800 895
896 {
897 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
898
801 $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]);
802 900
803 my $row = 0; 901 my $row = 0;
804 902
805 $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");
806 $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,
807 can_events => 1, 905 can_events => 1,
808 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 906 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
809 907
908 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
909 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
910 can_events => 1,
911 tooltip => "This field shows any known issues with your config or driver, such as "
912 . "a non-accelerated display format. You can try to work around these issues "
913 . "by selecting a different video mode, changing the settings below or "
914 . "by installing the right driver for your graphics card.");
915
916 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
917 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
918 value => $CFG->{uitheme},
919 options => [
920 [wood => "Wood (the default)"],
921 [plain => "Plain (very)"],
922 [blue => "Blue (dark)"],
923 [metal => "Metal (light)"],
924 ],
925 tooltip => "Choose the User Interface theme that you like most :)",
926 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
927 );
928
810 my $vidmode_tooltip = 929 my $vidmode_tooltip =
811 "<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). "
812 . "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>.";
813 932
814 $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");
815 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 934 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
816 935
817 $hbox->add (my $mode_slider = new DC::UI::Slider 936 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
818 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 937 c_rescale => 1,
938 force_w => $WIDTH * 0.1, expand => 1,
939 range => [ ($CFG->{sdl_mode}) x 3 ],
819 tooltip => $vidmode_tooltip); 940 tooltip => $vidmode_tooltip);
820 $hbox->add (my $mode_label = new DC::UI::Label 941 $hbox->add (my $mode_label = new DC::UI::Label
821 height => 0.8, template => "9999x9999@9+9", 942 height => 0.8, template => "9999x9999@9+9",
822 can_events => 1, tooltip => $vidmode_tooltip); 943 can_events => 1, tooltip => $vidmode_tooltip);
823 944
824 $mode_slider->connect (changed => sub { 945 $MODE_SLIDER->connect (changed => sub {
825 my ($self, $value) = @_; 946 my ($self, $value) = @_;
826 947
827 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 948 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
828 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 949 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
829 }); 950 });
830 $mode_slider->emit (changed => $mode_slider->{range}[0]); 951 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
831 952
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
833 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 954 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
834 state => $CFG->{fullscreen}, 955 state => $CFG->{fullscreen},
835 tooltip => "Bring the client into fullscreen mode.", 956 tooltip => "Bring the client into fullscreen mode.",
836 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 957 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
837 ); 958 );
838 959
839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
840 $table->add_at (1, $row++, new DC::UI::CheckBox 961 $table->add_at (1, $row++, new DC::UI::CheckBox
841 state => $CFG->{force_opengl11}, 962 state => $CFG->{force_opengl11},
842 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 963 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
843 . "higher memory usage and slower performance. It will, however, help tremendously on " 964 . "higher memory usage and slower performance. It will, however, help tremendously on "
844 . "cards that claim to support a feature but fall back to software rendering. " 965 . "cards that claim to support a feature but fall back to software rendering. "
845 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 966 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
846 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 967 . "but cards and drivers from other vendors (ATI) are often just as bad. "
847 . "experience extremely low framerates and your card should do better, try this option.</b>", 968 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
848 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 969 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
849 ); 970 );
850 971
972 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
973 $table->add_at (1, $row++, new DC::UI::CheckBox
974 state => $CFG->{disable_alpha},
975 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
976 . "by disabling a number of textures and transparency effects. Normally, these "
977 . "effects do not cost a lot of resources, but some graphics cards might fall "
978 . "back to extremely slow rendering if this is enabled. If disabling this option "
979 . "noticably improves the framerate of the client please report this! "
980 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
981 on_changed => sub {
982 my ($self, $value) = @_;
983 $CFG->{disable_alpha} = $value;
984 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
985 0
986 }
987 );
988
851 $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");
852 $table->add_at (1, $row++, new DC::UI::CheckBox 990 $table->add_at (1, $row++, new DC::UI::CheckBox
853 state => $CFG->{texture_compression}, 991 state => $CFG->{texture_compression},
854 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 "
855 . "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). "
856 . "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 "
857 . "forced OpenGL 1.1 mode.", 995 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
859 ); 997 );
860 998
861 $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");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 1000 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{fast}, 1001 state => $CFG->{fast},
864 tooltip => "Lower the visual quality considerably to speed up rendering.", 1002 tooltip => "Lower the visual quality considerably to speed up rendering.",
865 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1003 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
866 ); 1004 );
867 1005
868 $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");
869 $table->add_at (1, $row++, new DC::UI::Slider 1007 $table->add_at (1, $row++, new DC::UI::Slider
870 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1008 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
871 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.",
872 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1010 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
873 ); 1011 );
874 1012
875 $table->add_at (1, $row++, new DC::UI::Button 1013 $table->add_at (1, $row++, new DC::UI::Button
876 expand => 1, text => "Apply", 1014 expand => 1, text => "Apply",
877 tooltip => "Apply the video settings above.", 1015 tooltip => "Apply the video settings above.",
878 on_activate => sub { 1016 on_activate => sub {
879 video_shutdown (); 1017 video_shutdown ();
880 video_init (); 1018 video_init ();
1019 0
881 0 1020 }
882 } 1021 );
1022 }
1023
1024 {
1025 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1026
1027 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1028
1029 my $row = 0;
1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1031 $table->add_at (1, $row++, new DC::UI::CheckBox
1032 state => $CFG->{smooth_movement},
1033 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1034 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1035 . "then disable this option. Changes take effect immdiately.",
1036 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
883 ); 1037 );
884 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
885 $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");
886 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1051 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
888 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1052 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
889 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 }
890 ); 1054 );
891 1055
892 $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");
893 $table->add_at (1, $row++, new DC::UI::CheckBox 1057 $table->add_at (1, $row++, new DC::UI::CheckBox
894 state => $CFG->{map_smoothing}, 1058 state => $CFG->{map_smoothing},
895 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. "
896 . "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. "
897 . "Changes take effect at next login only.", 1061 . "Changes take effect at next login only.",
898 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1062 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
899 ); 1063 );
900 1064
901 $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");
902 $table->add_at (1, $row++, new DC::UI::CheckBox 1066 $table->add_at (1, $row++, new DC::UI::CheckBox
903 state => $CFG->{fow_enable}, 1067 state => $CFG->{fow_enable},
904 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.",
905 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1069 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
906 ); 1070 );
907 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
908 $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");
909 $table->add_at (1, $row++, new DC::UI::Slider 1088 $table->add_at (1, $row++, new DC::UI::Slider
910 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1089 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
911 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.",
912 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1091 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
913 ); 1092 );
914 1093
915 $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");
916 $table->add_at (1, $row++, new DC::UI::Slider 1095 $table->add_at (1, $row++, new DC::UI::Slider
917 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1096 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
918 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, "
919 . "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.",
920 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 },
921 ); 1100 );
922 1101
923 $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");
924 $table->add_at (1, $row++, new DC::UI::Slider 1103 $table->add_at (1, $row++, new DC::UI::Slider
925 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1104 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
926 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.",
927 on_changed => sub { 1106 on_changed => sub {
928 $CFG->{gauge_fontsize} = $_[1]; 1107 $CFG->{gauge_fontsize} = $_[1];
929 &set_gauge_window_fontsize; 1108 &set_gauge_window_fontsize;
1109 0
930 0 1110 }
931 } 1111 );
932 );
933 1112
934 $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");
935 $table->add_at (1, $row++, new DC::UI::Slider 1114 $table->add_at (1, $row++, new DC::UI::Slider
936 range => [$CFG->{gauge_size}, 0.2, 0.8], 1115 range => [$CFG->{gauge_size}, 0.2, 0.8],
937 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.",
938 on_changed => sub { 1117 on_changed => sub {
939 $CFG->{gauge_size} = $_[1]; 1118 $CFG->{gauge_size} = $_[1];
940 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1119 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1120 0
941 0 1121 }
942 } 1122 );
943 ); 1123 }
944 1124
945 $vbox 1125 $vbox
946} 1126}
947 1127
948our $AUDIO_HW_CHUNKSIZE; 1128our $AUDIO_HW_CHUNKSIZE;
961 1141
962 my $text = !$freq 1142 my $text = !$freq
963 ? "audio is off" 1143 ? "audio is off"
964 : "audio is enabled\n" 1144 : "audio is enabled\n"
965 . "frequency (Hz): $freq\n" 1145 . "frequency (Hz): $freq\n"
966 . "channels: $chans"; 1146 . "channels: $chans\n"
1147 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1148 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
967 1149
968 $AUDIO_INFO->set_text ($text); 1150 $AUDIO_INFO->set_text ($text);
969} 1151}
970 1152
971sub audio_setup { 1153sub audio_setup {
1111} 1293}
1112 1294
1113sub make_gauge_window { 1295sub make_gauge_window {
1114 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1296 my $gh = int $HEIGHT * $CFG->{gauge_size};
1115 1297
1116 my $win = new DC::UI::Frame ( 1298 $GAUGES->{win} = my $win = new DC::UI::Frame (
1117 force_x => 0, 1299 force_x => 0,
1118 force_y => "max", 1300 force_y => "max",
1119 force_w => $WIDTH, 1301 force_w => $WIDTH,
1120 force_h => $gh, 1302 force_h => $gh,
1121 ); 1303 );
1137 (new DC::UI::Empty expand => 1), 1319 (new DC::UI::Empty expand => 1),
1138 (my $hb = new DC::UI::HBox), 1320 (my $hb = new DC::UI::HBox),
1139 ], 1321 ],
1140 ); 1322 );
1141 1323
1142 $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");
1143 $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");
1144 $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");
1145 $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");
1146
1147 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1148 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1149 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1150 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1151
1152 $GAUGES = {
1153 exp => $exp, prg => $prg, sklprg => $sklprg,
1154 win => $win, range => $rng,
1155 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1156 };
1157 1328
1158 &set_gauge_window_fontsize; 1329 &set_gauge_window_fontsize;
1159 1330
1160 $win 1331 $win
1161} 1332}
1502 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]),
1503 ); 1674 );
1504 1675
1505 $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");
1506 $table->add_at (1, 4, new DC::UI::Entry 1677 $table->add_at (1, 4, new DC::UI::Entry
1507 text => $CFG->{profile}{default}{user}, 1678 text => $PROFILE->{user},
1508 tooltip => "The name of your character on the server.", 1679 tooltip => "The name of your character on the server. The name is case-sensitive!",
1509 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1680 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1510 ); 1681 );
1511 1682
1512 $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");
1513 $table->add_at (1, 5, new DC::UI::Entry 1684 $table->add_at (1, 5, new DC::UI::Entry
1514 text => $CFG->{profile}{default}{password}, 1685 text => $PROFILE->{password},
1515 hidden => 1, 1686 hidden => 1,
1516 tooltip => "The password for your character.", 1687 tooltip => "The password for your character.",
1517 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1688 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1518 ); 1689 );
1519 1690
1520 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1691 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1521 expand => 1, 1692 expand => 1,
1522 text => "Login / Register", 1693 text => "Login / Register",
1527 1 1698 1
1528 }, 1699 },
1529 ); 1700 );
1530 1701
1531 $vbox->add (new DC::UI::FancyFrame 1702 $vbox->add (new DC::UI::FancyFrame
1532 label => "Registering", 1703 label => "How to Play",
1533 min_h => 200, 1704 min_h => 240,
1534 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1705 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1535 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). "
1536 "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 "
1537 . "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.",
1538 ), 1711 ),
1539 ); 1712 );
1540 1713
1541 $vbox 1714 $vbox
1556 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1729 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1557 1730
1558 $vbox->add ( 1731 $vbox->add (
1559 $HOST_ENTRY = new DC::UI::Entry 1732 $HOST_ENTRY = new DC::UI::Entry
1560 expand => 1, 1733 expand => 1,
1561 text => $CFG->{profile}{default}{host}, 1734 text => $PROFILE->{host},
1562 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>)",
1563 on_changed => sub { 1736 on_changed => sub {
1564 my ($self, $value) = @_; 1737 my ($self, $value) = @_;
1565 $CFG->{profile}{default}{host} = $value; 1738 $PROFILE->{host} = $value;
1566 1 1739 1
1567 } 1740 }
1568 ); 1741 );
1569 1742
1570 if (0) { #d# disabled 1743 if (0) { #d# disabled
1613 1786
1614 my $row = 0; 1787 my $row = 0;
1615 1788
1616 $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");
1617 $table->add_at (1, $row++, new DC::UI::CheckBox 1790 $table->add_at (1, $row++, new DC::UI::CheckBox
1791 c_colspan => 2,
1618 state => $CFG->{show_tips}, 1792 state => $CFG->{show_tips},
1619 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?",
1620 on_changed => sub { 1794 on_changed => sub {
1621 my ($self, $value) = @_; 1795 my ($self, $value) = @_;
1622 $CFG->{show_tips} = $value; 1796 $CFG->{show_tips} = $value;
1624 } 1798 }
1625 ); 1799 );
1626 1800
1627 $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");
1628 $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,
1629 text => $CFG->{logview_max_par}, 1804 text => $CFG->{logview_max_par},
1630 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 "
1631 . "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 "
1632 . "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.",
1633 on_changed => sub { 1808 on_changed => sub {
1635 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1810 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1636 0 1811 0
1637 }, 1812 },
1638 ); 1813 );
1639 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
1640 $table 1837 $table
1641} 1838}
1642 1839
1643sub autopickup_setup { 1840sub autopickup_setup {
1644 my $r = new DC::UI::ScrolledWindow ( 1841 my $r = new DC::UI::ScrolledWindow (
1650 col_expand => [0, 1, 0, 1], 1847 col_expand => [0, 1, 0, 1],
1651 ); 1848 );
1652 1849
1653 for ( 1850 for (
1654 ["General", 0, 0, 1851 ["General", 0, 0,
1655 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1656 ["Inhibit autopickup" => PICKUP_INHIBIT], 1852# ["Inhibit autopickup" => PICKUP_INHIBIT],
1657 ["Stop before pickup" => PICKUP_STOP], 1853 ["Stop before pickup" => PICKUP_STOP],
1658 ["Debug autopickup" => PICKUP_DEBUG], 1854 ["Debug autopickup" => PICKUP_DEBUG],
1659 ], 1855 ],
1660 ["Weapons", 0, 6, 1856 ["Weapons", 0, 6,
1661 ["All weapons" => PICKUP_ALLWEAPON], 1857 ["All weapons" => PICKUP_ALLWEAPON],
1687 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1883 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1688 ["Ignore cursed" => PICKUP_NOT_CURSED], 1884 ["Ignore cursed" => PICKUP_NOT_CURSED],
1689 ["Jewelery" => PICKUP_JEWELS], 1885 ["Jewelery" => PICKUP_JEWELS],
1690 ["Flesh" => PICKUP_FLESH], 1886 ["Flesh" => PICKUP_FLESH],
1691 ], 1887 ],
1692 ["Weight/Value ratio", 2, 17] 1888 ["Value/Weight ratio", 2, 17]
1693 ) 1889 )
1694 { 1890 {
1695 my ($title, $x, $y, @bits) = @$_; 1891 my ($title, $x, $y, @bits) = @$_;
1696 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1892 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1697 1893
1709 $::CFG->{pickup} |= $mask; 1905 $::CFG->{pickup} |= $mask;
1710 } else { 1906 } else {
1711 $::CFG->{pickup} &= ~$mask; 1907 $::CFG->{pickup} &= ~$mask;
1712 } 1908 }
1713 1909
1714 $::CONN->send_command ("pickup $::CFG->{pickup}") 1910 $::CONN->send_pickup ($::CFG->{pickup})
1715 if defined $::CONN; 1911 if defined $::CONN;
1716 1912
1717 0 1913 0
1718 }); 1914 });
1719 1915
1722 } 1918 }
1723 1919
1724 $table->add_at (2, 18, new DC::UI::ValSlider 1920 $table->add_at (2, 18, new DC::UI::ValSlider
1725 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1921 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1726 template => ">= 99", 1922 template => ">= 99",
1923 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1727 to_value => sub { ">= " . 5 * $_[0] }, 1924 to_value => sub { ">= " . 5 * $_[0] },
1728 on_changed => sub { 1925 on_changed => sub {
1729 my ($slider, $value) = @_; 1926 my ($slider, $value) = @_;
1730 1927
1731 $::CFG->{pickup} &= ~0xF; 1928 $::CFG->{pickup} &= ~0xF;
1735 }); 1932 });
1736 1933
1737 $table->add_at (3, 18, new DC::UI::Button 1934 $table->add_at (3, 18, new DC::UI::Button
1738 text => "set", 1935 text => "set",
1739 on_activate => sub { 1936 on_activate => sub {
1740 $::CONN->send_command ("pickup $::CFG->{pickup}") 1937 $::CONN->send_pickup ($::CFG->{pickup})
1741 if defined $::CONN; 1938 if defined $::CONN;
1742 0 1939 0
1743 }); 1940 });
1744 1941
1745 $r 1942 $r
1746} 1943}
1747 1944
1748my %SORT_ORDER = ( 1945my %SORT_ORDER = (
1749 type => sub { 1946 type => sub {
1947 use sort 'stable';
1750 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1948 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1751 }, 1949 },
1752 mtime => sub { 1950 mtime => sub {
1951 use sort 'stable';
1753 my $NOW = time; 1952 my $NOW = time;
1754 sort { 1953 sort {
1755 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;
1756 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;
1757 1956
1758 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1957 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1759 or $btime <=> $atime 1958 or $btime <=> $atime
1760 or $a->{type} <=> $b->{type} 1959 or $a->{type} <=> $b->{type}
1761 } @_ 1960 } @_
1762 }, 1961 },
1763 weight => sub { sort { 1962 weight => sub {
1963 use sort 'stable';
1964 sort {
1764 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1965 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1765 or $a->{type} <=> $b->{type} 1966 or $a->{type} <=> $b->{type}
1766 } @_ }, 1967 } @_
1968 },
1767); 1969);
1768 1970
1769sub inventory_widget { 1971sub inventory_widget {
1770 my $hb = new DC::UI::HBox homogeneous => 1; 1972 my $hb = new DC::UI::HBox homogeneous => 1;
1771 1973
1787 $::CFG->{inv_sort} = $_[1]; 1989 $::CFG->{inv_sort} = $_[1];
1788 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1990 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1789 }, 1991 },
1790 ); 1992 );
1791 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1993 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1792 #TODO# update to weigh/maxweight 1994 #TODO# update to weight/maxweight
1793 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1995 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1794 1996
1795 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1997 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1796 $sw1->add ($INV = new DC::UI::Inventory); 1998 $sw1->add ($INV = new DC::UI::Inventory);
1797 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1999 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1858 $PL_NOTEBOOK->set_current_page ($widget); 2060 $PL_NOTEBOOK->set_current_page ($widget);
1859 $PL_WINDOW->show; 2061 $PL_WINDOW->show;
1860 } 2062 }
1861} 2063}
1862 2064
1863sub player_window { 2065sub make_playerbook {
1864 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2066 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1865 x => "center", 2067 x => "center",
1866 y => "center", 2068 y => "center",
1867 force_w => $WIDTH * 9/10, 2069 force_w => $WIDTH * 9/10,
1868 force_h => $HEIGHT * 9/10, 2070 force_h => $HEIGHT * 9/10,
1902 "License, Author and Source info for media sent by the server."); 2104 "License, Author and Source info for media sent by the server.");
1903 2105
1904 $ntb->set_current_page ($INVENTORY_PAGE); 2106 $ntb->set_current_page ($INVENTORY_PAGE);
1905 2107
1906 $plwin->add ($ntb); 2108 $plwin->add ($ntb);
1907 $plwin
1908} 2109}
1909 2110
1910sub keyboard_setup { 2111sub keyboard_setup {
1911 DC::Macro::keyboard_setup 2112 DC::Macro::keyboard_setup
1912} 2113}
1913 2114
1914sub help_window { 2115sub make_help_window {
1915 my $win = new DC::UI::Toplevel 2116 my $win = new DC::UI::Toplevel
1916 x => 'center', 2117 x => 'center',
1917 y => 'center', 2118 y => 'center',
1918 z => 4, 2119 z => 4,
1919 name => 'doc_browser', 2120 name => 'doc_browser',
2008 2209
2009 $load_node->((DC::Pod::find @path)[0]); 2210 $load_node->((DC::Pod::find @path)[0]);
2010 $win->show; 2211 $win->show;
2011 }; 2212 };
2012 2213
2013 $win 2214 $HELP_WINDOW = $win;
2014}
2015
2016sub open_string_query {
2017 my ($title, $cb, $txt, $tooltip) = @_;
2018 my $dialog = new DC::UI::Toplevel
2019 x => "center",
2020 y => "center",
2021 z => 50,
2022 force_w => $WIDTH * 4/5,
2023 title => $title;
2024
2025 $dialog->add (
2026 my $e = new DC::UI::Entry
2027 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2028 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2029 tooltip => $tooltip
2030 );
2031
2032 $e->grab_focus;
2033 $e->set_text ($txt) if $txt;
2034 $dialog->show;
2035} 2215}
2036 2216
2037sub open_quit_dialog { 2217sub open_quit_dialog {
2038 unless ($QUIT_DIALOG) { 2218 unless ($QUIT_DIALOG) {
2039 $QUIT_DIALOG = new DC::UI::Toplevel 2219 $QUIT_DIALOG = new DC::UI::Toplevel
2061 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2241 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2062 ); 2242 );
2063 $hb->add (new DC::UI::Button 2243 $hb->add (new DC::UI::Button
2064 text => "Quit anyway", 2244 text => "Quit anyway",
2065 expand => 1, 2245 expand => 1,
2066 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2246 on_activate => sub {
2247 crash "Quit anyway";
2248 EV::unloop EV::UNLOOP_ALL;
2249 },
2067 ); 2250 );
2068 } 2251 }
2069 2252
2070 $QUIT_DIALOG->show; 2253 $QUIT_DIALOG->show;
2071 $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;
2072} 2363}
2073 2364
2074sub show_tip_of_the_day { 2365sub show_tip_of_the_day {
2075 # find all tips 2366 # find all tips
2076 my @tod = DC::Pod::find tip_of_the_day => "*"; 2367 my @tod = DC::Pod::find tip_of_the_day => "*";
2124 $dialog->show; 2415 $dialog->show;
2125 }; 2416 };
2126} 2417}
2127 2418
2128sub sdl_init { 2419sub sdl_init {
2129 DC::SDL_Init 2420 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2130 and die "SDL::Init failed!\n"; 2421 and die "SDL::Init failed!\n";
2131} 2422}
2132 2423
2133sub video_init { 2424sub video_init {
2425 DC::set_theme $CFG->{uitheme};
2426
2427 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2428 $SDL_REINIT = 0;
2429
2430 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2431 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2432 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2433 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2434
2435 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2436
2134 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2437 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2438 $CFG->{sdl_mode} = 0; # lowest resolution by default
2439
2440 # now choose biggest mode <= 1024x768
2441 for (0 .. $#SDL_MODES) {
2442 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2443 $CFG->{sdl_mode} = $_;
2444 }
2445 }
2446 }
2135 2447
2136 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2448 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2137 2449
2138 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2450 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2139 $FULLSCREEN = $CFG->{fullscreen}; 2451 $FULLSCREEN = $CFG->{fullscreen};
2140 $FAST = $CFG->{fast}; 2452 $FAST = $CFG->{fast};
2141 2453
2454 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2142 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
2143 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2457 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2144 2458
2145 $SDL_ACTIVE = 1; 2459 $SDL_ACTIVE = 1;
2146 $LAST_REFRESH = time - 0.01; 2460 $LAST_REFRESH = time - 0.01;
2147 2461
2194 2508
2195 (new DC::UI::Frame 2509 (new DC::UI::Frame
2196 bg => [0, 0, 0, 0.4], 2510 bg => [0, 0, 0, 0.4],
2197 force_x => 0, 2511 force_x => 0,
2198 force_y => "max", 2512 force_y => "max",
2199 child => (my $LR = new DC::UI::VBox), 2513 child => (my $LL = new DC::UI::VBox),
2200 )->show; 2514 )->show;
2201 2515
2202 $LR->add ($STATUSBOX); 2516 $LL->add ($STATUSBOX);
2203 $LR->add ($MODBOX); 2517 $LL->add ($MODBOX);
2204 $LR->add (new DC::UI::Label 2518 $LL->add (new DC::UI::Label
2205 align => 0, 2519 align => 0,
2206 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2520 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2207 fontsize => 0.5, 2521 fontsize => 0.5,
2208 fg => [1, 1, 0, 0.7], 2522 fg => [1, 1, 0, 0.7],
2209 ); 2523 );
2210 2524
2211 DC::UI::Toplevel->new ( 2525 DC::UI::Toplevel->new (
2212 title => "Minimap", 2526 title => "Minimap",
2213 name => "mapmap", 2527 name => "mapmap",
2214 x => 0, 2528 x => 0,
2215 y => $FONTSIZE + 8, 2529 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2216 border_bg => [1, 1, 1, 192/255], 2530 border_bg => [1, 1, 1, 192/255],
2217 bg => [1, 1, 1, 0], 2531 bg => [1, 1, 1, 0],
2218 child => ($MAPMAP = new DC::MapWidget::MapMap 2532 child => ($MAPMAP = new DC::MapWidget::MapMap
2219 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.",
2220 ), 2534 ),
2221 )->show; 2535 )->show;
2222 2536
2223 $MAPWIDGET = new DC::MapWidget; 2537 $MAPWIDGET = new DC::MapWidget;
2224 $MAPWIDGET->connect (activate_console => sub { 2538 $MAPWIDGET->connect (activate_console => sub {
2249 $METASERVER = metaserver_dialog; 2563 $METASERVER = metaserver_dialog;
2250 # 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
2251 $MESSAGE_WINDOW = new DC::UI::Dockbar 2565 $MESSAGE_WINDOW = new DC::UI::Dockbar
2252 name => "message_window2", 2566 name => "message_window2",
2253 title => 'Messages', 2567 title => 'Messages',
2568 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2254 force_w => $::WIDTH * 0.6, 2569 force_w => $::WIDTH * 0.6,
2255 force_h => $::HEIGHT * 0.25, 2570 force_h => $::HEIGHT * 0.25,
2256 ; 2571 ;
2257 2572
2258 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2573 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2278 . "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 "
2279 . "binding editor closes"); 2594 . "binding editor closes");
2280 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2595 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2281 "Some debuggin' options. Do not ask."); 2596 "Some debuggin' options. Do not ask.");
2282 2597
2283 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2598 make_help_window;
2599 make_menubar;
2284 2600
2285 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2286 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2287
2288# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2289# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2290
2291 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
2292
2293 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2294 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2295
2296 $BUTTONBAR->add (new DC::UI::Button
2297 text => "Save Config",
2298 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2299 on_activate => sub {
2300 $::CFG->{layout} = DC::UI::get_layout;
2301 DC::write_cfg;
2302 status "Configuration Saved";
2303 0
2304 },
2305 );
2306
2307 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2308 tooltip => "View Documentation");
2309
2310 $BUTTONBAR->add (new DC::UI::Button
2311 text => "Quit",
2312 tooltip => "Terminates the program",
2313 on_activate => sub {
2314 if ($CONN) {
2315 open_quit_dialog;
2316 } else {
2317 EV::unloop EV::UNLOOP_ALL;
2318 }
2319 0
2320 },
2321 );
2322
2323 $BUTTONBAR->show;
2324 $SETUP_DIALOG->show; 2601 $SETUP_DIALOG->show;
2325 $MESSAGE_WINDOW->show; 2602 $MESSAGE_WINDOW->show;
2326 } 2603 }
2327 2604
2605 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2606 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2607
2608 $CAVEAT_LABEL->set_text ("None :)");
2609 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2610 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2611 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2612 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2613
2328 $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]);
2329} 2615}
2330 2616
2331sub video_shutdown { 2617sub video_shutdown {
2332 DC::OpenGL::shutdown; 2618 DC::OpenGL::shutdown;
2619 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2333 2620
2334 undef $SDL_ACTIVE; 2621 undef $SDL_ACTIVE;
2335} 2622}
2336 2623
2337my %animate_object; 2624my %animate_object;
2356my $want_refresh = EV::prepare_ns \&force_refresh; 2643my $want_refresh = EV::prepare_ns \&force_refresh;
2357 2644
2358my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2645my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2359 $NOW = EV::now; 2646 $NOW = EV::now;
2360 2647
2361 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2648 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2362 for DC::poll_events; 2649 for DC::poll_events;
2363 2650
2364 if (%animate_object) { 2651 if (%animate_object) {
2365 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2652 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2366 $WANT_REFRESH = 1; 2653 $WANT_REFRESH = 1;
2378sub animation_stop { 2665sub animation_stop {
2379 my ($widget) = @_; 2666 my ($widget) = @_;
2380 delete $animate_object{$widget}; 2667 delete $animate_object{$widget};
2381} 2668}
2382 2669
2383%SDL_CB = (
2384 DC::SDL_QUIT => sub { 2670$SDL_CB[DC::SDL_QUIT] = sub {
2671 crash "SDL_QUIT";
2385 EV::unloop EV::UNLOOP_ALL; 2672 EV::unloop EV::UNLOOP_ALL;
2386 }, 2673};
2387 DC::SDL_VIDEORESIZE => sub { 2674$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2388 },
2389 DC::SDL_VIDEOEXPOSE => sub { 2675$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2390 DC::UI::full_refresh; 2676 DC::UI::full_refresh;
2391 }, 2677};
2392 DC::SDL_ACTIVEEVENT => sub { 2678$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2393# not useful, as APPACTIVE includes only iconified state, not unmapped 2679# not useful, as APPACTIVE includes only iconified state, not unmapped
2394# 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#
2395# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2681# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2396# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2682# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2397# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2683# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2398# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2684# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2399 }, 2685};
2400 DC::SDL_KEYDOWN => sub { 2686$SDL_CB[DC::SDL_KEYDOWN] = sub {
2401 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2687 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2402 # alt-enter 2688 # alt-enter
2689 video_shutdown;
2403 $FULLSCREEN_ENABLE->toggle; 2690 $FULLSCREEN_ENABLE->toggle;
2404 video_shutdown;
2405 video_init; 2691 video_init;
2406 } else { 2692 } else {
2407 &DC::UI::feed_sdl_key_down_event; 2693 &DC::UI::feed_sdl_key_down_event;
2408 } 2694 }
2409 update_modbox; 2695 update_modbox;
2410 }, 2696};
2411 DC::SDL_KEYUP => sub { 2697$SDL_CB[DC::SDL_KEYUP] = sub {
2412 &DC::UI::feed_sdl_key_up_event; 2698 &DC::UI::feed_sdl_key_up_event;
2413 update_modbox; 2699 update_modbox;
2414 }, 2700};
2415 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2701$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2416 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2702$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2417 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2703$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2418 DC::SDL_USEREVENT => sub { 2704$SDL_CB[DC::SDL_USEREVENT] = sub {
2419 if ($_[0]{code} == 1) { 2705 if ($_[0]{code} == 1) {
2420 audio_channel_finished $_[0]{data1}; 2706 audio_channel_finished $_[0]{data1};
2421 } elsif ($_[0]{code} == 0) { 2707 } elsif ($_[0]{code} == 0) {
2422 audio_music_finished; 2708 audio_music_finished;
2423 }
2424 }, 2709 }
2425); 2710};
2426 2711
2427############################################################################# 2712#############################################################################
2428 2713
2429$SIG{INT} = $SIG{TERM} = sub { 2714$SIG{INT} = $SIG{TERM} = sub {
2430 EV::unloop; 2715 EV::unloop;
2431 #d# TODO calling exit here hangs the process in some futex 2716 #d# TODO calling exit here hangs the process in some futex
2432}; 2717};
2433 2718
2434{ 2719# due to mac os x + sdl combined braindamage, we need this contortion
2720sub main {
2721 {
2435 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2722 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2436 2723
2437 if (-e "$Deliantra::VARDIR/client.cf") { 2724 if (-e "$Deliantra::VARDIR/client.cf") {
2438 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2725 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2439 } else { 2726 } else {
2440 #TODO: compatibility cruft 2727 #TODO: compatibility cruft
2441 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2728 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2442 print STDERR "INFO: used old configuration file\n"; 2729 print STDERR "INFO: used old configuration file\n";
2443 } 2730 }
2444 2731
2445 DC::DB::Server::run; 2732 DC::DB::Server::run;
2446 2733
2447 if ($CFG->{db_schema} < 1) { 2734 if ($CFG->{db_schema} < 1) {
2448 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";
2449 DC::DB::nuke_db; 2736 DC::DB::nuke_db;
2450 $CFG->{db_schema} = 1; 2737 $CFG->{db_schema} = 1;
2451 DC::write_cfg; 2738 DC::write_cfg;
2452 } 2739 }
2453 2740
2454 DC::DB::open_db; 2741 DC::DB::open_db;
2455 2742
2456 DC::UI::set_layout ($::CFG->{layout}); 2743 DC::UI::set_layout ($::CFG->{layout});
2457 2744
2458 my %DEF_CFG = ( 2745 my %DEF_CFG = (
2746 config_autosave => 1,
2459 sdl_mode => 0, 2747 sdl_mode => undef,
2460 fullscreen => 1, 2748 fullscreen => 1,
2461 fast => 0, 2749 fast => 0,
2462 force_opengl11 => undef, 2750 force_opengl11 => undef,
2751 disable_alpha => 0,
2752 smooth_movement => 1,
2753 smooth_transitions => 1,
2463 texture_compression => 1, 2754 texture_compression => 1,
2464 map_scale => 1, 2755 map_scale => 1,
2465 fow_enable => 1, 2756 fow_enable => 1,
2466 fow_intensity => 0, 2757 fow_intensity => 0,
2758 fow_texture => 0,
2467 map_smoothing => 1, 2759 map_smoothing => 1,
2468 gui_fontsize => 1, 2760 gui_fontsize => 1,
2469 log_fontsize => 0.7, 2761 log_fontsize => 0.7,
2470 gauge_fontsize => 1, 2762 gauge_fontsize => 1,
2471 gauge_size => 0.35, 2763 gauge_size => 0.35,
2472 stat_fontsize => 0.7, 2764 stat_fontsize => 0.7,
2473 mapsize => 100, 2765 mapsize => 100,
2474 audio_enable => 1, 2766 audio_enable => 1,
2475 audio_hw_channels => 0, 2767 audio_hw_channels => 0,
2476 audio_hw_frequency => 0, 2768 audio_hw_frequency => 0,
2477 audio_hw_chunksize => 0, 2769 audio_hw_chunksize => 0,
2478 audio_mix_channels => 8, 2770 audio_mix_channels => 8,
2479 effects_enable => 1, 2771 effects_enable => 1,
2480 effects_volume => 1, 2772 effects_volume => 1,
2481 bgm_enable => 1, 2773 bgm_enable => 1,
2482 bgm_volume => 0.5, 2774 bgm_volume => 0.5,
2483 output_rate => "", 2775 output_rate => "",
2484 pickup => 0, 2776 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2485 inv_sort => "mtime", 2777 inv_sort => "mtime",
2486 default => "profile", # default profile 2778 default => "profile", # default profile
2487 show_tips => 1, 2779 show_tips => 1,
2488 logview_max_par => 1000, 2780 logview_max_par => 1000,
2489 shift_fire_stop => 0, 2781 shift_fire_stop => 0,
2782 uitheme => "wood",
2783 map_shift_x => -24, # arbitrary
2784 map_shift_y => +24, # arbitrary
2490 ); 2785 );
2491 2786
2492 while (my ($k, $v) = each %DEF_CFG) { 2787 while (my ($k, $v) = each %DEF_CFG) {
2493 $CFG->{$k} = $v unless exists $CFG->{$k}; 2788 $CFG->{$k} = $v unless exists $CFG->{$k};
2494 } 2789 }
2495 2790
2496 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2791 my @args = @ARGV;
2497 $PROFILE = $CFG->{profile}{default};
2498 2792
2499 # convert old bindings (only default profile matters) 2793 my $profile = 'default';
2500 if (my $bindings = delete $PROFILE->{bindings}) { 2794
2501 while (my ($mod, $syms) = each %$bindings) { 2795 for (my $i = 0; $i < @args; $i++) {
2502 while (my ($sym, $cmds) = each %$syms) { 2796 if ($args[$i] =~ /^--?profile$/) {
2503 push @{ $PROFILE->{macro} }, { 2797 $profile = $args[$i + 1];
2504 accelkey => [$mod*1, $sym*1], 2798 splice @args, $i, 2, ();
2505 action => $cmds,
2506 }; 2799 $i = 0;
2800 } elsif ($args[$i] =~ /^--?h/) {
2801 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2802 exit 0;
2507 } 2803 }
2508 } 2804 }
2509 }
2510 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
2511 sdl_init; 2826 sdl_init;
2512 2827
2513 @SDL_MODES = DC::SDL_ListModes 8, 8; 2828 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2514 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2829 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2515 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2516 2830
2517 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2831 {
2518
2519 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2520
2521 {
2522 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2832 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2523 DejaVuSans.ttf 2833 DejaVuSans.ttf
2524 DejaVuSansMono.ttf 2834 DejaVuSansMono.ttf
2525 DejaVuSans-Bold.ttf 2835 DejaVuSans-Bold.ttf
2526 DejaVuSansMono-Bold.ttf 2836 DejaVuSansMono-Bold.ttf
2527 DejaVuSans-Oblique.ttf 2837 DejaVuSans-Oblique.ttf
2528 DejaVuSansMono-Oblique.ttf 2838 DejaVuSansMono-Oblique.ttf
2529 DejaVuSans-BoldOblique.ttf 2839 DejaVuSans-BoldOblique.ttf
2530 DejaVuSansMono-BoldOblique.ttf 2840 DejaVuSansMono-BoldOblique.ttf
2841 mona.ttf
2531 ); 2842 );
2532 2843
2533 DC::add_font $_ for @fonts; 2844 DC::add_font $_ for @fonts;
2534 2845
2535 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2846 $FONT_PROP = new_from_file DC::Font $fonts[0];
2536 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2847 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2537 2848
2538 $FONT_PROP->make_default; 2849 $FONT_PROP->make_default;
2539 2850
2540 DC::pango_init; 2851 DC::pango_init;
2541 } 2852 }
2542 2853
2543# compare mono (ft) vs. rgba (cairo) 2854# compare mono (ft) vs. rgba (cairo)
2544# ft - 1.8s, cairo 3s, even in alpha-only mode 2855# ft - 1.8s, cairo 3s, even in alpha-only mode
2545# for my $rgba (0..1) { 2856# for my $rgba (0..1) {
2546# my $t1 = Time::HiRes::time; 2857# my $t1 = Time::HiRes::time;
2551# } 2862# }
2552# my $t2 = Time::HiRes::time; 2863# my $t2 = Time::HiRes::time;
2553# warn $t2-$t1; 2864# warn $t2-$t1;
2554# } 2865# }
2555 2866
2556 video_init; 2867 video_init;
2557 audio_init; 2868 audio_init;
2558} 2869 }
2559 2870
2560show_tip_of_the_day if $CFG->{show_tips}; 2871 show_tip_of_the_day if $CFG->{show_tips};
2561 2872
2562our $STARTUP_CANCEL = EV::idle sub { 2873 our $STARTUP_CANCEL = EV::idle sub {
2563 undef $::STARTUP_CANCEL; 2874 undef $::STARTUP_CANCEL;
2564 $startup_done->(); 2875 $startup_done->();
2565}; 2876 };
2566 2877
2567delete $SIG{__DIE__}; 2878 delete $SIG{__DIE__};
2568EV::loop; 2879 EV::loop;
2569 2880
2881 DC::write_cfg if $CFG->{config_autosave};
2882
2570#video_shutdown; 2883 #video_shutdown;
2571#audio_shutdown; 2884 #audio_shutdown;
2885
2572DC::OpenGL::quit; 2886 DC::OpenGL::quit;
2573DC::SDL_Quit; 2887 DC::SDL_Quit;
2574DC::DB::Server::stop; 2888 DC::DB::Server::stop;
2889}
2890
2891DC::SDL_braino; # see sub above
2575 2892
2576=head1 NAME 2893=head1 NAME
2577 2894
2578deliantra - A Deliantra MORPG game client 2895deliantra - A Deliantra MORPG game client
2579 2896
2580=head1 SYNOPSIS 2897=head1 SYNOPSIS
2581 2898
2582Just run it - no commandline arguments are supported. 2899 deliantra [--profile name] [host [user [password]]]
2900 deliantra --help
2583 2901
2584=head1 USAGE 2902=head1 USAGE
2585 2903
2586deliantra 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
2587be used in fullscreen mode and interactively. 2905is supposed to be used in fullscreen mode and interactively.
2588 2906
2589=head1 DEBUGGING 2907=head1 DEBUGGING
2590
2591 2908
2592CFPLUS_DEBUG - environment variable 2909CFPLUS_DEBUG - environment variable
2593 2910
2594 1 draw borders around widgets 2911 1 draw borders around widgets
2595 2 add low-level widget info to tooltips 2912 2 add low-level widget info to tooltips
2596 4 show fps 2913 4 show fps
2597 8 suppress tooltips 2914 8 suppress tooltips
2598 2915
2599=head1 AUTHOR 2916=head1 AUTHOR
2600 2917
2601Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2918Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2602 2919
2603 2920
2604 2921

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines