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.45 by root, Mon May 26 03:35:42 2008 UTC vs.
Revision 1.107 by root, Thu Apr 8 03:51:26 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines