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.47 by root, Mon Jul 7 05:02:03 2008 UTC vs.
Revision 1.96 by root, Mon Jul 27 23:08:41 2009 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3{
4package Deliantra::Client; # work around CPAN breakage
5}
6 2
7if ($ENV{DELIANTRA_CORO_DEBUG}) { 3if ($ENV{DELIANTRA_CORO_DEBUG}) {
8 eval ' 4 eval '
9 use Coro; 5 use Coro;
10 use Coro::EV; 6 use Coro::EV;
… …
21 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
22 } 18 }
23 19
24 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
25 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
26 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
27 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
28 ); 29 );
29 30
30 $startup_done = sub { 31 $startup_done = sub {
… …
54 } 55 }
55 56
56 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
57 # pango is relocatable on win32 58 # pango is relocatable on win32
58 } else { 59 } else {
59 open my $fh, "<:perlio", "$root/pangoversion" 60 # OS X
60 or die "pangoversion: $!";
61 my $PANGO = <$fh>;
62 # unix, need to patch pango rc file
63 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
64 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
65 local $/;
66 my $rc = <$fh>;
67 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
68
69 mkdir "$root/pango-modules";
70 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
71 or die "$root/pango-modules/pango.modules: $!";
72 print $fh $rc;
73
74 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
75 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 $ENV{DYLD_LIBRARY_PATH} = $root;
76 or die "$ENV{PANGO_RC_FILE}: $!"; 63 chdir $root; # for pango modules, maybe other things
77 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
78 } 64 }
79 65
80 unshift @INC, $root; 66 unshift @INC, $root;
81 } 67 }
82} 68}
83 69
84# prepend private library directory 70# prepend private library directory and prepare env
85BEGIN { 71BEGIN {
86 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
87 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
88 if (-d $path) { 74 if (-d $path) {
89 unshift @INC, $path; 75 unshift @INC, $path;
… …
94 80
95# need to do it again because that pile of garbage called PAR nukes it before main 81# need to do it again because that pile of garbage called PAR nukes it before main
96unshift @INC, $ENV{PAR_TEMP} 82unshift @INC, $ENV{PAR_TEMP}
97 if %PAR::LibCache; 83 if %PAR::LibCache;
98 84
99use Time::HiRes 'time';
100use EV; 85use EV;
86BEGIN { *time = \&EV::time }
87
101use List::Util qw(max min); 88use List::Util qw(max min);
102 89
103use Deliantra; 90use Deliantra;
104use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
105 92
93use AnyEvent::Util ();
94use AnyEvent::Socket ();
106use AnyEvent::DNS; 95use AnyEvent::DNS ();
107 96
108use Compress::LZF; 97use Compress::LZF;
98use JSON::XS;
109 99
110use DC; 100use DC;
111BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 101
102sub crash($;$) {
103 # nop during compiletime
104}
105
106BEGIN {
107 $SIG{__DIE__} = sub {
108 return if $^S;
109 crash "CRASH/DIE: $_[0]" => 1;
110 DC::fatal Carp::longmess "$_[0]";
111 }
112}
113
112use DC::OpenGL (); 114use DC::OpenGL ();
113use DC::Protocol; 115use DC::Protocol;
114use DC::DB; 116use DC::DB;
115use DC::UI; 117use DC::UI;
116use DC::UI::Canvas; 118use DC::UI::Canvas;
117use DC::UI::Inventory; 119use DC::UI::Inventory;
118use DC::UI::SpellList; 120use DC::UI::SpellList;
119use DC::UI::Dockable; 121use DC::UI::Dockable;
120use DC::UI::Dockbar; 122use DC::UI::Dockbar;
121use DC::UI::MessageWindow;
122use DC::UI::ChatView; 123use DC::UI::ChatView;
123use DC::MessageDistributor; 124use DC::MessageDistributor;
124use DC::Pod; 125use DC::Pod;
125use DC::MapWidget; 126use DC::MapWidget;
126use DC::Macro; 127use DC::Macro;
127 128
128$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
129$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
130 131
131$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
132 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
133}; 135};
134 136
135my $MAX_FPS = 60; 137my $MAX_FPS = 60;
136 138
… …
138 140
139our $LAST_REFRESH; 141our $LAST_REFRESH;
140our $NOW; 142our $NOW;
141 143
142our $CFG; 144our $CFG;
143our $CONN;
144our $PROFILE; # current profile 145our $PROFILE; # current profile
145our $FAST; # fast, low-quality mode, possibly useful for software-rendering 146our $FAST; # fast, low-quality mode, possibly useful for software-rendering
146 147
147our $WANT_REFRESH; 148our $WANT_REFRESH;
148 149
150our $MODE_SLIDER;
151our $CAVEAT_LABEL;
152
149our @SDL_MODES; 153our @SDL_MODES;
154our $SDL_REINIT = 1;
150our $WIDTH; 155our $WIDTH;
151our $HEIGHT; 156our $HEIGHT;
152our $FULLSCREEN; 157our $FULLSCREEN;
153our $FONTSIZE; 158our $FONTSIZE;
154 159
155our $FONT_PROP; 160our $FONT_PROP;
156our $FONT_FIXED; 161our $FONT_FIXED;
157 162
163our $CONN;
164
158our $MAP; 165our $MAP;
159our $MAPMAP; 166our $MAPMAP;
160our $MAPWIDGET; 167our $MAPWIDGET;
161our $COMPLETER; 168our $COMPLETER;
162our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
163our $METASERVER; 173our $METASERVER;
164our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
165our $QUIT_DIALOG; 175our $QUIT_DIALOG;
166our $HOST_ENTRY; 176our $HOST_ENTRY;
167our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
193our $FLOORBOX; 203our $FLOORBOX;
194our $GAUGES; 204our $GAUGES;
195our $STATWIDS; 205our $STATWIDS;
196 206
197our $SDL_ACTIVE; 207our $SDL_ACTIVE;
198our %SDL_CB; 208our @SDL_CB;
199 209
200our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
201our $STATUSBOX; 211our $STATUSBOX;
202our $MODBOX; 212our $MODBOX;
203our $DEBUG_STATUS; 213our $DEBUG_STATUS;
204 214
205our $INV; 215our $INV;
206our $INVR; 216our $INVR;
207our $INVR_HB; 217our $INVR_HB;
218
219#############################################################################
220
221# write a crash message blockingly to the socket, if possible
222# this is a bit too complicated for my tastes, but it was easy.
223*crash = sub($;$) {
224 my ($msg, $backtrace) = @_;
225
226 warn $msg;
227
228 return unless $CONN;
229
230 my $fh = $CONN->{fh}
231 or return;
232
233 my $buf = delete $CONN->{wbuf};
234
235 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
236
237 AnyEvent::Util::fh_nonblocking $fh, 0;
238 syswrite $fh, $buf;
239 AnyEvent::Util::fh_nonblocking $fh, 1;
240
241 $msg =~ s/\s+$//;
242
243 # backtrace as second step, in case it crashes, too
244 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
245 if $backtrace;
246};
247
248sub clienterror($;$) {
249 my ($msg, $backtrace) = @_;
250
251 warn $msg;
252
253 return unless $CONN;
254
255 $CONN->send_exti_msg (clientlog => $msg);
256 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
257}
208 258
209############################################################################# 259#############################################################################
210 260
211sub status { 261sub status {
212 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 262 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
294 or return; 344 or return;
295 345
296 $meta->{data} 346 $meta->{data}
297 or return; 347 or return;
298 348
299 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
300 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
301 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 351 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
302 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
303 &audio_music_push ($face); 353 &audio_music_push ($face);
304 } 354 }
305 } else { 355 } else {
306 # fetch from database 356 # fetch from database
307 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
308 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
309 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
310 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 360 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
311 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
312 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
313 363
314 audio_sound_push ($face); 364 audio_sound_push ($face);
315 }; 365 };
… …
362 412
363 audio_music_update_volume; 413 audio_music_update_volume;
364 414
365 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
366 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
367 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
368 ? new_from_file DC::RW $meta->{path} 421 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
369 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
370 423
371 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
372 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
373 426
374 my $NOW = time; 427 my $NOW = time;
375 428
376 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
377 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
495 $MUSIC_WANT = []; 548 $MUSIC_WANT = [];
496 @MUSIC_JINGLE = (); 549 @MUSIC_JINGLE = ();
497 %AUDIO_PLAY = (); 550 %AUDIO_PLAY = ();
498 %AUDIO_CHUNK = (); 551 %AUDIO_CHUNK = ();
499 552
553 DC::MixMusic::halt;
554 DC::Mix_AllocateChannels 0;
500 DC::Mix_CloseAudio if $SDL_MIXER; 555 DC::Mix_CloseAudio if $SDL_MIXER;
501 undef $SDL_MIXER; 556 undef $SDL_MIXER;
502} 557}
503 558
504############################################################################# 559#############################################################################
… …
735} 790}
736 791
737sub dc_connect { 792sub dc_connect {
738 my ($host, $port) = @_; 793 my ($host, $port) = @_;
739 794
740 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 795 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
796 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
741 797
742 $CONN = 798 $CONN =
743 new DC::Protocol 799 new DC::Protocol
744 host => $host, 800 host => $host,
745 port => $port || 13327, 801 port => $port,
746 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
747 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
748 mapw => $mapsize, 804 mapw => $mapw,
749 maph => $mapsize, 805 maph => $maph,
750 806
751 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
752 808
753 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
754 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
… …
762 818
763 on_connect => sub { 819 on_connect => sub {
764 if ($_[0]) { 820 if ($_[0]) {
765 DC::lowdelay fileno $CONN->{fh}; 821 DC::lowdelay fileno $CONN->{fh};
766 822
767 status "login successful"; 823 status "successfully connected to the server";
768 } else { 824 } else {
769 undef $CONN; 825 undef $CONN;
770 status "unable to connect: $!"; 826 status "unable to connect: $!";
771 stop_game(); 827 stop_game();
772 } 828 }
… …
778 status "logging in..."; 834 status "logging in...";
779 835
780 $LOGIN_BUTTON->set_text ("Logout"); 836 $LOGIN_BUTTON->set_text ("Logout");
781 $SETUP_DIALOG->hide; 837 $SETUP_DIALOG->hide;
782 838
783 my ($host, $port) = split /:/, $PROFILE->{host}; 839 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
784 840
785 $MAP = new DC::Map; 841 $MAP = new DC::Map;
786 842
787 # hack to make SURE we find the IP address all right 843 # hack to make SURE we find the IP address all right
788 # can be removed once AnyEvent::DNS is proven stable. 844 # can be removed once AnyEvent::DNS is proven stable.
789 if ($host eq "gameserver.deliantra.net") { 845 if ($host eq "gameserver.deliantra.net") {
790 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 846 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
791 if ($_[0] ne "80.101.114.108") { # Perl 847 if ($_[0] ne "80.101.114.108") { # Perl
848 status "dns failure, trying differently";
849 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
850 unless (defined $host) {
792 status "dns failure, using hardcoded address"; 851 status "dns failure, using hardcoded address";
793 $host = "129.13.162.95"; 852 $host = "129.13.162.95";
853 }
794 } 854 }
795 855
796 dc_connect $host, $port; 856 dc_connect $host, $port;
797 }; 857 };
798 } else { 858 } else {
799 dc_connect $host, $port; 859 dc_connect $host, $port;
800 } 860 }
801} 861}
802 862
803sub stop_game { 863sub stop_game {
864 crash "stop_game";
865
804 $LOGIN_BUTTON->set_text ("Login / Register"); 866 $LOGIN_BUTTON->set_text ("Login / Register");
805 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 867 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
806 $SETUP_DIALOG->show; 868 $SETUP_DIALOG->show;
807 $PL_WINDOW->hide; 869 $PL_WINDOW->hide;
808 $SPELL_LIST->clear_spells; 870 $SPELL_LIST->clear_spells;
… …
822} 884}
823 885
824sub graphics_setup { 886sub graphics_setup {
825 my $vbox = new DC::UI::VBox; 887 my $vbox = new DC::UI::VBox;
826 888
889 {
890 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
891
827 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 892 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
828 893
829 my $row = 0; 894 my $row = 0;
830 895
831 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 896 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
832 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 897 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
833 can_events => 1, 898 can_events => 1,
834 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 899 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
835 900
901 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
902 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
903 can_events => 1,
904 tooltip => "This field shows any known issues with your config or driver, such as "
905 . "a non-accelerated display format. You can try to work around these issues "
906 . "by selecting a different video mode, changing the settings below or "
907 . "by installing the right driver for your graphics card.");
908
909 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
910 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
911 value => $CFG->{uitheme},
912 options => [
913 [wood => "Wood (the default)"],
914 [plain => "Plain (very)"],
915 [blue => "Blue (dark)"],
916 [metal => "Metal (light)"],
917 ],
918 tooltip => "Choose the User Interface theme that you like most :)",
919 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
920 );
921
836 my $vidmode_tooltip = 922 my $vidmode_tooltip =
837 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 923 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
838 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 924 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
839 925
840 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 926 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
841 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 927 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
842 928
843 $hbox->add (my $mode_slider = new DC::UI::Slider 929 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
844 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 930 c_rescale => 1,
931 force_w => $WIDTH * 0.1, expand => 1,
932 range => [ ($CFG->{sdl_mode}) x 3 ],
845 tooltip => $vidmode_tooltip); 933 tooltip => $vidmode_tooltip);
846 $hbox->add (my $mode_label = new DC::UI::Label 934 $hbox->add (my $mode_label = new DC::UI::Label
847 height => 0.8, template => "9999x9999@9+9", 935 height => 0.8, template => "9999x9999@9+9",
848 can_events => 1, tooltip => $vidmode_tooltip); 936 can_events => 1, tooltip => $vidmode_tooltip);
849 937
850 $mode_slider->connect (changed => sub { 938 $MODE_SLIDER->connect (changed => sub {
851 my ($self, $value) = @_; 939 my ($self, $value) = @_;
852 940
853 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 941 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
854 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 942 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
855 }); 943 });
856 $mode_slider->emit (changed => $mode_slider->{range}[0]); 944 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
857 945
858 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 946 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
859 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 947 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
860 state => $CFG->{fullscreen}, 948 state => $CFG->{fullscreen},
861 tooltip => "Bring the client into fullscreen mode.", 949 tooltip => "Bring the client into fullscreen mode.",
862 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 950 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
863 ); 951 );
864 952
865 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
866 $table->add_at (1, $row++, new DC::UI::CheckBox 954 $table->add_at (1, $row++, new DC::UI::CheckBox
867 state => $CFG->{force_opengl11}, 955 state => $CFG->{force_opengl11},
868 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 956 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
869 . "higher memory usage and slower performance. It will, however, help tremendously on " 957 . "higher memory usage and slower performance. It will, however, help tremendously on "
870 . "cards that claim to support a feature but fall back to software rendering. " 958 . "cards that claim to support a feature but fall back to software rendering. "
871 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 959 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
872 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 960 . "but cards and drivers from other vendors (ATI) are often just as bad. "
873 . "experience extremely low framerates and your card should do better, try this option.</b>", 961 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
874 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 962 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
875 ); 963 );
876 964
965 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
966 $table->add_at (1, $row++, new DC::UI::CheckBox
967 state => $CFG->{disable_alpha},
968 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
969 . "by disabling a number of textures and transparency effects. Normally, these "
970 . "effects do not cost a lot of resources, but some graphics cards might fall "
971 . "back to extremely slow rendering if this is enabled. If disabling this option "
972 . "noticably improves the framerate of the client please report this! "
973 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
974 on_changed => sub {
975 my ($self, $value) = @_;
976 $CFG->{disable_alpha} = $value;
977 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
978 0
979 }
980 );
981
877 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 982 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
878 $table->add_at (1, $row++, new DC::UI::CheckBox 983 $table->add_at (1, $row++, new DC::UI::CheckBox
879 state => $CFG->{texture_compression}, 984 state => $CFG->{texture_compression},
880 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 985 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
881 . "will save a lot of memory and increase performance. The compression algorithm " 986 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
882 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 987 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
883 . "forced OpenGL 1.1 mode.", 988 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
884 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 989 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
885 ); 990 );
886 991
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 992 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
888 $table->add_at (1, $row++, new DC::UI::CheckBox 993 $table->add_at (1, $row++, new DC::UI::CheckBox
889 state => $CFG->{fast}, 994 state => $CFG->{fast},
890 tooltip => "Lower the visual quality considerably to speed up rendering.", 995 tooltip => "Lower the visual quality considerably to speed up rendering.",
891 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
892 ); 997 );
893 998
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 999 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
895 $table->add_at (1, $row++, new DC::UI::Slider 1000 $table->add_at (1, $row++, new DC::UI::Slider
896 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1001 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
897 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1002 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
898 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1003 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
899 ); 1004 );
900 1005
901 $table->add_at (1, $row++, new DC::UI::Button 1006 $table->add_at (1, $row++, new DC::UI::Button
902 expand => 1, text => "Apply", 1007 expand => 1, text => "Apply",
903 tooltip => "Apply the video settings above.", 1008 tooltip => "Apply the video settings above.",
904 on_activate => sub { 1009 on_activate => sub {
905 video_shutdown (); 1010 video_shutdown ();
906 video_init (); 1011 video_init ();
1012 0
907 0 1013 }
908 } 1014 );
1015 }
1016
1017 {
1018 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1019
1020 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1021
1022 my $row = 0;
1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1024 $table->add_at (1, $row++, new DC::UI::CheckBox
1025 state => $CFG->{smooth_movement},
1026 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1027 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1028 . "then disable this option. Changes take effect immdiately.",
1029 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
909 ); 1030 );
910 1031
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1032 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
912 $table->add_at (1, $row++, new DC::UI::Slider 1033 $table->add_at (1, $row++, new DC::UI::Slider
913 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1034 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
914 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1035 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
915 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
916 ); 1037 );
917 1038
918 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
919 $table->add_at (1, $row++, new DC::UI::CheckBox 1040 $table->add_at (1, $row++, new DC::UI::CheckBox
920 state => $CFG->{map_smoothing}, 1041 state => $CFG->{map_smoothing},
921 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1042 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
922 . "This increases load on the graphics subsystem and works only with TRT servers. " 1043 . "This increases load on the graphics subsystem and works only with TRT servers. "
923 . "Changes take effect at next login only.", 1044 . "Changes take effect at next login only.",
924 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1045 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
925 ); 1046 );
926 1047
927 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
928 $table->add_at (1, $row++, new DC::UI::CheckBox 1049 $table->add_at (1, $row++, new DC::UI::CheckBox
929 state => $CFG->{fow_enable}, 1050 state => $CFG->{fow_enable},
930 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1051 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
931 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
932 ); 1053 );
933 1054
934 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
935 $table->add_at (1, $row++, new DC::UI::Slider 1056 $table->add_at (1, $row++, new DC::UI::Slider
936 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1057 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
937 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1058 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
938 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1059 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
939 ); 1060 );
940 1061
941 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1062 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
942 $table->add_at (1, $row++, new DC::UI::Slider 1063 $table->add_at (1, $row++, new DC::UI::Slider
943 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1064 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
944 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1065 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
945 . "but you still need to press apply to correctly re-layout the widget.", 1066 . "but you still need to press apply to correctly re-layout the widget.",
946 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1067 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
947 ); 1068 );
948 1069
949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
950 $table->add_at (1, $row++, new DC::UI::Slider 1071 $table->add_at (1, $row++, new DC::UI::Slider
951 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1072 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
952 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1073 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
953 on_changed => sub { 1074 on_changed => sub {
954 $CFG->{gauge_fontsize} = $_[1]; 1075 $CFG->{gauge_fontsize} = $_[1];
955 &set_gauge_window_fontsize; 1076 &set_gauge_window_fontsize;
1077 0
956 0 1078 }
957 } 1079 );
958 );
959 1080
960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1081 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
961 $table->add_at (1, $row++, new DC::UI::Slider 1082 $table->add_at (1, $row++, new DC::UI::Slider
962 range => [$CFG->{gauge_size}, 0.2, 0.8], 1083 range => [$CFG->{gauge_size}, 0.2, 0.8],
963 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1084 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
964 on_changed => sub { 1085 on_changed => sub {
965 $CFG->{gauge_size} = $_[1]; 1086 $CFG->{gauge_size} = $_[1];
966 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1087 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1088 0
967 0 1089 }
968 } 1090 );
969 ); 1091 }
970 1092
971 $vbox 1093 $vbox
972} 1094}
973 1095
974our $AUDIO_HW_CHUNKSIZE; 1096our $AUDIO_HW_CHUNKSIZE;
… …
1137} 1259}
1138 1260
1139sub make_gauge_window { 1261sub make_gauge_window {
1140 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1262 my $gh = int $HEIGHT * $CFG->{gauge_size};
1141 1263
1142 my $win = new DC::UI::Frame ( 1264 $GAUGES->{win} = my $win = new DC::UI::Frame (
1143 force_x => 0, 1265 force_x => 0,
1144 force_y => "max", 1266 force_y => "max",
1145 force_w => $WIDTH, 1267 force_w => $WIDTH,
1146 force_h => $gh, 1268 force_h => $gh,
1147 ); 1269 );
… …
1163 (new DC::UI::Empty expand => 1), 1285 (new DC::UI::Empty expand => 1),
1164 (my $hb = new DC::UI::HBox), 1286 (my $hb = new DC::UI::HBox),
1165 ], 1287 ],
1166 ); 1288 );
1167 1289
1168 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1290 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1169 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1291 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1170 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1292 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1171 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1293 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1172
1173 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1174 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1175 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1176 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1177
1178 $GAUGES = {
1179 exp => $exp, prg => $prg, sklprg => $sklprg,
1180 win => $win, range => $rng,
1181 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1182 };
1183 1294
1184 &set_gauge_window_fontsize; 1295 &set_gauge_window_fontsize;
1185 1296
1186 $win 1297 $win
1187} 1298}
… …
1529 ); 1640 );
1530 1641
1531 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1642 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1532 $table->add_at (1, 4, new DC::UI::Entry 1643 $table->add_at (1, 4, new DC::UI::Entry
1533 text => $CFG->{profile}{default}{user}, 1644 text => $CFG->{profile}{default}{user},
1534 tooltip => "The name of your character on the server.", 1645 tooltip => "The name of your character on the server. The name is case-sensitive!",
1535 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1646 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1536 ); 1647 );
1537 1648
1538 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1649 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1539 $table->add_at (1, 5, new DC::UI::Entry 1650 $table->add_at (1, 5, new DC::UI::Entry
… …
1553 1 1664 1
1554 }, 1665 },
1555 ); 1666 );
1556 1667
1557 $vbox->add (new DC::UI::FancyFrame 1668 $vbox->add (new DC::UI::FancyFrame
1558 label => "Registering", 1669 label => "How to Play",
1559 min_h => 200, 1670 min_h => 240,
1560 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1671 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1561 markup => 1672 markup =>
1673 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1674 . "Then register a new account (or use an existing one if you have one). "
1562 "To register a new account, choose a username that hasn't been taken yet and " 1675 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1563 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1676 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1564 ), 1677 ),
1565 ); 1678 );
1566 1679
1567 $vbox 1680 $vbox
… …
1639 1752
1640 my $row = 0; 1753 my $row = 0;
1641 1754
1642 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1755 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1643 $table->add_at (1, $row++, new DC::UI::CheckBox 1756 $table->add_at (1, $row++, new DC::UI::CheckBox
1757 c_colspan => 2,
1644 state => $CFG->{show_tips}, 1758 state => $CFG->{show_tips},
1645 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1759 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1646 on_changed => sub { 1760 on_changed => sub {
1647 my ($self, $value) = @_; 1761 my ($self, $value) = @_;
1648 $CFG->{show_tips} = $value; 1762 $CFG->{show_tips} = $value;
… …
1650 } 1764 }
1651 ); 1765 );
1652 1766
1653 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1767 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1654 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1768 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1769 c_colspan => 2,
1655 text => $CFG->{logview_max_par}, 1770 text => $CFG->{logview_max_par},
1656 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1771 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1657 . "sends more messages than this number, older messages get removed to save memory and " 1772 . "sends more messages than this number, older messages get removed to save memory and "
1658 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1773 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1659 on_changed => sub { 1774 on_changed => sub {
… …
1661 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1776 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1662 0 1777 0
1663 }, 1778 },
1664 ); 1779 );
1665 1780
1781 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1782 $table->add_at (1, $row, new DC::UI::CheckBox
1783 state => $CFG->{config_autosave},
1784 tooltip => "Normally, configuration settings and the user interface layout "
1785 . "are saved on client exit. You can disable this behaviour by "
1786 . "unchecking this checkbox.",
1787 on_changed => sub {
1788 my ($self, $value) = @_;
1789 $CFG->{config_autosave} = $value;
1790 0
1791 }
1792 );
1793 $table->add_at (2, $row++, new DC::UI::Button
1794 text => "Save Now",
1795 tooltip => "Use this to manually save configuration and UI layout when "
1796 . "autosave is disabled.",
1797 on_activate => sub {
1798 DC::write_cfg;
1799 0
1800 }
1801 );
1802
1666 $table 1803 $table
1667} 1804}
1668 1805
1669sub autopickup_setup { 1806sub autopickup_setup {
1670 my $r = new DC::UI::ScrolledWindow ( 1807 my $r = new DC::UI::ScrolledWindow (
… …
1676 col_expand => [0, 1, 0, 1], 1813 col_expand => [0, 1, 0, 1],
1677 ); 1814 );
1678 1815
1679 for ( 1816 for (
1680 ["General", 0, 0, 1817 ["General", 0, 0,
1681 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1682 ["Inhibit autopickup" => PICKUP_INHIBIT], 1818# ["Inhibit autopickup" => PICKUP_INHIBIT],
1683 ["Stop before pickup" => PICKUP_STOP], 1819 ["Stop before pickup" => PICKUP_STOP],
1684 ["Debug autopickup" => PICKUP_DEBUG], 1820 ["Debug autopickup" => PICKUP_DEBUG],
1685 ], 1821 ],
1686 ["Weapons", 0, 6, 1822 ["Weapons", 0, 6,
1687 ["All weapons" => PICKUP_ALLWEAPON], 1823 ["All weapons" => PICKUP_ALLWEAPON],
… …
1713 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1849 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1714 ["Ignore cursed" => PICKUP_NOT_CURSED], 1850 ["Ignore cursed" => PICKUP_NOT_CURSED],
1715 ["Jewelery" => PICKUP_JEWELS], 1851 ["Jewelery" => PICKUP_JEWELS],
1716 ["Flesh" => PICKUP_FLESH], 1852 ["Flesh" => PICKUP_FLESH],
1717 ], 1853 ],
1718 ["Weight/Value ratio", 2, 17] 1854 ["Value/Weight ratio", 2, 17]
1719 ) 1855 )
1720 { 1856 {
1721 my ($title, $x, $y, @bits) = @$_; 1857 my ($title, $x, $y, @bits) = @$_;
1722 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1858 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1723 1859
… …
1735 $::CFG->{pickup} |= $mask; 1871 $::CFG->{pickup} |= $mask;
1736 } else { 1872 } else {
1737 $::CFG->{pickup} &= ~$mask; 1873 $::CFG->{pickup} &= ~$mask;
1738 } 1874 }
1739 1875
1740 $::CONN->send_command ("pickup $::CFG->{pickup}") 1876 $::CONN->send_pickup ($::CFG->{pickup})
1741 if defined $::CONN; 1877 if defined $::CONN;
1742 1878
1743 0 1879 0
1744 }); 1880 });
1745 1881
… …
1748 } 1884 }
1749 1885
1750 $table->add_at (2, 18, new DC::UI::ValSlider 1886 $table->add_at (2, 18, new DC::UI::ValSlider
1751 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1887 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1752 template => ">= 99", 1888 template => ">= 99",
1889 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1753 to_value => sub { ">= " . 5 * $_[0] }, 1890 to_value => sub { ">= " . 5 * $_[0] },
1754 on_changed => sub { 1891 on_changed => sub {
1755 my ($slider, $value) = @_; 1892 my ($slider, $value) = @_;
1756 1893
1757 $::CFG->{pickup} &= ~0xF; 1894 $::CFG->{pickup} &= ~0xF;
… …
1761 }); 1898 });
1762 1899
1763 $table->add_at (3, 18, new DC::UI::Button 1900 $table->add_at (3, 18, new DC::UI::Button
1764 text => "set", 1901 text => "set",
1765 on_activate => sub { 1902 on_activate => sub {
1766 $::CONN->send_command ("pickup $::CFG->{pickup}") 1903 $::CONN->send_pickup ($::CFG->{pickup})
1767 if defined $::CONN; 1904 if defined $::CONN;
1768 0 1905 0
1769 }); 1906 });
1770 1907
1771 $r 1908 $r
… …
1813 $::CFG->{inv_sort} = $_[1]; 1950 $::CFG->{inv_sort} = $_[1];
1814 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1951 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1815 }, 1952 },
1816 ); 1953 );
1817 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1954 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1818 #TODO# update to weigh/maxweight 1955 #TODO# update to weight/maxweight
1819 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1956 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1820 1957
1821 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1958 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1822 $sw1->add ($INV = new DC::UI::Inventory); 1959 $sw1->add ($INV = new DC::UI::Inventory);
1823 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1960 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1884 $PL_NOTEBOOK->set_current_page ($widget); 2021 $PL_NOTEBOOK->set_current_page ($widget);
1885 $PL_WINDOW->show; 2022 $PL_WINDOW->show;
1886 } 2023 }
1887} 2024}
1888 2025
1889sub player_window { 2026sub make_playerbook {
1890 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2027 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1891 x => "center", 2028 x => "center",
1892 y => "center", 2029 y => "center",
1893 force_w => $WIDTH * 9/10, 2030 force_w => $WIDTH * 9/10,
1894 force_h => $HEIGHT * 9/10, 2031 force_h => $HEIGHT * 9/10,
… …
1928 "License, Author and Source info for media sent by the server."); 2065 "License, Author and Source info for media sent by the server.");
1929 2066
1930 $ntb->set_current_page ($INVENTORY_PAGE); 2067 $ntb->set_current_page ($INVENTORY_PAGE);
1931 2068
1932 $plwin->add ($ntb); 2069 $plwin->add ($ntb);
1933 $plwin
1934} 2070}
1935 2071
1936sub keyboard_setup { 2072sub keyboard_setup {
1937 DC::Macro::keyboard_setup 2073 DC::Macro::keyboard_setup
1938} 2074}
1939 2075
1940sub help_window { 2076sub make_help_window {
1941 my $win = new DC::UI::Toplevel 2077 my $win = new DC::UI::Toplevel
1942 x => 'center', 2078 x => 'center',
1943 y => 'center', 2079 y => 'center',
1944 z => 4, 2080 z => 4,
1945 name => 'doc_browser', 2081 name => 'doc_browser',
… …
2034 2170
2035 $load_node->((DC::Pod::find @path)[0]); 2171 $load_node->((DC::Pod::find @path)[0]);
2036 $win->show; 2172 $win->show;
2037 }; 2173 };
2038 2174
2039 $win 2175 $HELP_WINDOW = $win;
2040}
2041
2042sub open_string_query {
2043 my ($title, $cb, $txt, $tooltip) = @_;
2044 my $dialog = new DC::UI::Toplevel
2045 x => "center",
2046 y => "center",
2047 z => 50,
2048 force_w => $WIDTH * 4/5,
2049 title => $title;
2050
2051 $dialog->add (
2052 my $e = new DC::UI::Entry
2053 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2054 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2055 tooltip => $tooltip
2056 );
2057
2058 $e->grab_focus;
2059 $e->set_text ($txt) if $txt;
2060 $dialog->show;
2061} 2176}
2062 2177
2063sub open_quit_dialog { 2178sub open_quit_dialog {
2064 unless ($QUIT_DIALOG) { 2179 unless ($QUIT_DIALOG) {
2065 $QUIT_DIALOG = new DC::UI::Toplevel 2180 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2087 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2202 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2088 ); 2203 );
2089 $hb->add (new DC::UI::Button 2204 $hb->add (new DC::UI::Button
2090 text => "Quit anyway", 2205 text => "Quit anyway",
2091 expand => 1, 2206 expand => 1,
2092 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2207 on_activate => sub {
2208 crash "Quit anyway";
2209 EV::unloop EV::UNLOOP_ALL;
2210 },
2093 ); 2211 );
2094 } 2212 }
2095 2213
2096 $QUIT_DIALOG->show; 2214 $QUIT_DIALOG->show;
2097 $QUIT_DIALOG->grab_focus; 2215 $QUIT_DIALOG->grab_focus;
2216}
2217
2218sub make_menubar {
2219 $MENUFRAME = new DC::UI::Toplevel
2220 border => 0,
2221 force_x => 0,
2222 force_y => 0,
2223 force_w => $::WIDTH,
2224 child => ($MENUBAR = new DC::UI::HBox),
2225 ;
2226
2227 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2228
2229 # 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
2230 make_gauge_window->show;
2231
2232# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2233# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2234
2235 make_playerbook;
2236
2237 $MENUPOPUP = DC::UI::Menu->new (items => [
2238 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2239 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2240 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2241 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2242 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2243 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2244 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2245 ["Quit…" , sub {
2246 if ($CONN) {
2247 open_quit_dialog;
2248 } else {
2249 EV::unloop EV::UNLOOP_ALL;
2250 }
2251 }],
2252 ]);
2253
2254 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2255 tooltip => "Shows the main menu",
2256 on_button_down => sub {
2257 my ($self, $ev) = @_;
2258 local $ev->{x} = 0;
2259 local $ev->{y} = 0;
2260 $MENUPOPUP->popup ($ev);
2261 },
2262 );
2263
2264 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2265 padding_x => 6,
2266 padding_y => 3,
2267 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2268 template => " Exp: 888,888,888,888 (lvl 188) ",
2269 );
2270
2271 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2272 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2273 . "will automatically pick up items as defined by your item pickup settings "
2274 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2275 . "disable autopickup by disabling this checkbox.",
2276 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2277 on_changed => sub {
2278 my ($self, $value) = @_;
2279 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2280 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2281 $CONN->send_pickup ($CFG->{pickup})
2282 if $CONN;
2283 },
2284 );
2285
2286 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2287 c_rescale => 1,
2288 padding_x => 6,
2289 padding_y => 3,
2290 force_w => $::WIDTH * 0.2,
2291 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2292 template => "two handed weapons 99%",
2293 );
2294
2295 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2296 expand => 1,
2297 align => 1, can_hover => 1, can_events => 1,
2298 text => "Range and Combat Slots",
2299 tooltip => "#stat_ranged",
2300 );
2301
2302 $MENUFRAME->show;
2303}
2304
2305sub open_string_query {
2306 my ($title, $cb, $txt, $tooltip) = @_;
2307 my $dialog = new DC::UI::Toplevel
2308 x => "center",
2309 y => "center",
2310 z => 50,
2311 force_w => $WIDTH * 4/5,
2312 title => $title;
2313
2314 $dialog->add (
2315 my $e = new DC::UI::Entry
2316 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2317 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2318 tooltip => $tooltip
2319 );
2320
2321 $e->grab_focus;
2322 $e->set_text ($txt) if $txt;
2323 $dialog->show;
2098} 2324}
2099 2325
2100sub show_tip_of_the_day { 2326sub show_tip_of_the_day {
2101 # find all tips 2327 # find all tips
2102 my @tod = DC::Pod::find tip_of_the_day => "*"; 2328 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2150 $dialog->show; 2376 $dialog->show;
2151 }; 2377 };
2152} 2378}
2153 2379
2154sub sdl_init { 2380sub sdl_init {
2155 DC::SDL_Init 2381 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2156 and die "SDL::Init failed!\n"; 2382 and die "SDL::Init failed!\n";
2157} 2383}
2158 2384
2159sub video_init { 2385sub video_init {
2386 DC::set_theme $CFG->{uitheme};
2387
2388 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2389 $SDL_REINIT = 0;
2390
2391 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2392 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2393 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2394 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2395
2396 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2397
2160 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2398 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2399 $CFG->{sdl_mode} = 0; # lowest resolution by default
2400
2401 # now choose biggest mode <= 1024x768
2402 for (0 .. $#SDL_MODES) {
2403 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2404 $CFG->{sdl_mode} = $_;
2405 }
2406 }
2407 }
2161 2408
2162 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2409 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2163 2410
2164 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2411 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2165 $FULLSCREEN = $CFG->{fullscreen}; 2412 $FULLSCREEN = $CFG->{fullscreen};
2166 $FAST = $CFG->{fast}; 2413 $FAST = $CFG->{fast};
2167 2414
2415 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2168 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2416 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2417 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2169 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2418 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2170 2419
2171 $SDL_ACTIVE = 1; 2420 $SDL_ACTIVE = 1;
2172 $LAST_REFRESH = time - 0.01; 2421 $LAST_REFRESH = time - 0.01;
2173 2422
… …
2220 2469
2221 (new DC::UI::Frame 2470 (new DC::UI::Frame
2222 bg => [0, 0, 0, 0.4], 2471 bg => [0, 0, 0, 0.4],
2223 force_x => 0, 2472 force_x => 0,
2224 force_y => "max", 2473 force_y => "max",
2225 child => (my $LR = new DC::UI::VBox), 2474 child => (my $LL = new DC::UI::VBox),
2226 )->show; 2475 )->show;
2227 2476
2228 $LR->add ($STATUSBOX); 2477 $LL->add ($STATUSBOX);
2229 $LR->add ($MODBOX); 2478 $LL->add ($MODBOX);
2230 $LR->add (new DC::UI::Label 2479 $LL->add (new DC::UI::Label
2231 align => 0, 2480 align => 0,
2232 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2481 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2233 fontsize => 0.5, 2482 fontsize => 0.5,
2234 fg => [1, 1, 0, 0.7], 2483 fg => [1, 1, 0, 0.7],
2235 ); 2484 );
2236 2485
2237 DC::UI::Toplevel->new ( 2486 DC::UI::Toplevel->new (
2238 title => "Minimap", 2487 title => "Minimap",
2239 name => "mapmap", 2488 name => "mapmap",
2240 x => 0, 2489 x => 0,
2241 y => $FONTSIZE + 8, 2490 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2242 border_bg => [1, 1, 1, 192/255], 2491 border_bg => [1, 1, 1, 192/255],
2243 bg => [1, 1, 1, 0], 2492 bg => [1, 1, 1, 0],
2244 child => ($MAPMAP = new DC::MapWidget::MapMap 2493 child => ($MAPMAP = new DC::MapWidget::MapMap
2245 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2494 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2246 ), 2495 ),
2247 )->show; 2496 )->show;
2248 2497
2249 $MAPWIDGET = new DC::MapWidget; 2498 $MAPWIDGET = new DC::MapWidget;
2250 $MAPWIDGET->connect (activate_console => sub { 2499 $MAPWIDGET->connect (activate_console => sub {
… …
2275 $METASERVER = metaserver_dialog; 2524 $METASERVER = metaserver_dialog;
2276 # the name is changed to not conflict with the older name as users could have hidden it 2525 # the name is changed to not conflict with the older name as users could have hidden it
2277 $MESSAGE_WINDOW = new DC::UI::Dockbar 2526 $MESSAGE_WINDOW = new DC::UI::Dockbar
2278 name => "message_window2", 2527 name => "message_window2",
2279 title => 'Messages', 2528 title => 'Messages',
2529 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2280 force_w => $::WIDTH * 0.6, 2530 force_w => $::WIDTH * 0.6,
2281 force_h => $::HEIGHT * 0.25, 2531 force_h => $::HEIGHT * 0.25,
2282 ; 2532 ;
2283 2533
2284 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2534 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2304 . "After pressing the combo the binding will be saved automatically and the " 2554 . "After pressing the combo the binding will be saved automatically and the "
2305 . "binding editor closes"); 2555 . "binding editor closes");
2306 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2556 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2307 "Some debuggin' options. Do not ask."); 2557 "Some debuggin' options. Do not ask.");
2308 2558
2309 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2559 make_help_window;
2560 make_menubar;
2310 2561
2311 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2312 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2313
2314# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2315# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2316
2317 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
2318
2319 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2320 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2321
2322 $BUTTONBAR->add (new DC::UI::Button
2323 text => "Save Config",
2324 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2325 on_activate => sub {
2326 $::CFG->{layout} = DC::UI::get_layout;
2327 DC::write_cfg;
2328 status "Configuration Saved";
2329 0
2330 },
2331 );
2332
2333 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2334 tooltip => "View Documentation");
2335
2336 $BUTTONBAR->add (new DC::UI::Button
2337 text => "Quit",
2338 tooltip => "Terminates the program",
2339 on_activate => sub {
2340 if ($CONN) {
2341 open_quit_dialog;
2342 } else {
2343 EV::unloop EV::UNLOOP_ALL;
2344 }
2345 0
2346 },
2347 );
2348
2349 $BUTTONBAR->show;
2350 $SETUP_DIALOG->show; 2562 $SETUP_DIALOG->show;
2351 $MESSAGE_WINDOW->show; 2563 $MESSAGE_WINDOW->show;
2352 } 2564 }
2353 2565
2566 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2567 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2568
2569 $CAVEAT_LABEL->set_text ("None :)");
2570 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2571 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2572
2354 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2573 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2355} 2574}
2356 2575
2357sub video_shutdown { 2576sub video_shutdown {
2358 DC::OpenGL::shutdown; 2577 DC::OpenGL::shutdown;
2578 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2359 2579
2360 undef $SDL_ACTIVE; 2580 undef $SDL_ACTIVE;
2361} 2581}
2362 2582
2363my %animate_object; 2583my %animate_object;
… …
2382my $want_refresh = EV::prepare_ns \&force_refresh; 2602my $want_refresh = EV::prepare_ns \&force_refresh;
2383 2603
2384my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2604my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2385 $NOW = EV::now; 2605 $NOW = EV::now;
2386 2606
2387 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2607 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2388 for DC::poll_events; 2608 for DC::poll_events;
2389 2609
2390 if (%animate_object) { 2610 if (%animate_object) {
2391 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2611 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2392 $WANT_REFRESH = 1; 2612 $WANT_REFRESH = 1;
… …
2404sub animation_stop { 2624sub animation_stop {
2405 my ($widget) = @_; 2625 my ($widget) = @_;
2406 delete $animate_object{$widget}; 2626 delete $animate_object{$widget};
2407} 2627}
2408 2628
2409%SDL_CB = (
2410 DC::SDL_QUIT => sub { 2629$SDL_CB[DC::SDL_QUIT] = sub {
2630 crash "SDL_QUIT";
2411 EV::unloop EV::UNLOOP_ALL; 2631 EV::unloop EV::UNLOOP_ALL;
2412 }, 2632};
2413 DC::SDL_VIDEORESIZE => sub { 2633$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2414 },
2415 DC::SDL_VIDEOEXPOSE => sub { 2634$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2416 DC::UI::full_refresh; 2635 DC::UI::full_refresh;
2417 }, 2636};
2418 DC::SDL_ACTIVEEVENT => sub { 2637$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2419# not useful, as APPACTIVE includes only iconified state, not unmapped 2638# not useful, as APPACTIVE includes only iconified state, not unmapped
2420# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2639# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2421# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2640# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2422# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2641# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2423# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2642# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2424# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2643# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2425 }, 2644};
2426 DC::SDL_KEYDOWN => sub { 2645$SDL_CB[DC::SDL_KEYDOWN] = sub {
2427 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2646 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2428 # alt-enter 2647 # alt-enter
2648 video_shutdown;
2429 $FULLSCREEN_ENABLE->toggle; 2649 $FULLSCREEN_ENABLE->toggle;
2430 video_shutdown;
2431 video_init; 2650 video_init;
2432 } else { 2651 } else {
2433 &DC::UI::feed_sdl_key_down_event; 2652 &DC::UI::feed_sdl_key_down_event;
2434 } 2653 }
2435 update_modbox; 2654 update_modbox;
2436 }, 2655};
2437 DC::SDL_KEYUP => sub { 2656$SDL_CB[DC::SDL_KEYUP] = sub {
2438 &DC::UI::feed_sdl_key_up_event; 2657 &DC::UI::feed_sdl_key_up_event;
2439 update_modbox; 2658 update_modbox;
2440 }, 2659};
2441 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2660$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2442 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2661$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2443 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2662$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2444 DC::SDL_USEREVENT => sub { 2663$SDL_CB[DC::SDL_USEREVENT] = sub {
2445 if ($_[0]{code} == 1) { 2664 if ($_[0]{code} == 1) {
2446 audio_channel_finished $_[0]{data1}; 2665 audio_channel_finished $_[0]{data1};
2447 } elsif ($_[0]{code} == 0) { 2666 } elsif ($_[0]{code} == 0) {
2448 audio_music_finished; 2667 audio_music_finished;
2449 }
2450 }, 2668 }
2451); 2669};
2452 2670
2453############################################################################# 2671#############################################################################
2454 2672
2455$SIG{INT} = $SIG{TERM} = sub { 2673$SIG{INT} = $SIG{TERM} = sub {
2456 EV::unloop; 2674 EV::unloop;
2457 #d# TODO calling exit here hangs the process in some futex 2675 #d# TODO calling exit here hangs the process in some futex
2458}; 2676};
2459 2677
2460{ 2678# due to mac os x + sdl combined braindamage, we need this contortion
2679sub main {
2680 {
2461 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2681 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2462 2682
2463 if (-e "$Deliantra::VARDIR/client.cf") { 2683 if (-e "$Deliantra::VARDIR/client.cf") {
2464 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2684 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2465 } else { 2685 } else {
2466 #TODO: compatibility cruft 2686 #TODO: compatibility cruft
2467 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2687 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2468 print STDERR "INFO: used old configuration file\n"; 2688 print STDERR "INFO: used old configuration file\n";
2469 } 2689 }
2470 2690
2471 DC::DB::Server::run; 2691 DC::DB::Server::run;
2472 2692
2473 if ($CFG->{db_schema} < 1) { 2693 if ($CFG->{db_schema} < 1) {
2474 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2694 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2475 DC::DB::nuke_db; 2695 DC::DB::nuke_db;
2476 $CFG->{db_schema} = 1; 2696 $CFG->{db_schema} = 1;
2477 DC::write_cfg; 2697 DC::write_cfg;
2478 } 2698 }
2479 2699
2480 DC::DB::open_db; 2700 DC::DB::open_db;
2481 2701
2482 DC::UI::set_layout ($::CFG->{layout}); 2702 DC::UI::set_layout ($::CFG->{layout});
2483 2703
2484 my %DEF_CFG = ( 2704 my %DEF_CFG = (
2705 config_autosave => 1,
2485 sdl_mode => 0, 2706 sdl_mode => undef,
2486 fullscreen => 1, 2707 fullscreen => 1,
2487 fast => 0, 2708 fast => 0,
2488 force_opengl11 => undef, 2709 force_opengl11 => undef,
2710 disable_alpha => 0,
2711 smooth_movement => 1,
2489 texture_compression => 1, 2712 texture_compression => 1,
2490 map_scale => 1, 2713 map_scale => 1,
2491 fow_enable => 1, 2714 fow_enable => 1,
2492 fow_intensity => 0, 2715 fow_intensity => 0,
2493 map_smoothing => 1, 2716 map_smoothing => 1,
2494 gui_fontsize => 1, 2717 gui_fontsize => 1,
2495 log_fontsize => 0.7, 2718 log_fontsize => 0.7,
2496 gauge_fontsize => 1, 2719 gauge_fontsize => 1,
2497 gauge_size => 0.35, 2720 gauge_size => 0.35,
2498 stat_fontsize => 0.7, 2721 stat_fontsize => 0.7,
2499 mapsize => 100, 2722 mapsize => 100,
2500 audio_enable => 1, 2723 audio_enable => 1,
2501 audio_hw_channels => 0, 2724 audio_hw_channels => 0,
2502 audio_hw_frequency => 0, 2725 audio_hw_frequency => 0,
2503 audio_hw_chunksize => 0, 2726 audio_hw_chunksize => 0,
2504 audio_mix_channels => 8, 2727 audio_mix_channels => 8,
2505 effects_enable => 1, 2728 effects_enable => 1,
2506 effects_volume => 1, 2729 effects_volume => 1,
2507 bgm_enable => 1, 2730 bgm_enable => 1,
2508 bgm_volume => 0.5, 2731 bgm_volume => 0.5,
2509 output_rate => "", 2732 output_rate => "",
2510 pickup => 0, 2733 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2511 inv_sort => "mtime", 2734 inv_sort => "mtime",
2512 default => "profile", # default profile 2735 default => "profile", # default profile
2513 show_tips => 1, 2736 show_tips => 1,
2514 logview_max_par => 1000, 2737 logview_max_par => 1000,
2515 shift_fire_stop => 0, 2738 shift_fire_stop => 0,
2739 uitheme => "wood",
2740 map_shift_x => -24, # arbitrary
2741 map_shift_y => +24, # arbitrary
2516 ); 2742 );
2517 2743
2518 while (my ($k, $v) = each %DEF_CFG) { 2744 while (my ($k, $v) = each %DEF_CFG) {
2519 $CFG->{$k} = $v unless exists $CFG->{$k}; 2745 $CFG->{$k} = $v unless exists $CFG->{$k};
2520 } 2746 }
2521 2747
2522 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2748 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2523 $PROFILE = $CFG->{profile}{default}; 2749 $PROFILE = $CFG->{profile}{default};
2524 2750
2525 # convert old bindings (only default profile matters) 2751 # convert old bindings (only default profile matters)
2526 if (my $bindings = delete $PROFILE->{bindings}) { 2752 if (my $bindings = delete $PROFILE->{bindings}) {
2527 while (my ($mod, $syms) = each %$bindings) { 2753 while (my ($mod, $syms) = each %$bindings) {
2528 while (my ($sym, $cmds) = each %$syms) { 2754 while (my ($sym, $cmds) = each %$syms) {
2529 push @{ $PROFILE->{macro} }, { 2755 push @{ $PROFILE->{macro} }, {
2530 accelkey => [$mod*1, $sym*1], 2756 accelkey => [$mod*1, $sym*1],
2531 action => $cmds, 2757 action => $cmds,
2758 };
2532 }; 2759 }
2533 } 2760 }
2534 } 2761 }
2535 }
2536 2762
2537 sdl_init; 2763 sdl_init;
2538 2764
2539 @SDL_MODES = DC::SDL_ListModes 8, 8; 2765 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2540 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2766 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2541 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2542 2767
2543 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2768 {
2544
2545 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2546
2547 {
2548 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2769 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2549 DejaVuSans.ttf 2770 DejaVuSans.ttf
2550 DejaVuSansMono.ttf 2771 DejaVuSansMono.ttf
2551 DejaVuSans-Bold.ttf 2772 DejaVuSans-Bold.ttf
2552 DejaVuSansMono-Bold.ttf 2773 DejaVuSansMono-Bold.ttf
2553 DejaVuSans-Oblique.ttf 2774 DejaVuSans-Oblique.ttf
2554 DejaVuSansMono-Oblique.ttf 2775 DejaVuSansMono-Oblique.ttf
2555 DejaVuSans-BoldOblique.ttf 2776 DejaVuSans-BoldOblique.ttf
2556 DejaVuSansMono-BoldOblique.ttf 2777 DejaVuSansMono-BoldOblique.ttf
2778 mona.ttf
2557 ); 2779 );
2558 2780
2559 DC::add_font $_ for @fonts; 2781 DC::add_font $_ for @fonts;
2560 2782
2561 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2783 $FONT_PROP = new_from_file DC::Font $fonts[0];
2562 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2784 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2563 2785
2564 $FONT_PROP->make_default; 2786 $FONT_PROP->make_default;
2565 2787
2566 DC::pango_init; 2788 DC::pango_init;
2567 } 2789 }
2568 2790
2569# compare mono (ft) vs. rgba (cairo) 2791# compare mono (ft) vs. rgba (cairo)
2570# ft - 1.8s, cairo 3s, even in alpha-only mode 2792# ft - 1.8s, cairo 3s, even in alpha-only mode
2571# for my $rgba (0..1) { 2793# for my $rgba (0..1) {
2572# my $t1 = Time::HiRes::time; 2794# my $t1 = Time::HiRes::time;
… …
2577# } 2799# }
2578# my $t2 = Time::HiRes::time; 2800# my $t2 = Time::HiRes::time;
2579# warn $t2-$t1; 2801# warn $t2-$t1;
2580# } 2802# }
2581 2803
2582 video_init; 2804 video_init;
2583 audio_init; 2805 audio_init;
2584} 2806 }
2585 2807
2586show_tip_of_the_day if $CFG->{show_tips}; 2808 show_tip_of_the_day if $CFG->{show_tips};
2587 2809
2588our $STARTUP_CANCEL = EV::idle sub { 2810 our $STARTUP_CANCEL = EV::idle sub {
2589 undef $::STARTUP_CANCEL; 2811 undef $::STARTUP_CANCEL;
2590 $startup_done->(); 2812 $startup_done->();
2591}; 2813 };
2592 2814
2593delete $SIG{__DIE__}; 2815 delete $SIG{__DIE__};
2594EV::loop; 2816 EV::loop;
2595 2817
2818 DC::write_cfg if $CFG->{config_autosave};
2819
2596#video_shutdown; 2820 #video_shutdown;
2597#audio_shutdown; 2821 #audio_shutdown;
2822
2598DC::OpenGL::quit; 2823 DC::OpenGL::quit;
2599DC::SDL_Quit; 2824 DC::SDL_Quit;
2600DC::DB::Server::stop; 2825 DC::DB::Server::stop;
2826}
2827
2828DC::SDL_braino; # see sub above
2601 2829
2602=head1 NAME 2830=head1 NAME
2603 2831
2604deliantra - A Deliantra MORPG game client 2832deliantra - A Deliantra MORPG game client
2605 2833
… …
2622 4 show fps 2850 4 show fps
2623 8 suppress tooltips 2851 8 suppress tooltips
2624 2852
2625=head1 AUTHOR 2853=head1 AUTHOR
2626 2854
2627Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2855Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2628 2856
2629 2857
2630 2858

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines