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.38 by root, Mon May 5 16:26:11 2008 UTC vs.
Revision 1.96 by root, Mon Jul 27 23:08:41 2009 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 {
… …
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } else { 59 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 60 # 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"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 63 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 64 }
75 65
76 unshift @INC, $root; 66 unshift @INC, $root;
77 } 67 }
78} 68}
79 69
80# prepend private library directory 70# prepend private library directory and prepare env
81BEGIN { 71BEGIN {
82 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 74 if (-d $path) {
85 unshift @INC, $path; 75 unshift @INC, $path;
… …
90 80
91# 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
92unshift @INC, $ENV{PAR_TEMP} 82unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 83 if %PAR::LibCache;
94 84
95use Time::HiRes 'time';
96use EV; 85use EV;
86BEGIN { *time = \&EV::time }
87
97use List::Util qw(max min); 88use List::Util qw(max min);
98 89
99use Deliantra; 90use Deliantra;
100use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
101 92
93use AnyEvent::Util ();
94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
96
102use Compress::LZF; 97use Compress::LZF;
98use JSON::XS;
103 99
104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 100use DC;
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
105use DC::OpenGL (); 114use DC::OpenGL ();
106use DC::Protocol; 115use DC::Protocol;
107use DC::DB; 116use DC::DB;
108use DC::UI; 117use DC::UI;
109use DC::UI::Canvas; 118use DC::UI::Canvas;
110use DC::UI::Inventory; 119use DC::UI::Inventory;
111use DC::UI::SpellList; 120use DC::UI::SpellList;
112use DC::UI::Dockable; 121use DC::UI::Dockable;
113use DC::UI::Dockbar; 122use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 123use DC::UI::ChatView;
116use DC::MessageDistributor; 124use DC::MessageDistributor;
117use DC::Pod; 125use DC::Pod;
118use DC::MapWidget; 126use DC::MapWidget;
119use DC::Macro; 127use DC::Macro;
120 128
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
123 131
124$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
125 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
126}; 135};
127 136
128my $MAX_FPS = 60; 137my $MAX_FPS = 60;
129 138
… …
131 140
132our $LAST_REFRESH; 141our $LAST_REFRESH;
133our $NOW; 142our $NOW;
134 143
135our $CFG; 144our $CFG;
136our $CONN;
137our $PROFILE; # current profile 145our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 146our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 147
140our $WANT_REFRESH; 148our $WANT_REFRESH;
141 149
150our $MODE_SLIDER;
151our $CAVEAT_LABEL;
152
142our @SDL_MODES; 153our @SDL_MODES;
154our $SDL_REINIT = 1;
143our $WIDTH; 155our $WIDTH;
144our $HEIGHT; 156our $HEIGHT;
145our $FULLSCREEN; 157our $FULLSCREEN;
146our $FONTSIZE; 158our $FONTSIZE;
147 159
148our $FONT_PROP; 160our $FONT_PROP;
149our $FONT_FIXED; 161our $FONT_FIXED;
150 162
163our $CONN;
164
151our $MAP; 165our $MAP;
152our $MAPMAP; 166our $MAPMAP;
153our $MAPWIDGET; 167our $MAPWIDGET;
154our $COMPLETER; 168our $COMPLETER;
155our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
156our $METASERVER; 173our $METASERVER;
157our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
158our $QUIT_DIALOG; 175our $QUIT_DIALOG;
159our $HOST_ENTRY; 176our $HOST_ENTRY;
160our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
186our $FLOORBOX; 203our $FLOORBOX;
187our $GAUGES; 204our $GAUGES;
188our $STATWIDS; 205our $STATWIDS;
189 206
190our $SDL_ACTIVE; 207our $SDL_ACTIVE;
191our %SDL_CB; 208our @SDL_CB;
192 209
193our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 211our $STATUSBOX;
195our $MODBOX; 212our $MODBOX;
196our $DEBUG_STATUS; 213our $DEBUG_STATUS;
197 214
198our $INV; 215our $INV;
199our $INVR; 216our $INVR;
200our $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}
201 258
202############################################################################# 259#############################################################################
203 260
204sub status { 261sub status {
205 $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]);
… …
287 or return; 344 or return;
288 345
289 $meta->{data} 346 $meta->{data}
290 or return; 347 or return;
291 348
292 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
293 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
294 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
295 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
296 &audio_music_push ($face); 353 &audio_music_push ($face);
297 } 354 }
298 } else { 355 } else {
299 # fetch from database 356 # fetch from database
300 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
301 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
302 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
303 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;
304 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
305 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
306 363
307 audio_sound_push ($face); 364 audio_sound_push ($face);
308 }; 365 };
… …
355 412
356 audio_music_update_volume; 413 audio_music_update_volume;
357 414
358 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
359 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
360 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
361 ? 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
362 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
363 423
364 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
365 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
366 426
367 my $NOW = time; 427 my $NOW = time;
368 428
369 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
370 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
488 $MUSIC_WANT = []; 548 $MUSIC_WANT = [];
489 @MUSIC_JINGLE = (); 549 @MUSIC_JINGLE = ();
490 %AUDIO_PLAY = (); 550 %AUDIO_PLAY = ();
491 %AUDIO_CHUNK = (); 551 %AUDIO_CHUNK = ();
492 552
553 DC::MixMusic::halt;
554 DC::Mix_AllocateChannels 0;
493 DC::Mix_CloseAudio if $SDL_MIXER; 555 DC::Mix_CloseAudio if $SDL_MIXER;
494 undef $SDL_MIXER; 556 undef $SDL_MIXER;
495} 557}
496 558
497############################################################################# 559#############################################################################
… …
725 787
726 $vbox->add (@dialog); 788 $vbox->add (@dialog);
727 $dialog->show; 789 $dialog->show;
728} 790}
729 791
730sub start_game { 792sub dc_connect {
731 status "logging in..."; 793 my ($host, $port) = @_;
732 794
733 $LOGIN_BUTTON->set_text ("Logout");
734 $SETUP_DIALOG->hide;
735
736 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 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;
737 797
738 my ($host, $port) = split /:/, $PROFILE->{host};
739
740 $MAP = new DC::Map;
741
742 $CONN = eval { 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,
… …
757 query => \&server_query, 813 query => \&server_query,
758 814
759 setup_req => { 815 setup_req => {
760 smoothing => $CFG->{map_smoothing}*1, 816 smoothing => $CFG->{map_smoothing}*1,
761 }, 817 },
762 };
763 818
764 if ($CONN) { 819 on_connect => sub {
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";
824 } else {
825 undef $CONN;
826 status "unable to connect: $!";
827 stop_game();
828 }
829 },
830 ;
831}
832
833sub start_game {
834 status "logging in...";
835
836 $LOGIN_BUTTON->set_text ("Logout");
837 $SETUP_DIALOG->hide;
838
839 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
840
841 $MAP = new DC::Map;
842
843 # hack to make SURE we find the IP address all right
844 # can be removed once AnyEvent::DNS is proven stable.
845 if ($host eq "gameserver.deliantra.net") {
846 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
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) {
851 status "dns failure, using hardcoded address";
852 $host = "129.13.162.95";
853 }
854 }
855
856 dc_connect $host, $port;
857 };
768 } else { 858 } else {
769 warn $@; 859 dc_connect $host, $port;
770 status "unable to connect";
771 stop_game();
772 } 860 }
773} 861}
774 862
775sub stop_game { 863sub stop_game {
864 crash "stop_game";
865
776 $LOGIN_BUTTON->set_text ("Login / Register"); 866 $LOGIN_BUTTON->set_text ("Login / Register");
777 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 867 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
778 $SETUP_DIALOG->show; 868 $SETUP_DIALOG->show;
779 $PL_WINDOW->hide; 869 $PL_WINDOW->hide;
780 $SPELL_LIST->clear_spells; 870 $SPELL_LIST->clear_spells;
… …
794} 884}
795 885
796sub graphics_setup { 886sub graphics_setup {
797 my $vbox = new DC::UI::VBox; 887 my $vbox = new DC::UI::VBox;
798 888
889 {
890 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
891
799 $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]);
800 893
801 my $row = 0; 894 my $row = 0;
802 895
803 $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");
804 $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,
805 can_events => 1, 898 can_events => 1,
806 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 899 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
807 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
808 my $vidmode_tooltip = 922 my $vidmode_tooltip =
809 "<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). "
810 . "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>.";
811 925
812 $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");
813 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 927 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
814 928
815 $hbox->add (my $mode_slider = new DC::UI::Slider 929 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
816 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 930 c_rescale => 1,
931 force_w => $WIDTH * 0.1, expand => 1,
932 range => [ ($CFG->{sdl_mode}) x 3 ],
817 tooltip => $vidmode_tooltip); 933 tooltip => $vidmode_tooltip);
818 $hbox->add (my $mode_label = new DC::UI::Label 934 $hbox->add (my $mode_label = new DC::UI::Label
819 height => 0.8, template => "9999x9999@9+9", 935 height => 0.8, template => "9999x9999@9+9",
820 can_events => 1, tooltip => $vidmode_tooltip); 936 can_events => 1, tooltip => $vidmode_tooltip);
821 937
822 $mode_slider->connect (changed => sub { 938 $MODE_SLIDER->connect (changed => sub {
823 my ($self, $value) = @_; 939 my ($self, $value) = @_;
824 940
825 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 941 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
826 $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]});
827 }); 943 });
828 $mode_slider->emit (changed => $mode_slider->{range}[0]); 944 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
829 945
830 $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");
831 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 947 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
832 state => $CFG->{fullscreen}, 948 state => $CFG->{fullscreen},
833 tooltip => "Bring the client into fullscreen mode.", 949 tooltip => "Bring the client into fullscreen mode.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 950 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
835 ); 951 );
836 952
837 $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");
838 $table->add_at (1, $row++, new DC::UI::CheckBox 954 $table->add_at (1, $row++, new DC::UI::CheckBox
839 state => $CFG->{force_opengl11}, 955 state => $CFG->{force_opengl11},
840 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 "
841 . "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 "
842 . "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. "
843 . "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, "
844 . "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. "
845 . "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>",
846 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 962 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
847 ); 963 );
848 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
849 $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");
850 $table->add_at (1, $row++, new DC::UI::CheckBox 983 $table->add_at (1, $row++, new DC::UI::CheckBox
851 state => $CFG->{texture_compression}, 984 state => $CFG->{texture_compression},
852 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 "
853 . "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). "
854 . "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 "
855 . "forced OpenGL 1.1 mode.", 988 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
856 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 989 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
857 ); 990 );
858 991
859 $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");
860 $table->add_at (1, $row++, new DC::UI::CheckBox 993 $table->add_at (1, $row++, new DC::UI::CheckBox
861 state => $CFG->{fast}, 994 state => $CFG->{fast},
862 tooltip => "Lower the visual quality considerably to speed up rendering.", 995 tooltip => "Lower the visual quality considerably to speed up rendering.",
863 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
864 ); 997 );
865 998
866 $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");
867 $table->add_at (1, $row++, new DC::UI::Slider 1000 $table->add_at (1, $row++, new DC::UI::Slider
868 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1001 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
869 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1002 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
870 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1003 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
871 ); 1004 );
872 1005
873 $table->add_at (1, $row++, new DC::UI::Button 1006 $table->add_at (1, $row++, new DC::UI::Button
874 expand => 1, text => "Apply", 1007 expand => 1, text => "Apply",
875 tooltip => "Apply the video settings above.", 1008 tooltip => "Apply the video settings above.",
876 on_activate => sub { 1009 on_activate => sub {
877 video_shutdown (); 1010 video_shutdown ();
878 video_init (); 1011 video_init ();
1012 0
879 0 1013 }
880 } 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 }
881 ); 1030 );
882 1031
883 $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");
884 $table->add_at (1, $row++, new DC::UI::Slider 1033 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1034 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
886 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1035 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
887 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 }
888 ); 1037 );
889 1038
890 $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");
891 $table->add_at (1, $row++, new DC::UI::CheckBox 1040 $table->add_at (1, $row++, new DC::UI::CheckBox
892 state => $CFG->{map_smoothing}, 1041 state => $CFG->{map_smoothing},
893 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. "
894 . "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. "
895 . "Changes take effect at next login only.", 1044 . "Changes take effect at next login only.",
896 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1045 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
897 ); 1046 );
898 1047
899 $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");
900 $table->add_at (1, $row++, new DC::UI::CheckBox 1049 $table->add_at (1, $row++, new DC::UI::CheckBox
901 state => $CFG->{fow_enable}, 1050 state => $CFG->{fow_enable},
902 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.",
903 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
904 ); 1053 );
905 1054
906 $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");
907 $table->add_at (1, $row++, new DC::UI::Slider 1056 $table->add_at (1, $row++, new DC::UI::Slider
908 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1057 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
909 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1058 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1059 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
911 ); 1060 );
912 1061
913 $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");
914 $table->add_at (1, $row++, new DC::UI::Slider 1063 $table->add_at (1, $row++, new DC::UI::Slider
915 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1064 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
916 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1065 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
917 . "but you still need to press apply to correctly re-layout the widget.", 1066 . "but you still need to press apply to correctly re-layout the widget.",
918 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1067 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
919 ); 1068 );
920 1069
921 $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");
922 $table->add_at (1, $row++, new DC::UI::Slider 1071 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1072 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1073 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
925 on_changed => sub { 1074 on_changed => sub {
926 $CFG->{gauge_fontsize} = $_[1]; 1075 $CFG->{gauge_fontsize} = $_[1];
927 &set_gauge_window_fontsize; 1076 &set_gauge_window_fontsize;
1077 0
928 0 1078 }
929 } 1079 );
930 );
931 1080
932 $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");
933 $table->add_at (1, $row++, new DC::UI::Slider 1082 $table->add_at (1, $row++, new DC::UI::Slider
934 range => [$CFG->{gauge_size}, 0.2, 0.8], 1083 range => [$CFG->{gauge_size}, 0.2, 0.8],
935 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.",
936 on_changed => sub { 1085 on_changed => sub {
937 $CFG->{gauge_size} = $_[1]; 1086 $CFG->{gauge_size} = $_[1];
938 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1087 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1088 0
939 0 1089 }
940 } 1090 );
941 ); 1091 }
942 1092
943 $vbox 1093 $vbox
944} 1094}
945 1095
946our $AUDIO_HW_CHUNKSIZE; 1096our $AUDIO_HW_CHUNKSIZE;
… …
1109} 1259}
1110 1260
1111sub make_gauge_window { 1261sub make_gauge_window {
1112 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1262 my $gh = int $HEIGHT * $CFG->{gauge_size};
1113 1263
1114 my $win = new DC::UI::Frame ( 1264 $GAUGES->{win} = my $win = new DC::UI::Frame (
1115 force_x => 0, 1265 force_x => 0,
1116 force_y => "max", 1266 force_y => "max",
1117 force_w => $WIDTH, 1267 force_w => $WIDTH,
1118 force_h => $gh, 1268 force_h => $gh,
1119 ); 1269 );
… …
1135 (new DC::UI::Empty expand => 1), 1285 (new DC::UI::Empty expand => 1),
1136 (my $hb = new DC::UI::HBox), 1286 (my $hb = new DC::UI::HBox),
1137 ], 1287 ],
1138 ); 1288 );
1139 1289
1140 $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");
1141 $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");
1142 $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");
1143 $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");
1144
1145 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1146 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1147 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1148 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1149
1150 $GAUGES = {
1151 exp => $exp, prg => $prg, sklprg => $sklprg,
1152 win => $win, range => $rng,
1153 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1154 };
1155 1294
1156 &set_gauge_window_fontsize; 1295 &set_gauge_window_fontsize;
1157 1296
1158 $win 1297 $win
1159} 1298}
… …
1501 ); 1640 );
1502 1641
1503 $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");
1504 $table->add_at (1, 4, new DC::UI::Entry 1643 $table->add_at (1, 4, new DC::UI::Entry
1505 text => $CFG->{profile}{default}{user}, 1644 text => $CFG->{profile}{default}{user},
1506 tooltip => "The name of your character on the server.", 1645 tooltip => "The name of your character on the server. The name is case-sensitive!",
1507 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1646 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1508 ); 1647 );
1509 1648
1510 $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");
1511 $table->add_at (1, 5, new DC::UI::Entry 1650 $table->add_at (1, 5, new DC::UI::Entry
… …
1525 1 1664 1
1526 }, 1665 },
1527 ); 1666 );
1528 1667
1529 $vbox->add (new DC::UI::FancyFrame 1668 $vbox->add (new DC::UI::FancyFrame
1530 label => "Registering", 1669 label => "How to Play",
1531 min_h => 200, 1670 min_h => 240,
1532 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1671 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1533 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). "
1534 "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 "
1535 . "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.",
1536 ), 1677 ),
1537 ); 1678 );
1538 1679
1539 $vbox 1680 $vbox
… …
1611 1752
1612 my $row = 0; 1753 my $row = 0;
1613 1754
1614 $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");
1615 $table->add_at (1, $row++, new DC::UI::CheckBox 1756 $table->add_at (1, $row++, new DC::UI::CheckBox
1757 c_colspan => 2,
1616 state => $CFG->{show_tips}, 1758 state => $CFG->{show_tips},
1617 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?",
1618 on_changed => sub { 1760 on_changed => sub {
1619 my ($self, $value) = @_; 1761 my ($self, $value) = @_;
1620 $CFG->{show_tips} = $value; 1762 $CFG->{show_tips} = $value;
… …
1622 } 1764 }
1623 ); 1765 );
1624 1766
1625 $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");
1626 $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,
1627 text => $CFG->{logview_max_par}, 1770 text => $CFG->{logview_max_par},
1628 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 "
1629 . "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 "
1630 . "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.",
1631 on_changed => sub { 1774 on_changed => sub {
… …
1633 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1776 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1634 0 1777 0
1635 }, 1778 },
1636 ); 1779 );
1637 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
1638 $table 1803 $table
1639} 1804}
1640 1805
1641sub autopickup_setup { 1806sub autopickup_setup {
1642 my $r = new DC::UI::ScrolledWindow ( 1807 my $r = new DC::UI::ScrolledWindow (
… …
1648 col_expand => [0, 1, 0, 1], 1813 col_expand => [0, 1, 0, 1],
1649 ); 1814 );
1650 1815
1651 for ( 1816 for (
1652 ["General", 0, 0, 1817 ["General", 0, 0,
1653 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1654 ["Inhibit autopickup" => PICKUP_INHIBIT], 1818# ["Inhibit autopickup" => PICKUP_INHIBIT],
1655 ["Stop before pickup" => PICKUP_STOP], 1819 ["Stop before pickup" => PICKUP_STOP],
1656 ["Debug autopickup" => PICKUP_DEBUG], 1820 ["Debug autopickup" => PICKUP_DEBUG],
1657 ], 1821 ],
1658 ["Weapons", 0, 6, 1822 ["Weapons", 0, 6,
1659 ["All weapons" => PICKUP_ALLWEAPON], 1823 ["All weapons" => PICKUP_ALLWEAPON],
… …
1685 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1849 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1686 ["Ignore cursed" => PICKUP_NOT_CURSED], 1850 ["Ignore cursed" => PICKUP_NOT_CURSED],
1687 ["Jewelery" => PICKUP_JEWELS], 1851 ["Jewelery" => PICKUP_JEWELS],
1688 ["Flesh" => PICKUP_FLESH], 1852 ["Flesh" => PICKUP_FLESH],
1689 ], 1853 ],
1690 ["Weight/Value ratio", 2, 17] 1854 ["Value/Weight ratio", 2, 17]
1691 ) 1855 )
1692 { 1856 {
1693 my ($title, $x, $y, @bits) = @$_; 1857 my ($title, $x, $y, @bits) = @$_;
1694 $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]);
1695 1859
… …
1707 $::CFG->{pickup} |= $mask; 1871 $::CFG->{pickup} |= $mask;
1708 } else { 1872 } else {
1709 $::CFG->{pickup} &= ~$mask; 1873 $::CFG->{pickup} &= ~$mask;
1710 } 1874 }
1711 1875
1712 $::CONN->send_command ("pickup $::CFG->{pickup}") 1876 $::CONN->send_pickup ($::CFG->{pickup})
1713 if defined $::CONN; 1877 if defined $::CONN;
1714 1878
1715 0 1879 0
1716 }); 1880 });
1717 1881
… …
1720 } 1884 }
1721 1885
1722 $table->add_at (2, 18, new DC::UI::ValSlider 1886 $table->add_at (2, 18, new DC::UI::ValSlider
1723 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1887 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1724 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).",
1725 to_value => sub { ">= " . 5 * $_[0] }, 1890 to_value => sub { ">= " . 5 * $_[0] },
1726 on_changed => sub { 1891 on_changed => sub {
1727 my ($slider, $value) = @_; 1892 my ($slider, $value) = @_;
1728 1893
1729 $::CFG->{pickup} &= ~0xF; 1894 $::CFG->{pickup} &= ~0xF;
… …
1733 }); 1898 });
1734 1899
1735 $table->add_at (3, 18, new DC::UI::Button 1900 $table->add_at (3, 18, new DC::UI::Button
1736 text => "set", 1901 text => "set",
1737 on_activate => sub { 1902 on_activate => sub {
1738 $::CONN->send_command ("pickup $::CFG->{pickup}") 1903 $::CONN->send_pickup ($::CFG->{pickup})
1739 if defined $::CONN; 1904 if defined $::CONN;
1740 0 1905 0
1741 }); 1906 });
1742 1907
1743 $r 1908 $r
1744} 1909}
1745 1910
1746my %SORT_ORDER = ( 1911my %SORT_ORDER = (
1747 type => undef, 1912 type => sub {
1913 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1914 },
1748 mtime => sub { 1915 mtime => sub {
1749 my $NOW = time; 1916 my $NOW = time;
1750 sort { 1917 sort {
1751 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1918 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1752 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1919 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1783 $::CFG->{inv_sort} = $_[1]; 1950 $::CFG->{inv_sort} = $_[1];
1784 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1951 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1785 }, 1952 },
1786 ); 1953 );
1787 $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);
1788 #TODO# update to weigh/maxweight 1955 #TODO# update to weight/maxweight
1789 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1956 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1790 1957
1791 $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);
1792 $sw1->add ($INV = new DC::UI::Inventory); 1959 $sw1->add ($INV = new DC::UI::Inventory);
1793 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1960 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1854 $PL_NOTEBOOK->set_current_page ($widget); 2021 $PL_NOTEBOOK->set_current_page ($widget);
1855 $PL_WINDOW->show; 2022 $PL_WINDOW->show;
1856 } 2023 }
1857} 2024}
1858 2025
1859sub player_window { 2026sub make_playerbook {
1860 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2027 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1861 x => "center", 2028 x => "center",
1862 y => "center", 2029 y => "center",
1863 force_w => $WIDTH * 9/10, 2030 force_w => $WIDTH * 9/10,
1864 force_h => $HEIGHT * 9/10, 2031 force_h => $HEIGHT * 9/10,
… …
1898 "License, Author and Source info for media sent by the server."); 2065 "License, Author and Source info for media sent by the server.");
1899 2066
1900 $ntb->set_current_page ($INVENTORY_PAGE); 2067 $ntb->set_current_page ($INVENTORY_PAGE);
1901 2068
1902 $plwin->add ($ntb); 2069 $plwin->add ($ntb);
1903 $plwin
1904} 2070}
1905 2071
1906sub keyboard_setup { 2072sub keyboard_setup {
1907 DC::Macro::keyboard_setup 2073 DC::Macro::keyboard_setup
1908} 2074}
1909 2075
1910sub help_window { 2076sub make_help_window {
1911 my $win = new DC::UI::Toplevel 2077 my $win = new DC::UI::Toplevel
1912 x => 'center', 2078 x => 'center',
1913 y => 'center', 2079 y => 'center',
1914 z => 4, 2080 z => 4,
1915 name => 'doc_browser', 2081 name => 'doc_browser',
… …
2004 2170
2005 $load_node->((DC::Pod::find @path)[0]); 2171 $load_node->((DC::Pod::find @path)[0]);
2006 $win->show; 2172 $win->show;
2007 }; 2173 };
2008 2174
2009 $win 2175 $HELP_WINDOW = $win;
2010}
2011
2012sub open_string_query {
2013 my ($title, $cb, $txt, $tooltip) = @_;
2014 my $dialog = new DC::UI::Toplevel
2015 x => "center",
2016 y => "center",
2017 z => 50,
2018 force_w => $WIDTH * 4/5,
2019 title => $title;
2020
2021 $dialog->add (
2022 my $e = new DC::UI::Entry
2023 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2024 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2025 tooltip => $tooltip
2026 );
2027
2028 $e->grab_focus;
2029 $e->set_text ($txt) if $txt;
2030 $dialog->show;
2031} 2176}
2032 2177
2033sub open_quit_dialog { 2178sub open_quit_dialog {
2034 unless ($QUIT_DIALOG) { 2179 unless ($QUIT_DIALOG) {
2035 $QUIT_DIALOG = new DC::UI::Toplevel 2180 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2057 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2202 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2058 ); 2203 );
2059 $hb->add (new DC::UI::Button 2204 $hb->add (new DC::UI::Button
2060 text => "Quit anyway", 2205 text => "Quit anyway",
2061 expand => 1, 2206 expand => 1,
2062 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2207 on_activate => sub {
2208 crash "Quit anyway";
2209 EV::unloop EV::UNLOOP_ALL;
2210 },
2063 ); 2211 );
2064 } 2212 }
2065 2213
2066 $QUIT_DIALOG->show; 2214 $QUIT_DIALOG->show;
2067 $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;
2068} 2324}
2069 2325
2070sub show_tip_of_the_day { 2326sub show_tip_of_the_day {
2071 # find all tips 2327 # find all tips
2072 my @tod = DC::Pod::find tip_of_the_day => "*"; 2328 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2120 $dialog->show; 2376 $dialog->show;
2121 }; 2377 };
2122} 2378}
2123 2379
2124sub sdl_init { 2380sub sdl_init {
2125 DC::SDL_Init 2381 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2126 and die "SDL::Init failed!\n"; 2382 and die "SDL::Init failed!\n";
2127} 2383}
2128 2384
2129sub 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
2130 $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 }
2131 2408
2132 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2409 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2133 2410
2134 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2411 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2135 $FULLSCREEN = $CFG->{fullscreen}; 2412 $FULLSCREEN = $CFG->{fullscreen};
2136 $FAST = $CFG->{fast}; 2413 $FAST = $CFG->{fast};
2137 2414
2415 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2138 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
2139 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2418 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2140 2419
2141 $SDL_ACTIVE = 1; 2420 $SDL_ACTIVE = 1;
2142 $LAST_REFRESH = time - 0.01; 2421 $LAST_REFRESH = time - 0.01;
2143 2422
… …
2190 2469
2191 (new DC::UI::Frame 2470 (new DC::UI::Frame
2192 bg => [0, 0, 0, 0.4], 2471 bg => [0, 0, 0, 0.4],
2193 force_x => 0, 2472 force_x => 0,
2194 force_y => "max", 2473 force_y => "max",
2195 child => (my $LR = new DC::UI::VBox), 2474 child => (my $LL = new DC::UI::VBox),
2196 )->show; 2475 )->show;
2197 2476
2198 $LR->add ($STATUSBOX); 2477 $LL->add ($STATUSBOX);
2199 $LR->add ($MODBOX); 2478 $LL->add ($MODBOX);
2200 $LR->add (new DC::UI::Label 2479 $LL->add (new DC::UI::Label
2201 align => 0, 2480 align => 0,
2202 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2481 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2203 fontsize => 0.5, 2482 fontsize => 0.5,
2204 fg => [1, 1, 0, 0.7], 2483 fg => [1, 1, 0, 0.7],
2205 ); 2484 );
2206 2485
2207 DC::UI::Toplevel->new ( 2486 DC::UI::Toplevel->new (
2208 title => "Minimap", 2487 title => "Minimap",
2209 name => "mapmap", 2488 name => "mapmap",
2210 x => 0, 2489 x => 0,
2211 y => $FONTSIZE + 8, 2490 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2212 border_bg => [1, 1, 1, 192/255], 2491 border_bg => [1, 1, 1, 192/255],
2213 bg => [1, 1, 1, 0], 2492 bg => [1, 1, 1, 0],
2214 child => ($MAPMAP = new DC::MapWidget::MapMap 2493 child => ($MAPMAP = new DC::MapWidget::MapMap
2215 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.",
2216 ), 2495 ),
2217 )->show; 2496 )->show;
2218 2497
2219 $MAPWIDGET = new DC::MapWidget; 2498 $MAPWIDGET = new DC::MapWidget;
2220 $MAPWIDGET->connect (activate_console => sub { 2499 $MAPWIDGET->connect (activate_console => sub {
… …
2241 force_h => $::HEIGHT * 0.6, 2520 force_h => $::HEIGHT * 0.6,
2242 has_close_button => 1, 2521 has_close_button => 1,
2243 ; 2522 ;
2244 2523
2245 $METASERVER = metaserver_dialog; 2524 $METASERVER = metaserver_dialog;
2525 # the name is changed to not conflict with the older name as users could have hidden it
2246 $MESSAGE_WINDOW = new DC::UI::Dockbar (title => 'Messages'); 2526 $MESSAGE_WINDOW = new DC::UI::Dockbar
2527 name => "message_window2",
2528 title => 'Messages',
2529 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2530 force_w => $::WIDTH * 0.6,
2531 force_h => $::HEIGHT * 0.25,
2532 ;
2533
2247 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2534 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2248 2535
2249 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, 2536 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2250 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2537 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2251 2538
… …
2267 . "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 "
2268 . "binding editor closes"); 2555 . "binding editor closes");
2269 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2556 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2270 "Some debuggin' options. Do not ask."); 2557 "Some debuggin' options. Do not ask.");
2271 2558
2272 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2559 make_help_window;
2560 make_menubar;
2273 2561
2274 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2275 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2276
2277# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2278# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2279
2280 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
2281
2282 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2283 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2284
2285 $BUTTONBAR->add (new DC::UI::Button
2286 text => "Save Config",
2287 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2288 on_activate => sub {
2289 $::CFG->{layout} = DC::UI::get_layout;
2290 DC::write_cfg;
2291 status "Configuration Saved";
2292 0
2293 },
2294 );
2295
2296 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2297 tooltip => "View Documentation");
2298
2299 $BUTTONBAR->add (new DC::UI::Button
2300 text => "Quit",
2301 tooltip => "Terminates the program",
2302 on_activate => sub {
2303 if ($CONN) {
2304 open_quit_dialog;
2305 } else {
2306 EV::unloop EV::UNLOOP_ALL;
2307 }
2308 0
2309 },
2310 );
2311
2312 $BUTTONBAR->show;
2313 $SETUP_DIALOG->show; 2562 $SETUP_DIALOG->show;
2314 $MESSAGE_WINDOW->show; 2563 $MESSAGE_WINDOW->show;
2315 } 2564 }
2316 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
2317 $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]);
2318} 2574}
2319 2575
2320sub video_shutdown { 2576sub video_shutdown {
2321 DC::OpenGL::shutdown; 2577 DC::OpenGL::shutdown;
2578 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2322 2579
2323 undef $SDL_ACTIVE; 2580 undef $SDL_ACTIVE;
2324} 2581}
2325 2582
2326my %animate_object; 2583my %animate_object;
… …
2345my $want_refresh = EV::prepare_ns \&force_refresh; 2602my $want_refresh = EV::prepare_ns \&force_refresh;
2346 2603
2347my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2604my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2348 $NOW = EV::now; 2605 $NOW = EV::now;
2349 2606
2350 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2607 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2351 for DC::poll_events; 2608 for DC::poll_events;
2352 2609
2353 if (%animate_object) { 2610 if (%animate_object) {
2354 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2611 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2355 $WANT_REFRESH = 1; 2612 $WANT_REFRESH = 1;
… …
2367sub animation_stop { 2624sub animation_stop {
2368 my ($widget) = @_; 2625 my ($widget) = @_;
2369 delete $animate_object{$widget}; 2626 delete $animate_object{$widget};
2370} 2627}
2371 2628
2372%SDL_CB = (
2373 DC::SDL_QUIT => sub { 2629$SDL_CB[DC::SDL_QUIT] = sub {
2630 crash "SDL_QUIT";
2374 EV::unloop EV::UNLOOP_ALL; 2631 EV::unloop EV::UNLOOP_ALL;
2375 }, 2632};
2376 DC::SDL_VIDEORESIZE => sub { 2633$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2377 },
2378 DC::SDL_VIDEOEXPOSE => sub { 2634$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2379 DC::UI::full_refresh; 2635 DC::UI::full_refresh;
2380 }, 2636};
2381 DC::SDL_ACTIVEEVENT => sub { 2637$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2382# not useful, as APPACTIVE includes only iconified state, not unmapped 2638# not useful, as APPACTIVE includes only iconified state, not unmapped
2383# 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#
2384# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2640# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2385# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2641# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2386# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2642# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2387# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2643# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2388 }, 2644};
2389 DC::SDL_KEYDOWN => sub { 2645$SDL_CB[DC::SDL_KEYDOWN] = sub {
2390 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2646 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2391 # alt-enter 2647 # alt-enter
2648 video_shutdown;
2392 $FULLSCREEN_ENABLE->toggle; 2649 $FULLSCREEN_ENABLE->toggle;
2393 video_shutdown;
2394 video_init; 2650 video_init;
2395 } else { 2651 } else {
2396 &DC::UI::feed_sdl_key_down_event; 2652 &DC::UI::feed_sdl_key_down_event;
2397 } 2653 }
2398 update_modbox; 2654 update_modbox;
2399 }, 2655};
2400 DC::SDL_KEYUP => sub { 2656$SDL_CB[DC::SDL_KEYUP] = sub {
2401 &DC::UI::feed_sdl_key_up_event; 2657 &DC::UI::feed_sdl_key_up_event;
2402 update_modbox; 2658 update_modbox;
2403 }, 2659};
2404 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2660$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2405 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2661$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2406 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2662$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2407 DC::SDL_USEREVENT => sub { 2663$SDL_CB[DC::SDL_USEREVENT] = sub {
2408 if ($_[0]{code} == 1) { 2664 if ($_[0]{code} == 1) {
2409 audio_channel_finished $_[0]{data1}; 2665 audio_channel_finished $_[0]{data1};
2410 } elsif ($_[0]{code} == 0) { 2666 } elsif ($_[0]{code} == 0) {
2411 audio_music_finished; 2667 audio_music_finished;
2412 }
2413 }, 2668 }
2414); 2669};
2415 2670
2416############################################################################# 2671#############################################################################
2417 2672
2418$SIG{INT} = $SIG{TERM} = sub { 2673$SIG{INT} = $SIG{TERM} = sub {
2419 EV::unloop; 2674 EV::unloop;
2420 #d# TODO calling exit here hangs the process in some futex 2675 #d# TODO calling exit here hangs the process in some futex
2421}; 2676};
2422 2677
2423{ 2678# due to mac os x + sdl combined braindamage, we need this contortion
2679sub main {
2680 {
2424 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2681 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2425 2682
2426 if (-e "$Deliantra::VARDIR/client.cf") { 2683 if (-e "$Deliantra::VARDIR/client.cf") {
2427 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2684 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2428 } else { 2685 } else {
2429 #TODO: compatibility cruft 2686 #TODO: compatibility cruft
2430 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2687 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2431 print STDERR "INFO: used old configuration file\n"; 2688 print STDERR "INFO: used old configuration file\n";
2432 } 2689 }
2433 2690
2434 DC::DB::Server::run; 2691 DC::DB::Server::run;
2435 2692
2436 if ($CFG->{db_schema} < 1) { 2693 if ($CFG->{db_schema} < 1) {
2437 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";
2438 DC::DB::nuke_db; 2695 DC::DB::nuke_db;
2439 $CFG->{db_schema} = 1; 2696 $CFG->{db_schema} = 1;
2440 DC::write_cfg; 2697 DC::write_cfg;
2441 } 2698 }
2442 2699
2443 DC::DB::open_db; 2700 DC::DB::open_db;
2444 2701
2445 DC::UI::set_layout ($::CFG->{layout}); 2702 DC::UI::set_layout ($::CFG->{layout});
2446 2703
2447 my %DEF_CFG = ( 2704 my %DEF_CFG = (
2705 config_autosave => 1,
2448 sdl_mode => 0, 2706 sdl_mode => undef,
2449 fullscreen => 1, 2707 fullscreen => 1,
2450 fast => 0, 2708 fast => 0,
2451 force_opengl11 => undef, 2709 force_opengl11 => undef,
2710 disable_alpha => 0,
2711 smooth_movement => 1,
2452 texture_compression => 1, 2712 texture_compression => 1,
2453 map_scale => 1, 2713 map_scale => 1,
2454 fow_enable => 1, 2714 fow_enable => 1,
2455 fow_intensity => 0, 2715 fow_intensity => 0,
2456 map_smoothing => 1, 2716 map_smoothing => 1,
2457 gui_fontsize => 1, 2717 gui_fontsize => 1,
2458 log_fontsize => 0.7, 2718 log_fontsize => 0.7,
2459 gauge_fontsize => 1, 2719 gauge_fontsize => 1,
2460 gauge_size => 0.35, 2720 gauge_size => 0.35,
2461 stat_fontsize => 0.7, 2721 stat_fontsize => 0.7,
2462 mapsize => 100, 2722 mapsize => 100,
2463 audio_enable => 1, 2723 audio_enable => 1,
2464 audio_hw_channels => 0, 2724 audio_hw_channels => 0,
2465 audio_hw_frequency => 0, 2725 audio_hw_frequency => 0,
2466 audio_hw_chunksize => 0, 2726 audio_hw_chunksize => 0,
2467 audio_mix_channels => 8, 2727 audio_mix_channels => 8,
2468 effects_enable => 1, 2728 effects_enable => 1,
2469 effects_volume => 1, 2729 effects_volume => 1,
2470 bgm_enable => 1, 2730 bgm_enable => 1,
2471 bgm_volume => 0.5, 2731 bgm_volume => 0.5,
2472 output_rate => "", 2732 output_rate => "",
2473 pickup => 0, 2733 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2474 inv_sort => "mtime", 2734 inv_sort => "mtime",
2475 default => "profile", # default profile 2735 default => "profile", # default profile
2476 show_tips => 1, 2736 show_tips => 1,
2477 logview_max_par => 1000, 2737 logview_max_par => 1000,
2738 shift_fire_stop => 0,
2739 uitheme => "wood",
2740 map_shift_x => -24, # arbitrary
2741 map_shift_y => +24, # arbitrary
2478 ); 2742 );
2479 2743
2480 while (my ($k, $v) = each %DEF_CFG) { 2744 while (my ($k, $v) = each %DEF_CFG) {
2481 $CFG->{$k} = $v unless exists $CFG->{$k}; 2745 $CFG->{$k} = $v unless exists $CFG->{$k};
2482 } 2746 }
2483 2747
2484 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2748 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2485 $PROFILE = $CFG->{profile}{default}; 2749 $PROFILE = $CFG->{profile}{default};
2486 2750
2487 # convert old bindings (only default profile matters) 2751 # convert old bindings (only default profile matters)
2488 if (my $bindings = delete $PROFILE->{bindings}) { 2752 if (my $bindings = delete $PROFILE->{bindings}) {
2489 while (my ($mod, $syms) = each %$bindings) { 2753 while (my ($mod, $syms) = each %$bindings) {
2490 while (my ($sym, $cmds) = each %$syms) { 2754 while (my ($sym, $cmds) = each %$syms) {
2491 push @{ $PROFILE->{macro} }, { 2755 push @{ $PROFILE->{macro} }, {
2492 accelkey => [$mod*1, $sym*1], 2756 accelkey => [$mod*1, $sym*1],
2493 action => $cmds, 2757 action => $cmds,
2758 };
2494 }; 2759 }
2495 } 2760 }
2496 } 2761 }
2497 }
2498 2762
2499 sdl_init; 2763 sdl_init;
2500 2764
2501 @SDL_MODES = DC::SDL_ListModes 8, 8; 2765 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2502 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2766 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2503 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2504 2767
2505 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2768 {
2506
2507 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2508
2509 {
2510 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2769 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2511 DejaVuSans.ttf 2770 DejaVuSans.ttf
2512 DejaVuSansMono.ttf 2771 DejaVuSansMono.ttf
2513 DejaVuSans-Bold.ttf 2772 DejaVuSans-Bold.ttf
2514 DejaVuSansMono-Bold.ttf 2773 DejaVuSansMono-Bold.ttf
2515 DejaVuSans-Oblique.ttf 2774 DejaVuSans-Oblique.ttf
2516 DejaVuSansMono-Oblique.ttf 2775 DejaVuSansMono-Oblique.ttf
2517 DejaVuSans-BoldOblique.ttf 2776 DejaVuSans-BoldOblique.ttf
2518 DejaVuSansMono-BoldOblique.ttf 2777 DejaVuSansMono-BoldOblique.ttf
2778 mona.ttf
2519 ); 2779 );
2520 2780
2521 DC::add_font $_ for @fonts; 2781 DC::add_font $_ for @fonts;
2522 2782
2523 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2783 $FONT_PROP = new_from_file DC::Font $fonts[0];
2524 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2784 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2525 2785
2526 $FONT_PROP->make_default; 2786 $FONT_PROP->make_default;
2527 2787
2528 DC::pango_init; 2788 DC::pango_init;
2529 } 2789 }
2530 2790
2531# compare mono (ft) vs. rgba (cairo) 2791# compare mono (ft) vs. rgba (cairo)
2532# ft - 1.8s, cairo 3s, even in alpha-only mode 2792# ft - 1.8s, cairo 3s, even in alpha-only mode
2533# for my $rgba (0..1) { 2793# for my $rgba (0..1) {
2534# my $t1 = Time::HiRes::time; 2794# my $t1 = Time::HiRes::time;
… …
2539# } 2799# }
2540# my $t2 = Time::HiRes::time; 2800# my $t2 = Time::HiRes::time;
2541# warn $t2-$t1; 2801# warn $t2-$t1;
2542# } 2802# }
2543 2803
2544 video_init; 2804 video_init;
2545 audio_init; 2805 audio_init;
2546} 2806 }
2547 2807
2548show_tip_of_the_day if $CFG->{show_tips}; 2808 show_tip_of_the_day if $CFG->{show_tips};
2549 2809
2550our $STARTUP_CANCEL = EV::idle sub { 2810 our $STARTUP_CANCEL = EV::idle sub {
2551 undef $::STARTUP_CANCEL; 2811 undef $::STARTUP_CANCEL;
2552 $startup_done->(); 2812 $startup_done->();
2553}; 2813 };
2554 2814
2555delete $SIG{__DIE__}; 2815 delete $SIG{__DIE__};
2556EV::loop; 2816 EV::loop;
2557 2817
2818 DC::write_cfg if $CFG->{config_autosave};
2819
2558#video_shutdown; 2820 #video_shutdown;
2559#audio_shutdown; 2821 #audio_shutdown;
2822
2560DC::OpenGL::quit; 2823 DC::OpenGL::quit;
2561DC::SDL_Quit; 2824 DC::SDL_Quit;
2562DC::DB::Server::stop; 2825 DC::DB::Server::stop;
2826}
2827
2828DC::SDL_braino; # see sub above
2563 2829
2564=head1 NAME 2830=head1 NAME
2565 2831
2566deliantra - A Deliantra MORPG game client 2832deliantra - A Deliantra MORPG game client
2567 2833
… …
2584 4 show fps 2850 4 show fps
2585 8 suppress tooltips 2851 8 suppress tooltips
2586 2852
2587=head1 AUTHOR 2853=head1 AUTHOR
2588 2854
2589Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2855Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2590 2856
2591 2857
2592 2858

Diff Legend

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