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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines