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.42 by elmex, Thu May 8 18:25:25 2008 UTC vs.
Revision 1.109 by root, Thu Apr 8 19:11:21 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 new DC::Protocol 803 new DC::Protocol
744 host => $host, 804 host => $host,
745 port => $port || 13327, 805 port => $port,
746 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
747 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
748 mapw => $mapsize, 808 mapw => $mapw,
749 maph => $mapsize, 809 maph => $maph,
750 810
811 c_version => {
812 client => "deliantra",
751 client => "$DC::VERSION $] $^O", 813 clientver => $DC::VERSION,
814 gl_vendor => DC::OpenGL::gl_vendor,
815 gl_version => DC::OpenGL::gl_version,
816 },
752 817
753 map_widget => $MAPWIDGET, 818 map_widget => $MAPWIDGET,
754 statusbox => $STATUSBOX, 819 statusbox => $STATUSBOX,
755 map => $MAP, 820 map => $MAP,
756 mapmap => $MAPMAP, 821 mapmap => $MAPMAP,
757 query => \&server_query, 822 query => \&server_query,
758 823
759 setup_req => { 824 setup_req => {
760 smoothing => $CFG->{map_smoothing}*1, 825 smoothing => $CFG->{map_smoothing}*1,
761 }, 826 },
762 };
763 827
764 if ($CONN) { 828 on_connect => sub {
829 if ($_[0]) {
765 DC::lowdelay fileno $CONN->{fh}; 830 DC::lowdelay fileno $CONN->{fh};
766 831
767 status "login successful"; 832 status "successfully connected to the server";
833 } else {
834 undef $CONN;
835 status "unable to connect: $!";
836 stop_game();
837 }
838 },
839 ;
840}
841
842sub start_game {
843 status "logging in...";
844
845 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
846 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
847 or return status "$server: unable to parse server address, try an empty field.";
848
849 $LOGIN_BUTTON->set_text ("Logout");
850 $SETUP_DIALOG->hide;
851
852 $MAP = new DC::Map;
853
854 # hack to make SURE we find the IP address all right
855 # can be removed once AnyEvent::DNS is proven stable.
856 if ($host eq "gameserver.deliantra.net") {
857 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
858 if ($_[0] ne "80.101.114.108") { # Perl
859 status "dns failure, trying differently";
860 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
861 unless (defined $host) {
862 status "dns failure, using hardcoded address";
863 $host = "129.13.162.95";
864 }
865 }
866
867 dc_connect $host, $port;
868 };
768 } else { 869 } else {
769 warn $@; 870 dc_connect $host, $port;
770 status "unable to connect";
771 stop_game();
772 } 871 }
773} 872}
774 873
775sub stop_game { 874sub stop_game {
875 crash "stop_game";
876
776 $LOGIN_BUTTON->set_text ("Login / Register"); 877 $LOGIN_BUTTON->set_text ("Login / Register");
777 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 878 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
778 $SETUP_DIALOG->show; 879 $SETUP_DIALOG->show;
779 $PL_WINDOW->hide; 880 $PL_WINDOW->hide;
780 $SPELL_LIST->clear_spells; 881 $SPELL_LIST->clear_spells;
794} 895}
795 896
796sub graphics_setup { 897sub graphics_setup {
797 my $vbox = new DC::UI::VBox; 898 my $vbox = new DC::UI::VBox;
798 899
900 {
901 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
902
799 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 903 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
800 904
801 my $row = 0; 905 my $row = 0;
802 906
803 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
804 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 908 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
805 can_events => 1, 909 can_events => 1,
806 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 910 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
807 911
912 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
913 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
914 can_events => 1,
915 tooltip => "This field shows any known issues with your config or driver, such as "
916 . "a non-accelerated display format. You can try to work around these issues "
917 . "by selecting a different video mode, changing the settings below or "
918 . "by installing the right driver for your graphics card.");
919
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
921 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
922 value => $CFG->{uitheme},
923 options => [
924 [wood => "Wood (the default)"],
925 [plain => "Plain (very)"],
926 [blue => "Blue (dark)"],
927 [metal => "Metal (light)"],
928 ],
929 tooltip => "Choose the User Interface theme that you like most :)",
930 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
931 );
932
808 my $vidmode_tooltip = 933 my $vidmode_tooltip =
809 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 934 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
810 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 935 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
811 936
812 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
813 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 938 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
814 939
815 $hbox->add (my $mode_slider = new DC::UI::Slider 940 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
816 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 941 c_rescale => 1,
942 force_w => $WIDTH * 0.1, expand => 1,
943 range => [ ($CFG->{sdl_mode}) x 3 ],
817 tooltip => $vidmode_tooltip); 944 tooltip => $vidmode_tooltip);
818 $hbox->add (my $mode_label = new DC::UI::Label 945 $hbox->add (my $mode_label = new DC::UI::Label
819 height => 0.8, template => "9999x9999@9+9", 946 height => 0.8, template => "9999x9999@9+9",
820 can_events => 1, tooltip => $vidmode_tooltip); 947 can_events => 1, tooltip => $vidmode_tooltip);
821 948
822 $mode_slider->connect (changed => sub { 949 $MODE_SLIDER->connect (changed => sub {
823 my ($self, $value) = @_; 950 my ($self, $value) = @_;
824 951
825 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 952 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
826 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 953 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
827 }); 954 });
828 $mode_slider->emit (changed => $mode_slider->{range}[0]); 955 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
829 956
830 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
831 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 958 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
832 state => $CFG->{fullscreen}, 959 state => $CFG->{fullscreen},
833 tooltip => "Bring the client into fullscreen mode.", 960 tooltip => "Bring the client into fullscreen mode.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 961 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
835 ); 962 );
836 963
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 964 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
838 $table->add_at (1, $row++, new DC::UI::CheckBox 965 $table->add_at (1, $row++, new DC::UI::CheckBox
839 state => $CFG->{force_opengl11}, 966 state => $CFG->{force_opengl11},
840 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 967 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
841 . "higher memory usage and slower performance. It will, however, help tremendously on " 968 . "higher memory usage and slower performance. It will, however, help tremendously on "
842 . "cards that claim to support a feature but fall back to software rendering. " 969 . "cards that claim to support a feature but fall back to software rendering. "
843 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 970 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
844 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 971 . "but cards and drivers from other vendors (ATI) are often just as bad. "
845 . "experience extremely low framerates and your card should do better, try this option.</b>", 972 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
846 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 973 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
847 ); 974 );
848 975
976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
977 $table->add_at (1, $row++, new DC::UI::CheckBox
978 state => $CFG->{disable_alpha},
979 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
980 . "by disabling a number of textures and transparency effects. Normally, these "
981 . "effects do not cost a lot of resources, but some graphics cards might fall "
982 . "back to extremely slow rendering if this is enabled. If disabling this option "
983 . "noticably improves the framerate of the client please report this! "
984 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
985 on_changed => sub {
986 my ($self, $value) = @_;
987 $CFG->{disable_alpha} = $value;
988 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
989 0
990 }
991 );
992
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
850 $table->add_at (1, $row++, new DC::UI::CheckBox 994 $table->add_at (1, $row++, new DC::UI::CheckBox
851 state => $CFG->{texture_compression}, 995 state => $CFG->{texture_compression},
852 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 996 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
853 . "will save a lot of memory and increase performance. The compression algorithm " 997 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
854 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 998 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
855 . "forced OpenGL 1.1 mode.", 999 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
856 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
857 ); 1001 );
858 1002
859 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
860 $table->add_at (1, $row++, new DC::UI::CheckBox 1004 $table->add_at (1, $row++, new DC::UI::CheckBox
861 state => $CFG->{fast}, 1005 state => $CFG->{fast},
862 tooltip => "Lower the visual quality considerably to speed up rendering.", 1006 tooltip => "Lower the visual quality considerably to speed up rendering.",
863 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
864 ); 1008 );
865 1009
866 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1010 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
867 $table->add_at (1, $row++, new DC::UI::Slider 1011 $table->add_at (1, $row++, new DC::UI::Slider
868 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1012 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
869 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1013 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
870 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1014 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
871 ); 1015 );
872 1016
873 $table->add_at (1, $row++, new DC::UI::Button 1017 $table->add_at (1, $row++, new DC::UI::Button
874 expand => 1, text => "Apply", 1018 expand => 1, text => "Apply",
875 tooltip => "Apply the video settings above.", 1019 tooltip => "Apply the video settings above.",
876 on_activate => sub { 1020 on_activate => sub {
877 video_shutdown (); 1021 video_shutdown ();
878 video_init (); 1022 video_init ();
1023 0
879 0 1024 }
880 } 1025 );
1026 }
1027
1028 {
1029 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1030
1031 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1032
1033 my $row = 0;
1034 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1035 $table->add_at (1, $row++, new DC::UI::CheckBox
1036 state => $CFG->{smooth_movement},
1037 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1038 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1039 . "then disable this option. Changes take effect immdiately.",
1040 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
881 ); 1041 );
882 1042
1043 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1044 $table->add_at (1, $row++, new DC::UI::CheckBox
1045 state => $CFG->{smooth_transitions},
1046 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1047 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1048 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1049 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1050 );
1051
1052
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
884 $table->add_at (1, $row++, new DC::UI::Slider 1054 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1055 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
886 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1056 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
887 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1057 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
888 ); 1058 );
889 1059
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
891 $table->add_at (1, $row++, new DC::UI::CheckBox 1061 $table->add_at (1, $row++, new DC::UI::CheckBox
892 state => $CFG->{map_smoothing}, 1062 state => $CFG->{map_smoothing},
893 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1063 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
894 . "This increases load on the graphics subsystem and works only with TRT servers. " 1064 . "This increases load on the graphics subsystem and works only with TRT servers. "
895 . "Changes take effect at next login only.", 1065 . "Changes take effect at next login only.",
896 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
897 ); 1067 );
898 1068
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
900 $table->add_at (1, $row++, new DC::UI::CheckBox 1070 $table->add_at (1, $row++, new DC::UI::CheckBox
901 state => $CFG->{fow_enable}, 1071 state => $CFG->{fow_enable},
902 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1072 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
903 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1073 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
904 ); 1074 );
905 1075
1076 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1077 $table->add_at (1, $row++, new DC::UI::ImageButton
1078 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1079 bg => [0.3, 0.3, 0.2],
1080 force_w => 64,
1081 force_h => 64,
1082 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1083 on_activate => sub {
1084 my ($self) = @_;
1085 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1086 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1087 $MAPWIDGET->update;
1088 }
1089 );
1090
906 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1091 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
907 $table->add_at (1, $row++, new DC::UI::Slider 1092 $table->add_at (1, $row++, new DC::UI::Slider
908 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1093 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
909 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1094 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1095 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
911 ); 1096 );
912 1097
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1098 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
914 $table->add_at (1, $row++, new DC::UI::Slider 1099 $table->add_at (1, $row++, new DC::UI::Slider
915 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1100 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
916 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1101 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
917 . "but you still need to press apply to correctly re-layout the widget.", 1102 . "but you still need to press apply to correctly re-layout the widget.",
918 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1103 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
919 ); 1104 );
920 1105
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1106 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
922 $table->add_at (1, $row++, new DC::UI::Slider 1107 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1108 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1109 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
925 on_changed => sub { 1110 on_changed => sub {
926 $CFG->{gauge_fontsize} = $_[1]; 1111 $CFG->{gauge_fontsize} = $_[1];
927 &set_gauge_window_fontsize; 1112 &set_gauge_window_fontsize;
1113 0
928 0 1114 }
929 } 1115 );
930 );
931 1116
932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1117 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
933 $table->add_at (1, $row++, new DC::UI::Slider 1118 $table->add_at (1, $row++, new DC::UI::Slider
934 range => [$CFG->{gauge_size}, 0.2, 0.8], 1119 range => [$CFG->{gauge_size}, 0.2, 0.8],
935 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1120 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
936 on_changed => sub { 1121 on_changed => sub {
937 $CFG->{gauge_size} = $_[1]; 1122 $CFG->{gauge_size} = $_[1];
938 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1123 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1124 0
939 0 1125 }
940 } 1126 );
941 ); 1127 }
942 1128
943 $vbox 1129 $vbox
944} 1130}
945 1131
946our $AUDIO_HW_CHUNKSIZE; 1132our $AUDIO_HW_CHUNKSIZE;
959 1145
960 my $text = !$freq 1146 my $text = !$freq
961 ? "audio is off" 1147 ? "audio is off"
962 : "audio is enabled\n" 1148 : "audio is enabled\n"
963 . "frequency (Hz): $freq\n" 1149 . "frequency (Hz): $freq\n"
964 . "channels: $chans"; 1150 . "channels: $chans\n"
1151 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1152 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
965 1153
966 $AUDIO_INFO->set_text ($text); 1154 $AUDIO_INFO->set_text ($text);
967} 1155}
968 1156
969sub audio_setup { 1157sub audio_setup {
1109} 1297}
1110 1298
1111sub make_gauge_window { 1299sub make_gauge_window {
1112 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1300 my $gh = int $HEIGHT * $CFG->{gauge_size};
1113 1301
1114 my $win = new DC::UI::Frame ( 1302 $GAUGES->{win} = my $win = new DC::UI::Frame (
1115 force_x => 0, 1303 force_x => 0,
1116 force_y => "max", 1304 force_y => "max",
1117 force_w => $WIDTH, 1305 force_w => $WIDTH,
1118 force_h => $gh, 1306 force_h => $gh,
1119 ); 1307 );
1135 (new DC::UI::Empty expand => 1), 1323 (new DC::UI::Empty expand => 1),
1136 (my $hb = new DC::UI::HBox), 1324 (my $hb = new DC::UI::HBox),
1137 ], 1325 ],
1138 ); 1326 );
1139 1327
1140 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1328 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1141 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1329 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1142 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1330 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1143 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1331 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1144
1145 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1146 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1147 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1148 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1149
1150 $GAUGES = {
1151 exp => $exp, prg => $prg, sklprg => $sklprg,
1152 win => $win, range => $rng,
1153 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1154 };
1155 1332
1156 &set_gauge_window_fontsize; 1333 &set_gauge_window_fontsize;
1157 1334
1158 $win 1335 $win
1159} 1336}
1500 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1677 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1501 ); 1678 );
1502 1679
1503 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1680 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1504 $table->add_at (1, 4, new DC::UI::Entry 1681 $table->add_at (1, 4, new DC::UI::Entry
1505 text => $CFG->{profile}{default}{user}, 1682 text => $PROFILE->{user},
1506 tooltip => "The name of your character on the server.", 1683 tooltip => "The name of your character on the server. The name is case-sensitive!",
1507 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1684 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1508 ); 1685 );
1509 1686
1510 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1687 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1511 $table->add_at (1, 5, new DC::UI::Entry 1688 $table->add_at (1, 5, new DC::UI::Entry
1512 text => $CFG->{profile}{default}{password}, 1689 text => $PROFILE->{password},
1513 hidden => 1, 1690 hidden => 1,
1514 tooltip => "The password for your character.", 1691 tooltip => "The password for your character.",
1515 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1692 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1516 ); 1693 );
1517 1694
1518 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1695 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1519 expand => 1, 1696 expand => 1,
1520 text => "Login / Register", 1697 text => "Login / Register",
1525 1 1702 1
1526 }, 1703 },
1527 ); 1704 );
1528 1705
1529 $vbox->add (new DC::UI::FancyFrame 1706 $vbox->add (new DC::UI::FancyFrame
1530 label => "Registering", 1707 label => "How to Play",
1531 min_h => 200, 1708 min_h => 240,
1532 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1709 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1533 markup => 1710 markup =>
1711 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1712 . "Then register a new account (or use an existing one if you have one). "
1534 "To register a new account, choose a username that hasn't been taken yet and " 1713 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1535 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1714 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1536 ), 1715 ),
1537 ); 1716 );
1538 1717
1539 $vbox 1718 $vbox
1554 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1733 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1555 1734
1556 $vbox->add ( 1735 $vbox->add (
1557 $HOST_ENTRY = new DC::UI::Entry 1736 $HOST_ENTRY = new DC::UI::Entry
1558 expand => 1, 1737 expand => 1,
1559 text => $CFG->{profile}{default}{host}, 1738 text => $PROFILE->{host},
1560 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1739 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1561 on_changed => sub { 1740 on_changed => sub {
1562 my ($self, $value) = @_; 1741 my ($self, $value) = @_;
1563 $CFG->{profile}{default}{host} = $value; 1742 $PROFILE->{host} = $value;
1564 1 1743 1
1565 } 1744 }
1566 ); 1745 );
1567 1746
1568 if (0) { #d# disabled 1747 if (0) { #d# disabled
1611 1790
1612 my $row = 0; 1791 my $row = 0;
1613 1792
1614 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1793 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1615 $table->add_at (1, $row++, new DC::UI::CheckBox 1794 $table->add_at (1, $row++, new DC::UI::CheckBox
1795 c_colspan => 2,
1616 state => $CFG->{show_tips}, 1796 state => $CFG->{show_tips},
1617 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1797 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1618 on_changed => sub { 1798 on_changed => sub {
1619 my ($self, $value) = @_; 1799 my ($self, $value) = @_;
1620 $CFG->{show_tips} = $value; 1800 $CFG->{show_tips} = $value;
1622 } 1802 }
1623 ); 1803 );
1624 1804
1625 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1805 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1626 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1806 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1807 c_colspan => 2,
1627 text => $CFG->{logview_max_par}, 1808 text => $CFG->{logview_max_par},
1628 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1809 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1629 . "sends more messages than this number, older messages get removed to save memory and " 1810 . "sends more messages than this number, older messages get removed to save memory and "
1630 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1811 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1631 on_changed => sub { 1812 on_changed => sub {
1633 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1814 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1634 0 1815 0
1635 }, 1816 },
1636 ); 1817 );
1637 1818
1819 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1820 $table->add_at (1, $row, new DC::UI::CheckBox
1821 state => $CFG->{config_autosave},
1822 tooltip => "Normally, configuration settings and the user interface layout "
1823 . "are saved on client exit. You can disable this behaviour by "
1824 . "unchecking this checkbox.",
1825 on_changed => sub {
1826 my ($self, $value) = @_;
1827 $CFG->{config_autosave} = $value;
1828 0
1829 }
1830 );
1831 $table->add_at (2, $row++, new DC::UI::Button
1832 text => "Save Now",
1833 tooltip => "Use this to manually save configuration and UI layout when "
1834 . "autosave is disabled.",
1835 on_activate => sub {
1836 DC::write_cfg;
1837 0
1838 }
1839 );
1840
1638 $table 1841 $table
1639} 1842}
1640 1843
1641sub autopickup_setup { 1844sub autopickup_setup {
1642 my $r = new DC::UI::ScrolledWindow ( 1845 my $r = new DC::UI::ScrolledWindow (
1648 col_expand => [0, 1, 0, 1], 1851 col_expand => [0, 1, 0, 1],
1649 ); 1852 );
1650 1853
1651 for ( 1854 for (
1652 ["General", 0, 0, 1855 ["General", 0, 0,
1653 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1654 ["Inhibit autopickup" => PICKUP_INHIBIT], 1856# ["Inhibit autopickup" => PICKUP_INHIBIT],
1655 ["Stop before pickup" => PICKUP_STOP], 1857 ["Stop before pickup" => PICKUP_STOP],
1656 ["Debug autopickup" => PICKUP_DEBUG], 1858 ["Debug autopickup" => PICKUP_DEBUG],
1657 ], 1859 ],
1658 ["Weapons", 0, 6, 1860 ["Weapons", 0, 6,
1659 ["All weapons" => PICKUP_ALLWEAPON], 1861 ["All weapons" => PICKUP_ALLWEAPON],
1685 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1887 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1686 ["Ignore cursed" => PICKUP_NOT_CURSED], 1888 ["Ignore cursed" => PICKUP_NOT_CURSED],
1687 ["Jewelery" => PICKUP_JEWELS], 1889 ["Jewelery" => PICKUP_JEWELS],
1688 ["Flesh" => PICKUP_FLESH], 1890 ["Flesh" => PICKUP_FLESH],
1689 ], 1891 ],
1690 ["Weight/Value ratio", 2, 17] 1892 ["Value/Weight ratio", 2, 17]
1691 ) 1893 )
1692 { 1894 {
1693 my ($title, $x, $y, @bits) = @$_; 1895 my ($title, $x, $y, @bits) = @$_;
1694 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1896 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1695 1897
1707 $::CFG->{pickup} |= $mask; 1909 $::CFG->{pickup} |= $mask;
1708 } else { 1910 } else {
1709 $::CFG->{pickup} &= ~$mask; 1911 $::CFG->{pickup} &= ~$mask;
1710 } 1912 }
1711 1913
1712 $::CONN->send_command ("pickup $::CFG->{pickup}") 1914 $::CONN->send_pickup ($::CFG->{pickup})
1713 if defined $::CONN; 1915 if defined $::CONN;
1714 1916
1715 0 1917 0
1716 }); 1918 });
1717 1919
1720 } 1922 }
1721 1923
1722 $table->add_at (2, 18, new DC::UI::ValSlider 1924 $table->add_at (2, 18, new DC::UI::ValSlider
1723 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1925 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1724 template => ">= 99", 1926 template => ">= 99",
1927 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1725 to_value => sub { ">= " . 5 * $_[0] }, 1928 to_value => sub { ">= " . 5 * $_[0] },
1726 on_changed => sub { 1929 on_changed => sub {
1727 my ($slider, $value) = @_; 1930 my ($slider, $value) = @_;
1728 1931
1729 $::CFG->{pickup} &= ~0xF; 1932 $::CFG->{pickup} &= ~0xF;
1733 }); 1936 });
1734 1937
1735 $table->add_at (3, 18, new DC::UI::Button 1938 $table->add_at (3, 18, new DC::UI::Button
1736 text => "set", 1939 text => "set",
1737 on_activate => sub { 1940 on_activate => sub {
1738 $::CONN->send_command ("pickup $::CFG->{pickup}") 1941 $::CONN->send_pickup ($::CFG->{pickup})
1739 if defined $::CONN; 1942 if defined $::CONN;
1740 0 1943 0
1741 }); 1944 });
1742 1945
1743 $r 1946 $r
1744} 1947}
1745 1948
1746my %SORT_ORDER = ( 1949my %SORT_ORDER = (
1747 type => sub { 1950 type => sub {
1951 use sort 'stable';
1748 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1952 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1749 }, 1953 },
1750 mtime => sub { 1954 mtime => sub {
1955 use sort 'stable';
1751 my $NOW = time; 1956 my $NOW = time;
1752 sort { 1957 sort {
1753 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1958 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1754 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1959 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1755 1960
1756 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1961 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1757 or $btime <=> $atime 1962 or $btime <=> $atime
1758 or $a->{type} <=> $b->{type} 1963 or $a->{type} <=> $b->{type}
1759 } @_ 1964 } @_
1760 }, 1965 },
1761 weight => sub { sort { 1966 weight => sub {
1967 use sort 'stable';
1968 sort {
1762 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1969 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1763 or $a->{type} <=> $b->{type} 1970 or $a->{type} <=> $b->{type}
1764 } @_ }, 1971 } @_
1972 },
1765); 1973);
1766 1974
1767sub inventory_widget { 1975sub inventory_widget {
1768 my $hb = new DC::UI::HBox homogeneous => 1; 1976 my $hb = new DC::UI::HBox homogeneous => 1;
1769 1977
1785 $::CFG->{inv_sort} = $_[1]; 1993 $::CFG->{inv_sort} = $_[1];
1786 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1994 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1787 }, 1995 },
1788 ); 1996 );
1789 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1997 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1790 #TODO# update to weigh/maxweight 1998 #TODO# update to weight/maxweight
1791 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1999 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1792 2000
1793 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2001 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1794 $sw1->add ($INV = new DC::UI::Inventory); 2002 $sw1->add ($INV = new DC::UI::Inventory);
1795 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2003 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1856 $PL_NOTEBOOK->set_current_page ($widget); 2064 $PL_NOTEBOOK->set_current_page ($widget);
1857 $PL_WINDOW->show; 2065 $PL_WINDOW->show;
1858 } 2066 }
1859} 2067}
1860 2068
1861sub player_window { 2069sub make_playerbook {
1862 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2070 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1863 x => "center", 2071 x => "center",
1864 y => "center", 2072 y => "center",
1865 force_w => $WIDTH * 9/10, 2073 force_w => $WIDTH * 9/10,
1866 force_h => $HEIGHT * 9/10, 2074 force_h => $HEIGHT * 9/10,
1900 "License, Author and Source info for media sent by the server."); 2108 "License, Author and Source info for media sent by the server.");
1901 2109
1902 $ntb->set_current_page ($INVENTORY_PAGE); 2110 $ntb->set_current_page ($INVENTORY_PAGE);
1903 2111
1904 $plwin->add ($ntb); 2112 $plwin->add ($ntb);
1905 $plwin
1906} 2113}
1907 2114
1908sub keyboard_setup { 2115sub keyboard_setup {
1909 DC::Macro::keyboard_setup 2116 DC::Macro::keyboard_setup
1910} 2117}
1911 2118
1912sub help_window { 2119sub make_help_window {
1913 my $win = new DC::UI::Toplevel 2120 my $win = new DC::UI::Toplevel
1914 x => 'center', 2121 x => 'center',
1915 y => 'center', 2122 y => 'center',
1916 z => 4, 2123 z => 4,
1917 name => 'doc_browser', 2124 name => 'doc_browser',
2006 2213
2007 $load_node->((DC::Pod::find @path)[0]); 2214 $load_node->((DC::Pod::find @path)[0]);
2008 $win->show; 2215 $win->show;
2009 }; 2216 };
2010 2217
2011 $win 2218 $HELP_WINDOW = $win;
2012}
2013
2014sub open_string_query {
2015 my ($title, $cb, $txt, $tooltip) = @_;
2016 my $dialog = new DC::UI::Toplevel
2017 x => "center",
2018 y => "center",
2019 z => 50,
2020 force_w => $WIDTH * 4/5,
2021 title => $title;
2022
2023 $dialog->add (
2024 my $e = new DC::UI::Entry
2025 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2026 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2027 tooltip => $tooltip
2028 );
2029
2030 $e->grab_focus;
2031 $e->set_text ($txt) if $txt;
2032 $dialog->show;
2033} 2219}
2034 2220
2035sub open_quit_dialog { 2221sub open_quit_dialog {
2036 unless ($QUIT_DIALOG) { 2222 unless ($QUIT_DIALOG) {
2037 $QUIT_DIALOG = new DC::UI::Toplevel 2223 $QUIT_DIALOG = new DC::UI::Toplevel
2059 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2245 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2060 ); 2246 );
2061 $hb->add (new DC::UI::Button 2247 $hb->add (new DC::UI::Button
2062 text => "Quit anyway", 2248 text => "Quit anyway",
2063 expand => 1, 2249 expand => 1,
2064 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2250 on_activate => sub {
2251 crash "Quit anyway";
2252 EV::unloop EV::UNLOOP_ALL;
2253 },
2065 ); 2254 );
2066 } 2255 }
2067 2256
2068 $QUIT_DIALOG->show; 2257 $QUIT_DIALOG->show;
2069 $QUIT_DIALOG->grab_focus; 2258 $QUIT_DIALOG->grab_focus;
2259}
2260
2261sub make_menubar {
2262 $MENUFRAME = new DC::UI::Toplevel
2263 border => 0,
2264 force_x => 0,
2265 force_y => 0,
2266 force_w => $::WIDTH,
2267 child => ($MENUBAR = new DC::UI::HBox),
2268 ;
2269
2270 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2271
2272 # XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2273 make_gauge_window->show;
2274
2275# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2276# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2277
2278 make_playerbook;
2279
2280 $MENUPOPUP = DC::UI::Menu->new (items => [
2281 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2282 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2283 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2284 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2285 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2286 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2287 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2288 ["Quit…" , sub {
2289 if ($CONN) {
2290 open_quit_dialog;
2291 } else {
2292 EV::unloop EV::UNLOOP_ALL;
2293 }
2294 }],
2295 ]);
2296
2297 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2298 tooltip => "Shows the main menu",
2299 on_button_down => sub {
2300 my ($self, $ev) = @_;
2301 local $ev->{x} = 0;
2302 local $ev->{y} = 0;
2303 $MENUPOPUP->popup ($ev);
2304 },
2305 );
2306
2307 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2308 padding_x => 6,
2309 padding_y => 3,
2310 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2311 template => " Exp: 888,888,888,888 (lvl 188) ",
2312 );
2313
2314 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2315 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2316 . "will automatically pick up items as defined by your item pickup settings "
2317 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2318 . "disable autopickup by disabling this checkbox.",
2319 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2320 on_changed => sub {
2321 my ($self, $value) = @_;
2322 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2323 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2324 $CONN->send_pickup ($CFG->{pickup})
2325 if $CONN;
2326 },
2327 );
2328
2329 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2330 c_rescale => 1,
2331 padding_x => 6,
2332 padding_y => 3,
2333 force_w => $::WIDTH * 0.2,
2334 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2335 template => "two handed weapons 99%",
2336 );
2337
2338 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2339 expand => 1,
2340 align => 1, can_hover => 1, can_events => 1,
2341 text => "Range and Combat Slots",
2342 tooltip => "#stat_ranged",
2343 );
2344
2345 $MENUFRAME->show;
2346}
2347
2348sub open_string_query {
2349 my ($title, $cb, $txt, $tooltip) = @_;
2350 my $dialog = new DC::UI::Toplevel
2351 x => "center",
2352 y => "center",
2353 z => 50,
2354 force_w => $WIDTH * 4/5,
2355 title => $title;
2356
2357 $dialog->add (
2358 my $e = new DC::UI::Entry
2359 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2360 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2361 tooltip => $tooltip
2362 );
2363
2364 $e->grab_focus;
2365 $e->set_text ($txt) if $txt;
2366 $dialog->show;
2070} 2367}
2071 2368
2072sub show_tip_of_the_day { 2369sub show_tip_of_the_day {
2073 # find all tips 2370 # find all tips
2074 my @tod = DC::Pod::find tip_of_the_day => "*"; 2371 my @tod = DC::Pod::find tip_of_the_day => "*";
2122 $dialog->show; 2419 $dialog->show;
2123 }; 2420 };
2124} 2421}
2125 2422
2126sub sdl_init { 2423sub sdl_init {
2127 DC::SDL_Init 2424 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2128 and die "SDL::Init failed!\n"; 2425 and die "SDL::Init failed!\n";
2129} 2426}
2130 2427
2131sub video_init { 2428sub video_init {
2429 DC::set_theme $CFG->{uitheme};
2430
2431 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2432 $SDL_REINIT = 0;
2433
2434 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2435 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2436 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2437 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2438
2439 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2440
2132 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2441 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2442 $CFG->{sdl_mode} = 0; # lowest resolution by default
2443
2444 # now choose biggest mode <= 1024x768
2445 for (0 .. $#SDL_MODES) {
2446 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2447 $CFG->{sdl_mode} = $_;
2448 }
2449 }
2450 }
2133 2451
2134 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2452 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2135 2453
2136 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2454 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2137 $FULLSCREEN = $CFG->{fullscreen}; 2455 $FULLSCREEN = $CFG->{fullscreen};
2138 $FAST = $CFG->{fast}; 2456 $FAST = $CFG->{fast};
2139 2457
2458 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2140 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2459 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2460 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2141 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2461 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2142 2462
2143 $SDL_ACTIVE = 1; 2463 $SDL_ACTIVE = 1;
2144 $LAST_REFRESH = time - 0.01; 2464 $LAST_REFRESH = time - 0.01;
2145 2465
2192 2512
2193 (new DC::UI::Frame 2513 (new DC::UI::Frame
2194 bg => [0, 0, 0, 0.4], 2514 bg => [0, 0, 0, 0.4],
2195 force_x => 0, 2515 force_x => 0,
2196 force_y => "max", 2516 force_y => "max",
2197 child => (my $LR = new DC::UI::VBox), 2517 child => (my $LL = new DC::UI::VBox),
2198 )->show; 2518 )->show;
2199 2519
2200 $LR->add ($STATUSBOX); 2520 $LL->add ($STATUSBOX);
2201 $LR->add ($MODBOX); 2521 $LL->add ($MODBOX);
2202 $LR->add (new DC::UI::Label 2522 $LL->add (new DC::UI::Label
2203 align => 0, 2523 align => 0,
2204 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2524 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2205 fontsize => 0.5, 2525 fontsize => 0.5,
2206 fg => [1, 1, 0, 0.7], 2526 fg => [1, 1, 0, 0.7],
2207 ); 2527 );
2208 2528
2209 DC::UI::Toplevel->new ( 2529 DC::UI::Toplevel->new (
2210 title => "Minimap", 2530 title => "Minimap",
2211 name => "mapmap", 2531 name => "mapmap",
2212 x => 0, 2532 x => 0,
2213 y => $FONTSIZE + 8, 2533 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2214 border_bg => [1, 1, 1, 192/255], 2534 border_bg => [1, 1, 1, 192/255],
2215 bg => [1, 1, 1, 0], 2535 bg => [1, 1, 1, 0],
2216 child => ($MAPMAP = new DC::MapWidget::MapMap 2536 child => ($MAPMAP = new DC::MapWidget::MapMap
2217 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2537 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2218 ), 2538 ),
2219 )->show; 2539 )->show;
2220 2540
2221 $MAPWIDGET = new DC::MapWidget; 2541 $MAPWIDGET = new DC::MapWidget;
2222 $MAPWIDGET->connect (activate_console => sub { 2542 $MAPWIDGET->connect (activate_console => sub {
2247 $METASERVER = metaserver_dialog; 2567 $METASERVER = metaserver_dialog;
2248 # the name is changed to not conflict with the older name as users could have hidden it 2568 # the name is changed to not conflict with the older name as users could have hidden it
2249 $MESSAGE_WINDOW = new DC::UI::Dockbar 2569 $MESSAGE_WINDOW = new DC::UI::Dockbar
2250 name => "message_window2", 2570 name => "message_window2",
2251 title => 'Messages', 2571 title => 'Messages',
2572 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2252 force_w => $::WIDTH * 0.6, 2573 force_w => $::WIDTH * 0.6,
2253 force_h => $::HEIGHT * 0.25, 2574 force_h => $::HEIGHT * 0.25,
2254 ; 2575 ;
2255 2576
2256 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2577 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2276 . "After pressing the combo the binding will be saved automatically and the " 2597 . "After pressing the combo the binding will be saved automatically and the "
2277 . "binding editor closes"); 2598 . "binding editor closes");
2278 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2599 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2279 "Some debuggin' options. Do not ask."); 2600 "Some debuggin' options. Do not ask.");
2280 2601
2281 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2602 make_help_window;
2603 make_menubar;
2282 2604
2283 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2284 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2285
2286# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2287# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2288
2289 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
2290
2291 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2292 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2293
2294 $BUTTONBAR->add (new DC::UI::Button
2295 text => "Save Config",
2296 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2297 on_activate => sub {
2298 $::CFG->{layout} = DC::UI::get_layout;
2299 DC::write_cfg;
2300 status "Configuration Saved";
2301 0
2302 },
2303 );
2304
2305 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2306 tooltip => "View Documentation");
2307
2308 $BUTTONBAR->add (new DC::UI::Button
2309 text => "Quit",
2310 tooltip => "Terminates the program",
2311 on_activate => sub {
2312 if ($CONN) {
2313 open_quit_dialog;
2314 } else {
2315 EV::unloop EV::UNLOOP_ALL;
2316 }
2317 0
2318 },
2319 );
2320
2321 $BUTTONBAR->show;
2322 $SETUP_DIALOG->show; 2605 $SETUP_DIALOG->show;
2323 $MESSAGE_WINDOW->show; 2606 $MESSAGE_WINDOW->show;
2324 } 2607 }
2325 2608
2609 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2610 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2611
2612 $CAVEAT_LABEL->set_text ("None :)");
2613 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2614 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2615 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2616 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2617
2326 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2618 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2327} 2619}
2328 2620
2329sub video_shutdown { 2621sub video_shutdown {
2330 DC::OpenGL::shutdown; 2622 DC::OpenGL::shutdown;
2623 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2331 2624
2332 undef $SDL_ACTIVE; 2625 undef $SDL_ACTIVE;
2333} 2626}
2334 2627
2335my %animate_object; 2628my %animate_object;
2354my $want_refresh = EV::prepare_ns \&force_refresh; 2647my $want_refresh = EV::prepare_ns \&force_refresh;
2355 2648
2356my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2649my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2357 $NOW = EV::now; 2650 $NOW = EV::now;
2358 2651
2359 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2652 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2360 for DC::poll_events; 2653 for DC::poll_events;
2361 2654
2362 if (%animate_object) { 2655 if (%animate_object) {
2363 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2656 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2364 $WANT_REFRESH = 1; 2657 $WANT_REFRESH = 1;
2376sub animation_stop { 2669sub animation_stop {
2377 my ($widget) = @_; 2670 my ($widget) = @_;
2378 delete $animate_object{$widget}; 2671 delete $animate_object{$widget};
2379} 2672}
2380 2673
2381%SDL_CB = (
2382 DC::SDL_QUIT => sub { 2674$SDL_CB[DC::SDL_QUIT] = sub {
2675 crash "SDL_QUIT";
2383 EV::unloop EV::UNLOOP_ALL; 2676 EV::unloop EV::UNLOOP_ALL;
2384 }, 2677};
2385 DC::SDL_VIDEORESIZE => sub { 2678$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2386 },
2387 DC::SDL_VIDEOEXPOSE => sub { 2679$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2388 DC::UI::full_refresh; 2680 DC::UI::full_refresh;
2389 }, 2681};
2390 DC::SDL_ACTIVEEVENT => sub { 2682$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2391# not useful, as APPACTIVE includes only iconified state, not unmapped 2683# not useful, as APPACTIVE includes only iconified state, not unmapped
2392# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2684# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2393# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2685# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2394# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2686# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2395# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2687# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2396# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2688# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2397 }, 2689};
2398 DC::SDL_KEYDOWN => sub { 2690$SDL_CB[DC::SDL_KEYDOWN] = sub {
2399 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2691 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2400 # alt-enter 2692 # alt-enter
2693 video_shutdown;
2401 $FULLSCREEN_ENABLE->toggle; 2694 $FULLSCREEN_ENABLE->toggle;
2402 video_shutdown;
2403 video_init; 2695 video_init;
2404 } else { 2696 } else {
2405 &DC::UI::feed_sdl_key_down_event; 2697 &DC::UI::feed_sdl_key_down_event;
2406 } 2698 }
2407 update_modbox; 2699 update_modbox;
2408 }, 2700};
2409 DC::SDL_KEYUP => sub { 2701$SDL_CB[DC::SDL_KEYUP] = sub {
2410 &DC::UI::feed_sdl_key_up_event; 2702 &DC::UI::feed_sdl_key_up_event;
2411 update_modbox; 2703 update_modbox;
2412 }, 2704};
2413 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2705$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2414 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2706$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2415 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2707$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2416 DC::SDL_USEREVENT => sub { 2708$SDL_CB[DC::SDL_USEREVENT] = sub {
2417 if ($_[0]{code} == 1) { 2709 if ($_[0]{code} == 1) {
2418 audio_channel_finished $_[0]{data1}; 2710 audio_channel_finished $_[0]{data1};
2419 } elsif ($_[0]{code} == 0) { 2711 } elsif ($_[0]{code} == 0) {
2420 audio_music_finished; 2712 audio_music_finished;
2421 }
2422 }, 2713 }
2423); 2714};
2424 2715
2425############################################################################# 2716#############################################################################
2426 2717
2427$SIG{INT} = $SIG{TERM} = sub { 2718$SIG{INT} = $SIG{TERM} = sub {
2428 EV::unloop; 2719 EV::unloop;
2429 #d# TODO calling exit here hangs the process in some futex 2720 #d# TODO calling exit here hangs the process in some futex
2430}; 2721};
2431 2722
2432{ 2723# due to mac os x + sdl combined braindamage, we need this contortion
2724sub main {
2725 {
2433 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2726 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2434 2727
2435 if (-e "$Deliantra::VARDIR/client.cf") { 2728 if (-e "$Deliantra::VARDIR/client.cf") {
2436 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2729 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2437 } else { 2730 } else {
2438 #TODO: compatibility cruft 2731 #TODO: compatibility cruft
2439 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2732 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2440 print STDERR "INFO: used old configuration file\n"; 2733 print STDERR "INFO: used old configuration file\n";
2441 } 2734 }
2442 2735
2443 DC::DB::Server::run; 2736 DC::DB::Server::run;
2444 2737
2445 if ($CFG->{db_schema} < 1) { 2738 if ($CFG->{db_schema} < 1) {
2446 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2739 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2447 DC::DB::nuke_db; 2740 DC::DB::nuke_db;
2448 $CFG->{db_schema} = 1; 2741 $CFG->{db_schema} = 1;
2449 DC::write_cfg; 2742 DC::write_cfg;
2450 } 2743 }
2451 2744
2452 DC::DB::open_db; 2745 DC::DB::open_db;
2453 2746
2454 DC::UI::set_layout ($::CFG->{layout}); 2747 DC::UI::set_layout ($::CFG->{layout});
2455 2748
2456 my %DEF_CFG = ( 2749 my %DEF_CFG = (
2750 config_autosave => 1,
2457 sdl_mode => 0, 2751 sdl_mode => undef,
2458 fullscreen => 1, 2752 fullscreen => 1,
2459 fast => 0, 2753 fast => 0,
2460 force_opengl11 => undef, 2754 force_opengl11 => undef,
2755 disable_alpha => 0,
2756 smooth_movement => 1,
2757 smooth_transitions => 1,
2461 texture_compression => 1, 2758 texture_compression => 1,
2462 map_scale => 1, 2759 map_scale => 1,
2463 fow_enable => 1, 2760 fow_enable => 1,
2464 fow_intensity => 0, 2761 fow_intensity => 0,
2762 fow_texture => 0,
2465 map_smoothing => 1, 2763 map_smoothing => 1,
2466 gui_fontsize => 1, 2764 gui_fontsize => 1,
2467 log_fontsize => 0.7, 2765 log_fontsize => 0.7,
2468 gauge_fontsize => 1, 2766 gauge_fontsize => 1,
2469 gauge_size => 0.35, 2767 gauge_size => 0.35,
2470 stat_fontsize => 0.7, 2768 stat_fontsize => 0.7,
2471 mapsize => 100, 2769 mapsize => 100,
2472 audio_enable => 1, 2770 audio_enable => 1,
2473 audio_hw_channels => 0, 2771 audio_hw_channels => 0,
2474 audio_hw_frequency => 0, 2772 audio_hw_frequency => 0,
2475 audio_hw_chunksize => 0, 2773 audio_hw_chunksize => 0,
2476 audio_mix_channels => 8, 2774 audio_mix_channels => 8,
2477 effects_enable => 1, 2775 effects_enable => 1,
2478 effects_volume => 1, 2776 effects_volume => 1,
2479 bgm_enable => 1, 2777 bgm_enable => 1,
2480 bgm_volume => 0.5, 2778 bgm_volume => 0.5,
2481 output_rate => "", 2779 output_rate => "",
2482 pickup => 0, 2780 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2483 inv_sort => "mtime", 2781 inv_sort => "mtime",
2484 default => "profile", # default profile 2782 default => "profile", # default profile
2485 show_tips => 1, 2783 show_tips => 1,
2486 logview_max_par => 1000, 2784 logview_max_par => 1000,
2487 shift_fire_stop => 0, 2785 shift_fire_stop => 0,
2786 uitheme => "wood",
2787 map_shift_x => -24, # arbitrary
2788 map_shift_y => +24, # arbitrary
2488 ); 2789 );
2489 2790
2490 while (my ($k, $v) = each %DEF_CFG) { 2791 while (my ($k, $v) = each %DEF_CFG) {
2491 $CFG->{$k} = $v unless exists $CFG->{$k}; 2792 $CFG->{$k} = $v unless exists $CFG->{$k};
2492 } 2793 }
2493 2794
2494 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2795 my @args = @ARGV;
2495 $PROFILE = $CFG->{profile}{default};
2496 2796
2497 # convert old bindings (only default profile matters) 2797 my $profile = 'default';
2498 if (my $bindings = delete $PROFILE->{bindings}) { 2798
2499 while (my ($mod, $syms) = each %$bindings) { 2799 for (my $i = 0; $i < @args; $i++) {
2500 while (my ($sym, $cmds) = each %$syms) { 2800 if ($args[$i] =~ /^--?profile$/) {
2501 push @{ $PROFILE->{macro} }, { 2801 $profile = $args[$i + 1];
2502 accelkey => [$mod*1, $sym*1], 2802 splice @args, $i, 2, ();
2503 action => $cmds,
2504 }; 2803 $i = 0;
2804 } elsif ($args[$i] =~ /^--?h/) {
2805 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2806 exit 0;
2505 } 2807 }
2506 } 2808 }
2507 }
2508 2809
2810 $CFG->{profile}{$profile} ||= {};
2811 $PROFILE = $CFG->{profile}{$profile};
2812 $PROFILE->{host} ||= "gameserver.deliantra.net";
2813
2814 $PROFILE->{host} = $args[0] if @args > 0;
2815 $PROFILE->{user} = $args[1] if @args > 1;
2816 $PROFILE->{password} = $args[2] if @args > 2;
2817
2818 # convert old bindings (only default profile matters)
2819 if (my $bindings = delete $PROFILE->{bindings}) {
2820 while (my ($mod, $syms) = each %$bindings) {
2821 while (my ($sym, $cmds) = each %$syms) {
2822 push @{ $PROFILE->{macro} }, {
2823 accelkey => [$mod*1, $sym*1],
2824 action => $cmds,
2825 };
2826 }
2827 }
2828 }
2829
2509 sdl_init; 2830 sdl_init;
2510 2831
2511 @SDL_MODES = DC::SDL_ListModes 8, 8; 2832 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2512 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2833 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2513 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2514 2834
2515 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2835 {
2516
2517 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2518
2519 {
2520 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2836 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2521 DejaVuSans.ttf 2837 DejaVuSans.ttf
2522 DejaVuSansMono.ttf 2838 DejaVuSansMono.ttf
2523 DejaVuSans-Bold.ttf 2839 DejaVuSans-Bold.ttf
2524 DejaVuSansMono-Bold.ttf 2840 DejaVuSansMono-Bold.ttf
2525 DejaVuSans-Oblique.ttf 2841 DejaVuSans-Oblique.ttf
2526 DejaVuSansMono-Oblique.ttf 2842 DejaVuSansMono-Oblique.ttf
2527 DejaVuSans-BoldOblique.ttf 2843 DejaVuSans-BoldOblique.ttf
2528 DejaVuSansMono-BoldOblique.ttf 2844 DejaVuSansMono-BoldOblique.ttf
2845 mona.ttf
2529 ); 2846 );
2530 2847
2531 DC::add_font $_ for @fonts; 2848 DC::add_font $_ for @fonts;
2532 2849
2533 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2850 $FONT_PROP = new_from_file DC::Font $fonts[0];
2534 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2851 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2535 2852
2536 $FONT_PROP->make_default; 2853 $FONT_PROP->make_default;
2537 2854
2538 DC::pango_init; 2855 DC::pango_init;
2539 } 2856 }
2540 2857
2541# compare mono (ft) vs. rgba (cairo) 2858# compare mono (ft) vs. rgba (cairo)
2542# ft - 1.8s, cairo 3s, even in alpha-only mode 2859# ft - 1.8s, cairo 3s, even in alpha-only mode
2543# for my $rgba (0..1) { 2860# for my $rgba (0..1) {
2544# my $t1 = Time::HiRes::time; 2861# my $t1 = Time::HiRes::time;
2549# } 2866# }
2550# my $t2 = Time::HiRes::time; 2867# my $t2 = Time::HiRes::time;
2551# warn $t2-$t1; 2868# warn $t2-$t1;
2552# } 2869# }
2553 2870
2554 video_init; 2871 video_init;
2555 audio_init; 2872 audio_init;
2556} 2873 }
2557 2874
2558show_tip_of_the_day if $CFG->{show_tips}; 2875 show_tip_of_the_day if $CFG->{show_tips};
2559 2876
2560our $STARTUP_CANCEL = EV::idle sub { 2877 our $STARTUP_CANCEL = EV::idle sub {
2561 undef $::STARTUP_CANCEL; 2878 undef $::STARTUP_CANCEL;
2562 $startup_done->(); 2879 $startup_done->();
2563}; 2880 };
2564 2881
2565delete $SIG{__DIE__}; 2882 delete $SIG{__DIE__};
2566EV::loop; 2883 EV::loop;
2567 2884
2885 DC::write_cfg if $CFG->{config_autosave};
2886
2568#video_shutdown; 2887 #video_shutdown;
2569#audio_shutdown; 2888 #audio_shutdown;
2889
2570DC::OpenGL::quit; 2890 DC::OpenGL::quit;
2571DC::SDL_Quit; 2891 DC::SDL_Quit;
2572DC::DB::Server::stop; 2892 DC::DB::Server::stop;
2893}
2894
2895DC::SDL_braino; # see sub above
2573 2896
2574=head1 NAME 2897=head1 NAME
2575 2898
2576deliantra - A Deliantra MORPG game client 2899deliantra - A Deliantra MORPG game client
2577 2900
2578=head1 SYNOPSIS 2901=head1 SYNOPSIS
2579 2902
2580Just run it - no commandline arguments are supported. 2903 deliantra [--profile name] [host [user [password]]]
2904 deliantra --help
2581 2905
2582=head1 USAGE 2906=head1 USAGE
2583 2907
2584deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2908The deliantra client utilises OpenGL for all UI elements and the game. It
2585be used in fullscreen mode and interactively. 2909is supposed to be used in fullscreen mode and interactively.
2586 2910
2587=head1 DEBUGGING 2911=head1 DEBUGGING
2588
2589 2912
2590CFPLUS_DEBUG - environment variable 2913CFPLUS_DEBUG - environment variable
2591 2914
2592 1 draw borders around widgets 2915 1 draw borders around widgets
2593 2 add low-level widget info to tooltips 2916 2 add low-level widget info to tooltips
2594 4 show fps 2917 4 show fps
2595 8 suppress tooltips 2918 8 suppress tooltips
2596 2919
2597=head1 AUTHOR 2920=head1 AUTHOR
2598 2921
2599Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2922Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2600 2923
2601 2924
2602 2925

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines