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.105 by root, Sat Apr 3 02:58:25 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
751 client => "$DC::VERSION $] $^O", 811 client => "$DC::VERSION $] $^O",
752 812
753 map_widget => $MAPWIDGET, 813 map_widget => $MAPWIDGET,
754 statusbox => $STATUSBOX, 814 statusbox => $STATUSBOX,
757 query => \&server_query, 817 query => \&server_query,
758 818
759 setup_req => { 819 setup_req => {
760 smoothing => $CFG->{map_smoothing}*1, 820 smoothing => $CFG->{map_smoothing}*1,
761 }, 821 },
762 };
763 822
764 if ($CONN) { 823 on_connect => sub {
824 if ($_[0]) {
765 DC::lowdelay fileno $CONN->{fh}; 825 DC::lowdelay fileno $CONN->{fh};
766 826
767 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 };
768 } else { 864 } else {
769 warn $@; 865 dc_connect $host, $port;
770 status "unable to connect";
771 stop_game();
772 } 866 }
773} 867}
774 868
775sub stop_game { 869sub stop_game {
870 crash "stop_game";
871
776 $LOGIN_BUTTON->set_text ("Login / Register"); 872 $LOGIN_BUTTON->set_text ("Login / Register");
777 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 873 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
778 $SETUP_DIALOG->show; 874 $SETUP_DIALOG->show;
779 $PL_WINDOW->hide; 875 $PL_WINDOW->hide;
780 $SPELL_LIST->clear_spells; 876 $SPELL_LIST->clear_spells;
794} 890}
795 891
796sub graphics_setup { 892sub graphics_setup {
797 my $vbox = new DC::UI::VBox; 893 my $vbox = new DC::UI::VBox;
798 894
895 {
896 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
897
799 $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]);
800 899
801 my $row = 0; 900 my $row = 0;
802 901
803 $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");
804 $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,
805 can_events => 1, 904 can_events => 1,
806 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 905 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
807 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
808 my $vidmode_tooltip = 928 my $vidmode_tooltip =
809 "<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). "
810 . "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>.";
811 931
812 $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");
813 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 933 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
814 934
815 $hbox->add (my $mode_slider = new DC::UI::Slider 935 $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], 936 c_rescale => 1,
937 force_w => $WIDTH * 0.1, expand => 1,
938 range => [ ($CFG->{sdl_mode}) x 3 ],
817 tooltip => $vidmode_tooltip); 939 tooltip => $vidmode_tooltip);
818 $hbox->add (my $mode_label = new DC::UI::Label 940 $hbox->add (my $mode_label = new DC::UI::Label
819 height => 0.8, template => "9999x9999@9+9", 941 height => 0.8, template => "9999x9999@9+9",
820 can_events => 1, tooltip => $vidmode_tooltip); 942 can_events => 1, tooltip => $vidmode_tooltip);
821 943
822 $mode_slider->connect (changed => sub { 944 $MODE_SLIDER->connect (changed => sub {
823 my ($self, $value) = @_; 945 my ($self, $value) = @_;
824 946
825 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 947 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
826 $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]});
827 }); 949 });
828 $mode_slider->emit (changed => $mode_slider->{range}[0]); 950 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
829 951
830 $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");
831 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 953 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
832 state => $CFG->{fullscreen}, 954 state => $CFG->{fullscreen},
833 tooltip => "Bring the client into fullscreen mode.", 955 tooltip => "Bring the client into fullscreen mode.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 956 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
835 ); 957 );
836 958
837 $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");
838 $table->add_at (1, $row++, new DC::UI::CheckBox 960 $table->add_at (1, $row++, new DC::UI::CheckBox
839 state => $CFG->{force_opengl11}, 961 state => $CFG->{force_opengl11},
840 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 "
841 . "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 "
842 . "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. "
843 . "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, "
844 . "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. "
845 . "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>",
846 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 968 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
847 ); 969 );
848 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
849 $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");
850 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
851 state => $CFG->{texture_compression}, 990 state => $CFG->{texture_compression},
852 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 "
853 . "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). "
854 . "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 "
855 . "forced OpenGL 1.1 mode.", 994 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
856 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 995 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
857 ); 996 );
858 997
859 $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");
860 $table->add_at (1, $row++, new DC::UI::CheckBox 999 $table->add_at (1, $row++, new DC::UI::CheckBox
861 state => $CFG->{fast}, 1000 state => $CFG->{fast},
862 tooltip => "Lower the visual quality considerably to speed up rendering.", 1001 tooltip => "Lower the visual quality considerably to speed up rendering.",
863 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1002 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
864 ); 1003 );
865 1004
866 $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");
867 $table->add_at (1, $row++, new DC::UI::Slider 1006 $table->add_at (1, $row++, new DC::UI::Slider
868 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1007 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.", 1008 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 }, 1009 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
871 ); 1010 );
872 1011
873 $table->add_at (1, $row++, new DC::UI::Button 1012 $table->add_at (1, $row++, new DC::UI::Button
874 expand => 1, text => "Apply", 1013 expand => 1, text => "Apply",
875 tooltip => "Apply the video settings above.", 1014 tooltip => "Apply the video settings above.",
876 on_activate => sub { 1015 on_activate => sub {
877 video_shutdown (); 1016 video_shutdown ();
878 video_init (); 1017 video_init ();
1018 0
879 0 1019 }
880 } 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 }
881 ); 1036 );
882 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
883 $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");
884 $table->add_at (1, $row++, new DC::UI::Slider 1049 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1050 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
886 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1051 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
887 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 }
888 ); 1053 );
889 1054
890 $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");
891 $table->add_at (1, $row++, new DC::UI::CheckBox 1056 $table->add_at (1, $row++, new DC::UI::CheckBox
892 state => $CFG->{map_smoothing}, 1057 state => $CFG->{map_smoothing},
893 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. "
894 . "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. "
895 . "Changes take effect at next login only.", 1060 . "Changes take effect at next login only.",
896 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1061 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
897 ); 1062 );
898 1063
899 $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");
900 $table->add_at (1, $row++, new DC::UI::CheckBox 1065 $table->add_at (1, $row++, new DC::UI::CheckBox
901 state => $CFG->{fow_enable}, 1066 state => $CFG->{fow_enable},
902 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.",
903 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1068 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
904 ); 1069 );
905 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
906 $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");
907 $table->add_at (1, $row++, new DC::UI::Slider 1087 $table->add_at (1, $row++, new DC::UI::Slider
908 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1088 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.", 1089 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 } 1090 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
911 ); 1091 );
912 1092
913 $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");
914 $table->add_at (1, $row++, new DC::UI::Slider 1094 $table->add_at (1, $row++, new DC::UI::Slider
915 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1095 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, " 1096 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.", 1097 . "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 }, 1098 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
919 ); 1099 );
920 1100
921 $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");
922 $table->add_at (1, $row++, new DC::UI::Slider 1102 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1103 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.", 1104 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
925 on_changed => sub { 1105 on_changed => sub {
926 $CFG->{gauge_fontsize} = $_[1]; 1106 $CFG->{gauge_fontsize} = $_[1];
927 &set_gauge_window_fontsize; 1107 &set_gauge_window_fontsize;
1108 0
928 0 1109 }
929 } 1110 );
930 );
931 1111
932 $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");
933 $table->add_at (1, $row++, new DC::UI::Slider 1113 $table->add_at (1, $row++, new DC::UI::Slider
934 range => [$CFG->{gauge_size}, 0.2, 0.8], 1114 range => [$CFG->{gauge_size}, 0.2, 0.8],
935 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.",
936 on_changed => sub { 1116 on_changed => sub {
937 $CFG->{gauge_size} = $_[1]; 1117 $CFG->{gauge_size} = $_[1];
938 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1118 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1119 0
939 0 1120 }
940 } 1121 );
941 ); 1122 }
942 1123
943 $vbox 1124 $vbox
944} 1125}
945 1126
946our $AUDIO_HW_CHUNKSIZE; 1127our $AUDIO_HW_CHUNKSIZE;
959 1140
960 my $text = !$freq 1141 my $text = !$freq
961 ? "audio is off" 1142 ? "audio is off"
962 : "audio is enabled\n" 1143 : "audio is enabled\n"
963 . "frequency (Hz): $freq\n" 1144 . "frequency (Hz): $freq\n"
964 . "channels: $chans"; 1145 . "channels: $chans\n"
1146 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1147 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
965 1148
966 $AUDIO_INFO->set_text ($text); 1149 $AUDIO_INFO->set_text ($text);
967} 1150}
968 1151
969sub audio_setup { 1152sub audio_setup {
1109} 1292}
1110 1293
1111sub make_gauge_window { 1294sub make_gauge_window {
1112 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1295 my $gh = int $HEIGHT * $CFG->{gauge_size};
1113 1296
1114 my $win = new DC::UI::Frame ( 1297 $GAUGES->{win} = my $win = new DC::UI::Frame (
1115 force_x => 0, 1298 force_x => 0,
1116 force_y => "max", 1299 force_y => "max",
1117 force_w => $WIDTH, 1300 force_w => $WIDTH,
1118 force_h => $gh, 1301 force_h => $gh,
1119 ); 1302 );
1135 (new DC::UI::Empty expand => 1), 1318 (new DC::UI::Empty expand => 1),
1136 (my $hb = new DC::UI::HBox), 1319 (my $hb = new DC::UI::HBox),
1137 ], 1320 ],
1138 ); 1321 );
1139 1322
1140 $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");
1141 $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");
1142 $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");
1143 $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");
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 1327
1156 &set_gauge_window_fontsize; 1328 &set_gauge_window_fontsize;
1157 1329
1158 $win 1330 $win
1159} 1331}
1500 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]),
1501 ); 1673 );
1502 1674
1503 $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");
1504 $table->add_at (1, 4, new DC::UI::Entry 1676 $table->add_at (1, 4, new DC::UI::Entry
1505 text => $CFG->{profile}{default}{user}, 1677 text => $PROFILE->{user},
1506 tooltip => "The name of your character on the server.", 1678 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 } 1679 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1508 ); 1680 );
1509 1681
1510 $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");
1511 $table->add_at (1, 5, new DC::UI::Entry 1683 $table->add_at (1, 5, new DC::UI::Entry
1512 text => $CFG->{profile}{default}{password}, 1684 text => $PROFILE->{password},
1513 hidden => 1, 1685 hidden => 1,
1514 tooltip => "The password for your character.", 1686 tooltip => "The password for your character.",
1515 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1687 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1516 ); 1688 );
1517 1689
1518 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1690 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1519 expand => 1, 1691 expand => 1,
1520 text => "Login / Register", 1692 text => "Login / Register",
1525 1 1697 1
1526 }, 1698 },
1527 ); 1699 );
1528 1700
1529 $vbox->add (new DC::UI::FancyFrame 1701 $vbox->add (new DC::UI::FancyFrame
1530 label => "Registering", 1702 label => "How to Play",
1531 min_h => 200, 1703 min_h => 240,
1532 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1704 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1533 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). "
1534 "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 "
1535 . "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.",
1536 ), 1710 ),
1537 ); 1711 );
1538 1712
1539 $vbox 1713 $vbox
1554 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1728 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1555 1729
1556 $vbox->add ( 1730 $vbox->add (
1557 $HOST_ENTRY = new DC::UI::Entry 1731 $HOST_ENTRY = new DC::UI::Entry
1558 expand => 1, 1732 expand => 1,
1559 text => $CFG->{profile}{default}{host}, 1733 text => $PROFILE->{host},
1560 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>)",
1561 on_changed => sub { 1735 on_changed => sub {
1562 my ($self, $value) = @_; 1736 my ($self, $value) = @_;
1563 $CFG->{profile}{default}{host} = $value; 1737 $PROFILE->{host} = $value;
1564 1 1738 1
1565 } 1739 }
1566 ); 1740 );
1567 1741
1568 if (0) { #d# disabled 1742 if (0) { #d# disabled
1611 1785
1612 my $row = 0; 1786 my $row = 0;
1613 1787
1614 $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");
1615 $table->add_at (1, $row++, new DC::UI::CheckBox 1789 $table->add_at (1, $row++, new DC::UI::CheckBox
1790 c_colspan => 2,
1616 state => $CFG->{show_tips}, 1791 state => $CFG->{show_tips},
1617 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?",
1618 on_changed => sub { 1793 on_changed => sub {
1619 my ($self, $value) = @_; 1794 my ($self, $value) = @_;
1620 $CFG->{show_tips} = $value; 1795 $CFG->{show_tips} = $value;
1622 } 1797 }
1623 ); 1798 );
1624 1799
1625 $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");
1626 $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,
1627 text => $CFG->{logview_max_par}, 1803 text => $CFG->{logview_max_par},
1628 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 "
1629 . "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 "
1630 . "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.",
1631 on_changed => sub { 1807 on_changed => sub {
1633 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1809 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1634 0 1810 0
1635 }, 1811 },
1636 ); 1812 );
1637 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
1638 $table 1836 $table
1639} 1837}
1640 1838
1641sub autopickup_setup { 1839sub autopickup_setup {
1642 my $r = new DC::UI::ScrolledWindow ( 1840 my $r = new DC::UI::ScrolledWindow (
1648 col_expand => [0, 1, 0, 1], 1846 col_expand => [0, 1, 0, 1],
1649 ); 1847 );
1650 1848
1651 for ( 1849 for (
1652 ["General", 0, 0, 1850 ["General", 0, 0,
1653 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1654 ["Inhibit autopickup" => PICKUP_INHIBIT], 1851# ["Inhibit autopickup" => PICKUP_INHIBIT],
1655 ["Stop before pickup" => PICKUP_STOP], 1852 ["Stop before pickup" => PICKUP_STOP],
1656 ["Debug autopickup" => PICKUP_DEBUG], 1853 ["Debug autopickup" => PICKUP_DEBUG],
1657 ], 1854 ],
1658 ["Weapons", 0, 6, 1855 ["Weapons", 0, 6,
1659 ["All weapons" => PICKUP_ALLWEAPON], 1856 ["All weapons" => PICKUP_ALLWEAPON],
1685 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1882 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1686 ["Ignore cursed" => PICKUP_NOT_CURSED], 1883 ["Ignore cursed" => PICKUP_NOT_CURSED],
1687 ["Jewelery" => PICKUP_JEWELS], 1884 ["Jewelery" => PICKUP_JEWELS],
1688 ["Flesh" => PICKUP_FLESH], 1885 ["Flesh" => PICKUP_FLESH],
1689 ], 1886 ],
1690 ["Weight/Value ratio", 2, 17] 1887 ["Value/Weight ratio", 2, 17]
1691 ) 1888 )
1692 { 1889 {
1693 my ($title, $x, $y, @bits) = @$_; 1890 my ($title, $x, $y, @bits) = @$_;
1694 $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]);
1695 1892
1707 $::CFG->{pickup} |= $mask; 1904 $::CFG->{pickup} |= $mask;
1708 } else { 1905 } else {
1709 $::CFG->{pickup} &= ~$mask; 1906 $::CFG->{pickup} &= ~$mask;
1710 } 1907 }
1711 1908
1712 $::CONN->send_command ("pickup $::CFG->{pickup}") 1909 $::CONN->send_pickup ($::CFG->{pickup})
1713 if defined $::CONN; 1910 if defined $::CONN;
1714 1911
1715 0 1912 0
1716 }); 1913 });
1717 1914
1720 } 1917 }
1721 1918
1722 $table->add_at (2, 18, new DC::UI::ValSlider 1919 $table->add_at (2, 18, new DC::UI::ValSlider
1723 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1920 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1724 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).",
1725 to_value => sub { ">= " . 5 * $_[0] }, 1923 to_value => sub { ">= " . 5 * $_[0] },
1726 on_changed => sub { 1924 on_changed => sub {
1727 my ($slider, $value) = @_; 1925 my ($slider, $value) = @_;
1728 1926
1729 $::CFG->{pickup} &= ~0xF; 1927 $::CFG->{pickup} &= ~0xF;
1733 }); 1931 });
1734 1932
1735 $table->add_at (3, 18, new DC::UI::Button 1933 $table->add_at (3, 18, new DC::UI::Button
1736 text => "set", 1934 text => "set",
1737 on_activate => sub { 1935 on_activate => sub {
1738 $::CONN->send_command ("pickup $::CFG->{pickup}") 1936 $::CONN->send_pickup ($::CFG->{pickup})
1739 if defined $::CONN; 1937 if defined $::CONN;
1740 0 1938 0
1741 }); 1939 });
1742 1940
1743 $r 1941 $r
1785 $::CFG->{inv_sort} = $_[1]; 1983 $::CFG->{inv_sort} = $_[1];
1786 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1984 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1787 }, 1985 },
1788 ); 1986 );
1789 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1987 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1790 #TODO# update to weigh/maxweight 1988 #TODO# update to weight/maxweight
1791 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1989 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1792 1990
1793 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1991 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1794 $sw1->add ($INV = new DC::UI::Inventory); 1992 $sw1->add ($INV = new DC::UI::Inventory);
1795 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1993 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1856 $PL_NOTEBOOK->set_current_page ($widget); 2054 $PL_NOTEBOOK->set_current_page ($widget);
1857 $PL_WINDOW->show; 2055 $PL_WINDOW->show;
1858 } 2056 }
1859} 2057}
1860 2058
1861sub player_window { 2059sub make_playerbook {
1862 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2060 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1863 x => "center", 2061 x => "center",
1864 y => "center", 2062 y => "center",
1865 force_w => $WIDTH * 9/10, 2063 force_w => $WIDTH * 9/10,
1866 force_h => $HEIGHT * 9/10, 2064 force_h => $HEIGHT * 9/10,
1900 "License, Author and Source info for media sent by the server."); 2098 "License, Author and Source info for media sent by the server.");
1901 2099
1902 $ntb->set_current_page ($INVENTORY_PAGE); 2100 $ntb->set_current_page ($INVENTORY_PAGE);
1903 2101
1904 $plwin->add ($ntb); 2102 $plwin->add ($ntb);
1905 $plwin
1906} 2103}
1907 2104
1908sub keyboard_setup { 2105sub keyboard_setup {
1909 DC::Macro::keyboard_setup 2106 DC::Macro::keyboard_setup
1910} 2107}
1911 2108
1912sub help_window { 2109sub make_help_window {
1913 my $win = new DC::UI::Toplevel 2110 my $win = new DC::UI::Toplevel
1914 x => 'center', 2111 x => 'center',
1915 y => 'center', 2112 y => 'center',
1916 z => 4, 2113 z => 4,
1917 name => 'doc_browser', 2114 name => 'doc_browser',
2006 2203
2007 $load_node->((DC::Pod::find @path)[0]); 2204 $load_node->((DC::Pod::find @path)[0]);
2008 $win->show; 2205 $win->show;
2009 }; 2206 };
2010 2207
2011 $win 2208 $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} 2209}
2034 2210
2035sub open_quit_dialog { 2211sub open_quit_dialog {
2036 unless ($QUIT_DIALOG) { 2212 unless ($QUIT_DIALOG) {
2037 $QUIT_DIALOG = new DC::UI::Toplevel 2213 $QUIT_DIALOG = new DC::UI::Toplevel
2059 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2235 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2060 ); 2236 );
2061 $hb->add (new DC::UI::Button 2237 $hb->add (new DC::UI::Button
2062 text => "Quit anyway", 2238 text => "Quit anyway",
2063 expand => 1, 2239 expand => 1,
2064 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2240 on_activate => sub {
2241 crash "Quit anyway";
2242 EV::unloop EV::UNLOOP_ALL;
2243 },
2065 ); 2244 );
2066 } 2245 }
2067 2246
2068 $QUIT_DIALOG->show; 2247 $QUIT_DIALOG->show;
2069 $QUIT_DIALOG->grab_focus; 2248 $QUIT_DIALOG->grab_focus;
2249}
2250
2251sub make_menubar {
2252 $MENUFRAME = new DC::UI::Toplevel
2253 border => 0,
2254 force_x => 0,
2255 force_y => 0,
2256 force_w => $::WIDTH,
2257 child => ($MENUBAR = new DC::UI::HBox),
2258 ;
2259
2260 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2261
2262 # 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
2263 make_gauge_window->show;
2264
2265# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2266# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2267
2268 make_playerbook;
2269
2270 $MENUPOPUP = DC::UI::Menu->new (items => [
2271 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2272 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2273 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2274 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2275 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2276 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2277 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2278 ["Quit…" , sub {
2279 if ($CONN) {
2280 open_quit_dialog;
2281 } else {
2282 EV::unloop EV::UNLOOP_ALL;
2283 }
2284 }],
2285 ]);
2286
2287 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2288 tooltip => "Shows the main menu",
2289 on_button_down => sub {
2290 my ($self, $ev) = @_;
2291 local $ev->{x} = 0;
2292 local $ev->{y} = 0;
2293 $MENUPOPUP->popup ($ev);
2294 },
2295 );
2296
2297 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2298 padding_x => 6,
2299 padding_y => 3,
2300 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2301 template => " Exp: 888,888,888,888 (lvl 188) ",
2302 );
2303
2304 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2305 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2306 . "will automatically pick up items as defined by your item pickup settings "
2307 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2308 . "disable autopickup by disabling this checkbox.",
2309 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2310 on_changed => sub {
2311 my ($self, $value) = @_;
2312 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2313 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2314 $CONN->send_pickup ($CFG->{pickup})
2315 if $CONN;
2316 },
2317 );
2318
2319 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2320 c_rescale => 1,
2321 padding_x => 6,
2322 padding_y => 3,
2323 force_w => $::WIDTH * 0.2,
2324 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2325 template => "two handed weapons 99%",
2326 );
2327
2328 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2329 expand => 1,
2330 align => 1, can_hover => 1, can_events => 1,
2331 text => "Range and Combat Slots",
2332 tooltip => "#stat_ranged",
2333 );
2334
2335 $MENUFRAME->show;
2336}
2337
2338sub open_string_query {
2339 my ($title, $cb, $txt, $tooltip) = @_;
2340 my $dialog = new DC::UI::Toplevel
2341 x => "center",
2342 y => "center",
2343 z => 50,
2344 force_w => $WIDTH * 4/5,
2345 title => $title;
2346
2347 $dialog->add (
2348 my $e = new DC::UI::Entry
2349 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2350 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2351 tooltip => $tooltip
2352 );
2353
2354 $e->grab_focus;
2355 $e->set_text ($txt) if $txt;
2356 $dialog->show;
2070} 2357}
2071 2358
2072sub show_tip_of_the_day { 2359sub show_tip_of_the_day {
2073 # find all tips 2360 # find all tips
2074 my @tod = DC::Pod::find tip_of_the_day => "*"; 2361 my @tod = DC::Pod::find tip_of_the_day => "*";
2122 $dialog->show; 2409 $dialog->show;
2123 }; 2410 };
2124} 2411}
2125 2412
2126sub sdl_init { 2413sub sdl_init {
2127 DC::SDL_Init 2414 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2128 and die "SDL::Init failed!\n"; 2415 and die "SDL::Init failed!\n";
2129} 2416}
2130 2417
2131sub video_init { 2418sub video_init {
2419 DC::set_theme $CFG->{uitheme};
2420
2421 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2422 $SDL_REINIT = 0;
2423
2424 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2425 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2426 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2427 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2428
2429 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2430
2132 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2431 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2432 $CFG->{sdl_mode} = 0; # lowest resolution by default
2433
2434 # now choose biggest mode <= 1024x768
2435 for (0 .. $#SDL_MODES) {
2436 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2437 $CFG->{sdl_mode} = $_;
2438 }
2439 }
2440 }
2133 2441
2134 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2442 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2135 2443
2136 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2444 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2137 $FULLSCREEN = $CFG->{fullscreen}; 2445 $FULLSCREEN = $CFG->{fullscreen};
2138 $FAST = $CFG->{fast}; 2446 $FAST = $CFG->{fast};
2139 2447
2448 # 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 2449 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2450 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2141 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2451 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2142 2452
2143 $SDL_ACTIVE = 1; 2453 $SDL_ACTIVE = 1;
2144 $LAST_REFRESH = time - 0.01; 2454 $LAST_REFRESH = time - 0.01;
2145 2455
2192 2502
2193 (new DC::UI::Frame 2503 (new DC::UI::Frame
2194 bg => [0, 0, 0, 0.4], 2504 bg => [0, 0, 0, 0.4],
2195 force_x => 0, 2505 force_x => 0,
2196 force_y => "max", 2506 force_y => "max",
2197 child => (my $LR = new DC::UI::VBox), 2507 child => (my $LL = new DC::UI::VBox),
2198 )->show; 2508 )->show;
2199 2509
2200 $LR->add ($STATUSBOX); 2510 $LL->add ($STATUSBOX);
2201 $LR->add ($MODBOX); 2511 $LL->add ($MODBOX);
2202 $LR->add (new DC::UI::Label 2512 $LL->add (new DC::UI::Label
2203 align => 0, 2513 align => 0,
2204 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2514 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2205 fontsize => 0.5, 2515 fontsize => 0.5,
2206 fg => [1, 1, 0, 0.7], 2516 fg => [1, 1, 0, 0.7],
2207 ); 2517 );
2208 2518
2209 DC::UI::Toplevel->new ( 2519 DC::UI::Toplevel->new (
2210 title => "Minimap", 2520 title => "Minimap",
2211 name => "mapmap", 2521 name => "mapmap",
2212 x => 0, 2522 x => 0,
2213 y => $FONTSIZE + 8, 2523 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2214 border_bg => [1, 1, 1, 192/255], 2524 border_bg => [1, 1, 1, 192/255],
2215 bg => [1, 1, 1, 0], 2525 bg => [1, 1, 1, 0],
2216 child => ($MAPMAP = new DC::MapWidget::MapMap 2526 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.", 2527 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2218 ), 2528 ),
2219 )->show; 2529 )->show;
2220 2530
2221 $MAPWIDGET = new DC::MapWidget; 2531 $MAPWIDGET = new DC::MapWidget;
2222 $MAPWIDGET->connect (activate_console => sub { 2532 $MAPWIDGET->connect (activate_console => sub {
2247 $METASERVER = metaserver_dialog; 2557 $METASERVER = metaserver_dialog;
2248 # the name is changed to not conflict with the older name as users could have hidden it 2558 # the name is changed to not conflict with the older name as users could have hidden it
2249 $MESSAGE_WINDOW = new DC::UI::Dockbar 2559 $MESSAGE_WINDOW = new DC::UI::Dockbar
2250 name => "message_window2", 2560 name => "message_window2",
2251 title => 'Messages', 2561 title => 'Messages',
2562 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2252 force_w => $::WIDTH * 0.6, 2563 force_w => $::WIDTH * 0.6,
2253 force_h => $::HEIGHT * 0.25, 2564 force_h => $::HEIGHT * 0.25,
2254 ; 2565 ;
2255 2566
2256 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2567 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2276 . "After pressing the combo the binding will be saved automatically and the " 2587 . "After pressing the combo the binding will be saved automatically and the "
2277 . "binding editor closes"); 2588 . "binding editor closes");
2278 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2589 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2279 "Some debuggin' options. Do not ask."); 2590 "Some debuggin' options. Do not ask.");
2280 2591
2281 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2592 make_help_window;
2593 make_menubar;
2282 2594
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; 2595 $SETUP_DIALOG->show;
2323 $MESSAGE_WINDOW->show; 2596 $MESSAGE_WINDOW->show;
2324 } 2597 }
2325 2598
2599 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2600 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2601
2602 $CAVEAT_LABEL->set_text ("None :)");
2603 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2604 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2605 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2606 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2607
2326 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2608 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2327} 2609}
2328 2610
2329sub video_shutdown { 2611sub video_shutdown {
2330 DC::OpenGL::shutdown; 2612 DC::OpenGL::shutdown;
2613 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2331 2614
2332 undef $SDL_ACTIVE; 2615 undef $SDL_ACTIVE;
2333} 2616}
2334 2617
2335my %animate_object; 2618my %animate_object;
2354my $want_refresh = EV::prepare_ns \&force_refresh; 2637my $want_refresh = EV::prepare_ns \&force_refresh;
2355 2638
2356my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2639my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2357 $NOW = EV::now; 2640 $NOW = EV::now;
2358 2641
2359 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2642 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2360 for DC::poll_events; 2643 for DC::poll_events;
2361 2644
2362 if (%animate_object) { 2645 if (%animate_object) {
2363 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2646 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2364 $WANT_REFRESH = 1; 2647 $WANT_REFRESH = 1;
2376sub animation_stop { 2659sub animation_stop {
2377 my ($widget) = @_; 2660 my ($widget) = @_;
2378 delete $animate_object{$widget}; 2661 delete $animate_object{$widget};
2379} 2662}
2380 2663
2381%SDL_CB = (
2382 DC::SDL_QUIT => sub { 2664$SDL_CB[DC::SDL_QUIT] = sub {
2665 crash "SDL_QUIT";
2383 EV::unloop EV::UNLOOP_ALL; 2666 EV::unloop EV::UNLOOP_ALL;
2384 }, 2667};
2385 DC::SDL_VIDEORESIZE => sub { 2668$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2386 },
2387 DC::SDL_VIDEOEXPOSE => sub { 2669$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2388 DC::UI::full_refresh; 2670 DC::UI::full_refresh;
2389 }, 2671};
2390 DC::SDL_ACTIVEEVENT => sub { 2672$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2391# not useful, as APPACTIVE includes only iconified state, not unmapped 2673# 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# 2674# 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# 2675# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2394# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2676# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2395# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2677# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2396# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2678# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2397 }, 2679};
2398 DC::SDL_KEYDOWN => sub { 2680$SDL_CB[DC::SDL_KEYDOWN] = sub {
2399 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2681 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2400 # alt-enter 2682 # alt-enter
2683 video_shutdown;
2401 $FULLSCREEN_ENABLE->toggle; 2684 $FULLSCREEN_ENABLE->toggle;
2402 video_shutdown;
2403 video_init; 2685 video_init;
2404 } else { 2686 } else {
2405 &DC::UI::feed_sdl_key_down_event; 2687 &DC::UI::feed_sdl_key_down_event;
2406 } 2688 }
2407 update_modbox; 2689 update_modbox;
2408 }, 2690};
2409 DC::SDL_KEYUP => sub { 2691$SDL_CB[DC::SDL_KEYUP] = sub {
2410 &DC::UI::feed_sdl_key_up_event; 2692 &DC::UI::feed_sdl_key_up_event;
2411 update_modbox; 2693 update_modbox;
2412 }, 2694};
2413 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2695$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2414 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2696$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2415 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2697$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2416 DC::SDL_USEREVENT => sub { 2698$SDL_CB[DC::SDL_USEREVENT] = sub {
2417 if ($_[0]{code} == 1) { 2699 if ($_[0]{code} == 1) {
2418 audio_channel_finished $_[0]{data1}; 2700 audio_channel_finished $_[0]{data1};
2419 } elsif ($_[0]{code} == 0) { 2701 } elsif ($_[0]{code} == 0) {
2420 audio_music_finished; 2702 audio_music_finished;
2421 }
2422 }, 2703 }
2423); 2704};
2424 2705
2425############################################################################# 2706#############################################################################
2426 2707
2427$SIG{INT} = $SIG{TERM} = sub { 2708$SIG{INT} = $SIG{TERM} = sub {
2428 EV::unloop; 2709 EV::unloop;
2429 #d# TODO calling exit here hangs the process in some futex 2710 #d# TODO calling exit here hangs the process in some futex
2430}; 2711};
2431 2712
2432{ 2713# due to mac os x + sdl combined braindamage, we need this contortion
2714sub main {
2715 {
2433 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2716 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2434 2717
2435 if (-e "$Deliantra::VARDIR/client.cf") { 2718 if (-e "$Deliantra::VARDIR/client.cf") {
2436 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2719 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2437 } else { 2720 } else {
2438 #TODO: compatibility cruft 2721 #TODO: compatibility cruft
2439 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2722 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2440 print STDERR "INFO: used old configuration file\n"; 2723 print STDERR "INFO: used old configuration file\n";
2441 } 2724 }
2442 2725
2443 DC::DB::Server::run; 2726 DC::DB::Server::run;
2444 2727
2445 if ($CFG->{db_schema} < 1) { 2728 if ($CFG->{db_schema} < 1) {
2446 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2729 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2447 DC::DB::nuke_db; 2730 DC::DB::nuke_db;
2448 $CFG->{db_schema} = 1; 2731 $CFG->{db_schema} = 1;
2449 DC::write_cfg; 2732 DC::write_cfg;
2450 } 2733 }
2451 2734
2452 DC::DB::open_db; 2735 DC::DB::open_db;
2453 2736
2454 DC::UI::set_layout ($::CFG->{layout}); 2737 DC::UI::set_layout ($::CFG->{layout});
2455 2738
2456 my %DEF_CFG = ( 2739 my %DEF_CFG = (
2740 config_autosave => 1,
2457 sdl_mode => 0, 2741 sdl_mode => undef,
2458 fullscreen => 1, 2742 fullscreen => 1,
2459 fast => 0, 2743 fast => 0,
2460 force_opengl11 => undef, 2744 force_opengl11 => undef,
2745 disable_alpha => 0,
2746 smooth_movement => 1,
2747 smooth_transitions => 1,
2461 texture_compression => 1, 2748 texture_compression => 1,
2462 map_scale => 1, 2749 map_scale => 1,
2463 fow_enable => 1, 2750 fow_enable => 1,
2464 fow_intensity => 0, 2751 fow_intensity => 0,
2752 fow_texture => 0,
2465 map_smoothing => 1, 2753 map_smoothing => 1,
2466 gui_fontsize => 1, 2754 gui_fontsize => 1,
2467 log_fontsize => 0.7, 2755 log_fontsize => 0.7,
2468 gauge_fontsize => 1, 2756 gauge_fontsize => 1,
2469 gauge_size => 0.35, 2757 gauge_size => 0.35,
2470 stat_fontsize => 0.7, 2758 stat_fontsize => 0.7,
2471 mapsize => 100, 2759 mapsize => 100,
2472 audio_enable => 1, 2760 audio_enable => 1,
2473 audio_hw_channels => 0, 2761 audio_hw_channels => 0,
2474 audio_hw_frequency => 0, 2762 audio_hw_frequency => 0,
2475 audio_hw_chunksize => 0, 2763 audio_hw_chunksize => 0,
2476 audio_mix_channels => 8, 2764 audio_mix_channels => 8,
2477 effects_enable => 1, 2765 effects_enable => 1,
2478 effects_volume => 1, 2766 effects_volume => 1,
2479 bgm_enable => 1, 2767 bgm_enable => 1,
2480 bgm_volume => 0.5, 2768 bgm_volume => 0.5,
2481 output_rate => "", 2769 output_rate => "",
2482 pickup => 0, 2770 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2483 inv_sort => "mtime", 2771 inv_sort => "mtime",
2484 default => "profile", # default profile 2772 default => "profile", # default profile
2485 show_tips => 1, 2773 show_tips => 1,
2486 logview_max_par => 1000, 2774 logview_max_par => 1000,
2487 shift_fire_stop => 0, 2775 shift_fire_stop => 0,
2776 uitheme => "wood",
2777 map_shift_x => -24, # arbitrary
2778 map_shift_y => +24, # arbitrary
2488 ); 2779 );
2489 2780
2490 while (my ($k, $v) = each %DEF_CFG) { 2781 while (my ($k, $v) = each %DEF_CFG) {
2491 $CFG->{$k} = $v unless exists $CFG->{$k}; 2782 $CFG->{$k} = $v unless exists $CFG->{$k};
2492 } 2783 }
2493 2784
2494 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2785 my @args = @ARGV;
2495 $PROFILE = $CFG->{profile}{default};
2496 2786
2497 # convert old bindings (only default profile matters) 2787 my $profile = 'default';
2498 if (my $bindings = delete $PROFILE->{bindings}) { 2788
2499 while (my ($mod, $syms) = each %$bindings) { 2789 for (my $i = 0; $i < @args; $i++) {
2500 while (my ($sym, $cmds) = each %$syms) { 2790 if ($args[$i] =~ /^--?profile$/) {
2501 push @{ $PROFILE->{macro} }, { 2791 $profile = $args[$i + 1];
2502 accelkey => [$mod*1, $sym*1], 2792 splice @args, $i, 2, ();
2503 action => $cmds,
2504 }; 2793 $i = 0;
2794 } elsif ($args[$i] =~ /^--?h/) {
2795 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2796 exit 0;
2505 } 2797 }
2506 } 2798 }
2507 }
2508 2799
2800 $CFG->{profile}{$profile} ||= {};
2801 $PROFILE = $CFG->{profile}{$profile};
2802 $PROFILE->{host} ||= "gameserver.deliantra.net";
2803
2804 $PROFILE->{host} = $args[0] if @args > 0;
2805 $PROFILE->{user} = $args[1] if @args > 1;
2806 $PROFILE->{password} = $args[2] if @args > 2;
2807
2808 # convert old bindings (only default profile matters)
2809 if (my $bindings = delete $PROFILE->{bindings}) {
2810 while (my ($mod, $syms) = each %$bindings) {
2811 while (my ($sym, $cmds) = each %$syms) {
2812 push @{ $PROFILE->{macro} }, {
2813 accelkey => [$mod*1, $sym*1],
2814 action => $cmds,
2815 };
2816 }
2817 }
2818 }
2819
2509 sdl_init; 2820 sdl_init;
2510 2821
2511 @SDL_MODES = DC::SDL_ListModes 8, 8; 2822 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2512 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2823 $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 2824
2515 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2825 {
2516
2517 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2518
2519 {
2520 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2826 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2521 DejaVuSans.ttf 2827 DejaVuSans.ttf
2522 DejaVuSansMono.ttf 2828 DejaVuSansMono.ttf
2523 DejaVuSans-Bold.ttf 2829 DejaVuSans-Bold.ttf
2524 DejaVuSansMono-Bold.ttf 2830 DejaVuSansMono-Bold.ttf
2525 DejaVuSans-Oblique.ttf 2831 DejaVuSans-Oblique.ttf
2526 DejaVuSansMono-Oblique.ttf 2832 DejaVuSansMono-Oblique.ttf
2527 DejaVuSans-BoldOblique.ttf 2833 DejaVuSans-BoldOblique.ttf
2528 DejaVuSansMono-BoldOblique.ttf 2834 DejaVuSansMono-BoldOblique.ttf
2835 mona.ttf
2529 ); 2836 );
2530 2837
2531 DC::add_font $_ for @fonts; 2838 DC::add_font $_ for @fonts;
2532 2839
2533 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2840 $FONT_PROP = new_from_file DC::Font $fonts[0];
2534 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2841 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2535 2842
2536 $FONT_PROP->make_default; 2843 $FONT_PROP->make_default;
2537 2844
2538 DC::pango_init; 2845 DC::pango_init;
2539 } 2846 }
2540 2847
2541# compare mono (ft) vs. rgba (cairo) 2848# compare mono (ft) vs. rgba (cairo)
2542# ft - 1.8s, cairo 3s, even in alpha-only mode 2849# ft - 1.8s, cairo 3s, even in alpha-only mode
2543# for my $rgba (0..1) { 2850# for my $rgba (0..1) {
2544# my $t1 = Time::HiRes::time; 2851# my $t1 = Time::HiRes::time;
2549# } 2856# }
2550# my $t2 = Time::HiRes::time; 2857# my $t2 = Time::HiRes::time;
2551# warn $t2-$t1; 2858# warn $t2-$t1;
2552# } 2859# }
2553 2860
2554 video_init; 2861 video_init;
2555 audio_init; 2862 audio_init;
2556} 2863 }
2557 2864
2558show_tip_of_the_day if $CFG->{show_tips}; 2865 show_tip_of_the_day if $CFG->{show_tips};
2559 2866
2560our $STARTUP_CANCEL = EV::idle sub { 2867 our $STARTUP_CANCEL = EV::idle sub {
2561 undef $::STARTUP_CANCEL; 2868 undef $::STARTUP_CANCEL;
2562 $startup_done->(); 2869 $startup_done->();
2563}; 2870 };
2564 2871
2565delete $SIG{__DIE__}; 2872 delete $SIG{__DIE__};
2566EV::loop; 2873 EV::loop;
2567 2874
2875 DC::write_cfg if $CFG->{config_autosave};
2876
2568#video_shutdown; 2877 #video_shutdown;
2569#audio_shutdown; 2878 #audio_shutdown;
2879
2570DC::OpenGL::quit; 2880 DC::OpenGL::quit;
2571DC::SDL_Quit; 2881 DC::SDL_Quit;
2572DC::DB::Server::stop; 2882 DC::DB::Server::stop;
2883}
2884
2885DC::SDL_braino; # see sub above
2573 2886
2574=head1 NAME 2887=head1 NAME
2575 2888
2576deliantra - A Deliantra MORPG game client 2889deliantra - A Deliantra MORPG game client
2577 2890
2578=head1 SYNOPSIS 2891=head1 SYNOPSIS
2579 2892
2580Just run it - no commandline arguments are supported. 2893 deliantra [--profile name] [host [user [password]]]
2894 deliantra --help
2581 2895
2582=head1 USAGE 2896=head1 USAGE
2583 2897
2584deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2898The deliantra client utilises OpenGL for all UI elements and the game. It
2585be used in fullscreen mode and interactively. 2899is supposed to be used in fullscreen mode and interactively.
2586 2900
2587=head1 DEBUGGING 2901=head1 DEBUGGING
2588
2589 2902
2590CFPLUS_DEBUG - environment variable 2903CFPLUS_DEBUG - environment variable
2591 2904
2592 1 draw borders around widgets 2905 1 draw borders around widgets
2593 2 add low-level widget info to tooltips 2906 2 add low-level widget info to tooltips
2594 4 show fps 2907 4 show fps
2595 8 suppress tooltips 2908 8 suppress tooltips
2596 2909
2597=head1 AUTHOR 2910=head1 AUTHOR
2598 2911
2599Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2912Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2600 2913
2601 2914
2602 2915

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines