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.28 by root, Thu Mar 20 22:28:35 2008 UTC vs.
Revision 1.97 by root, Thu Nov 26 07:19:12 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; 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;
212our $MODBOX;
195our $DEBUG_STATUS; 213our $DEBUG_STATUS;
196 214
197our $INV; 215our $INV;
198our $INVR; 216our $INVR;
199our $INVR_HB; 217our $INVR_HB;
200 218
201############################################################################# 219#############################################################################
202 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}
258
259#############################################################################
260
203sub status { 261sub status {
204 $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]);
205} 263}
206 264
207sub debug { 265sub debug {
208 $DEBUG_STATUS->set_text ($_[0]); 266 $DEBUG_STATUS->set_text ($_[0]);
209} 267}
210 268
211sub message { 269sub message {
212 $MESSAGE_DIST->message (@_); 270 $MESSAGE_DIST->message (@_);
271}
272
273sub update_modbox {
274 my $mod = DC::SDL_GetModState;
275
276 my $markup;
277
278 $markup .= $mod & DC::KMOD_CTRL
279 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
280 : "[<span foreground='#888'> once </span>]";
281
282 $markup .= $mod & DC::KMOD_SHIFT
283 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
284 : "[<span foreground='#888'>move</span>]";
285
286 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
287 ? "[ALT]"
288 : "[<span foreground='#888'>alt</span>]";
289
290 $markup .= $mod & DC::KMOD_NUM
291 ? "[NUM]"
292 : "[<span foreground='#888'>num</span>]";
293
294 # <tt> around next statement works around some bug that keeps the
295 # "font =>" from being used on windows
296 $MODBOX->set_markup ("<tt>$markup</tt>");
213} 297}
214 298
215############################################################################# 299#############################################################################
216#TODO: maybe move into own audio module... 300#TODO: maybe move into own audio module...
217 301
260 or return; 344 or return;
261 345
262 $meta->{data} 346 $meta->{data}
263 or return; 347 or return;
264 348
265 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
266 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
267 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
268 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
269 &audio_music_push ($face); 353 &audio_music_push ($face);
270 } 354 }
271 } else { 355 } else {
272 # fetch from database 356 # fetch from database
273 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
274 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
275 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
276 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;
277 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
278 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
279 363
280 audio_sound_push ($face); 364 audio_sound_push ($face);
281 }; 365 };
328 412
329 audio_music_update_volume; 413 audio_music_update_volume;
330 414
331 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
332 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
333 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
334 ? 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
335 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
336 423
337 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
338 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
339 426
340 my $NOW = time; 427 my $NOW = time;
341 428
342 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
343 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
461 $MUSIC_WANT = []; 548 $MUSIC_WANT = [];
462 @MUSIC_JINGLE = (); 549 @MUSIC_JINGLE = ();
463 %AUDIO_PLAY = (); 550 %AUDIO_PLAY = ();
464 %AUDIO_CHUNK = (); 551 %AUDIO_CHUNK = ();
465 552
553 DC::MixMusic::halt;
554 DC::Mix_AllocateChannels 0;
466 DC::Mix_CloseAudio if $SDL_MIXER; 555 DC::Mix_CloseAudio if $SDL_MIXER;
467 undef $SDL_MIXER; 556 undef $SDL_MIXER;
468} 557}
469 558
470############################################################################# 559#############################################################################
637 # right: accept 726 # right: accept
638 $table->add_at (4, 0, new DC::UI::Button 727 $table->add_at (4, 0, new DC::UI::Button
639 text => "Accept", 728 text => "Accept",
640 on_activate => sub { 729 on_activate => sub {
641 $conn->send ("reply n"); 730 $conn->send ("reply n");
642 $STATS_PAGE->hide;
643 destroy_query_dialog $conn; 731 destroy_query_dialog $conn;
644 0 732 0
645 }, 733 },
646 ); 734 );
647 735
699 787
700 $vbox->add (@dialog); 788 $vbox->add (@dialog);
701 $dialog->show; 789 $dialog->show;
702} 790}
703 791
704sub start_game { 792sub dc_connect {
705 status "logging in..."; 793 my ($host, $port) = @_;
706 794
707 $LOGIN_BUTTON->set_text ("Logout");
708 $SETUP_DIALOG->hide;
709
710 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;
711 797
712 my ($host, $port) = split /:/, $PROFILE->{host};
713
714 $MAP = new DC::Map;
715
716 $CONN = eval { 798 $CONN =
717 new DC::Protocol 799 new DC::Protocol
718 host => $host, 800 host => $host,
719 port => $port || 13327, 801 port => $port,
720 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
721 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
722 mapw => $mapsize, 804 mapw => $mapw,
723 maph => $mapsize, 805 maph => $maph,
724 806
725 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
726 808
727 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
728 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
731 query => \&server_query, 813 query => \&server_query,
732 814
733 setup_req => { 815 setup_req => {
734 smoothing => $CFG->{map_smoothing}*1, 816 smoothing => $CFG->{map_smoothing}*1,
735 }, 817 },
736 };
737 818
738 if ($CONN) { 819 on_connect => sub {
820 if ($_[0]) {
739 DC::lowdelay fileno $CONN->{fh}; 821 DC::lowdelay fileno $CONN->{fh};
740 822
741 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 };
742 } else { 858 } else {
743 status "unable to connect"; 859 dc_connect $host, $port;
744 stop_game();
745 } 860 }
746} 861}
747 862
748sub stop_game { 863sub stop_game {
864 crash "stop_game";
865
749 $LOGIN_BUTTON->set_text ("Login / Register"); 866 $LOGIN_BUTTON->set_text ("Login / Register");
750 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 867 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
751 $SETUP_DIALOG->show; 868 $SETUP_DIALOG->show;
752 $PL_WINDOW->hide; 869 $PL_WINDOW->hide;
753 $SPELL_LIST->clear_spells; 870 $SPELL_LIST->clear_spells;
767} 884}
768 885
769sub graphics_setup { 886sub graphics_setup {
770 my $vbox = new DC::UI::VBox; 887 my $vbox = new DC::UI::VBox;
771 888
889 {
890 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
891
772 $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]);
773 893
774 my $row = 0; 894 my $row = 0;
775 895
776 $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");
777 $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,
778 can_events => 1, 898 can_events => 1,
779 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 899 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
780 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
781 my $vidmode_tooltip = 922 my $vidmode_tooltip =
782 "<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). "
783 . "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>.";
784 925
785 $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");
786 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 927 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
787 928
788 $hbox->add (my $mode_slider = new DC::UI::Slider 929 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
789 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 ],
790 tooltip => $vidmode_tooltip); 933 tooltip => $vidmode_tooltip);
791 $hbox->add (my $mode_label = new DC::UI::Label 934 $hbox->add (my $mode_label = new DC::UI::Label
792 height => 0.8, template => "9999x9999@9+9", 935 height => 0.8, template => "9999x9999@9+9",
793 can_events => 1, tooltip => $vidmode_tooltip); 936 can_events => 1, tooltip => $vidmode_tooltip);
794 937
795 $mode_slider->connect (changed => sub { 938 $MODE_SLIDER->connect (changed => sub {
796 my ($self, $value) = @_; 939 my ($self, $value) = @_;
797 940
798 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 941 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
799 $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]});
800 }); 943 });
801 $mode_slider->emit (changed => $mode_slider->{range}[0]); 944 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
802 945
803 $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");
804 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 947 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
805 state => $CFG->{fullscreen}, 948 state => $CFG->{fullscreen},
806 tooltip => "Bring the client into fullscreen mode.", 949 tooltip => "Bring the client into fullscreen mode.",
807 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 950 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
808 ); 951 );
809 952
810 $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");
811 $table->add_at (1, $row++, new DC::UI::CheckBox 954 $table->add_at (1, $row++, new DC::UI::CheckBox
812 state => $CFG->{force_opengl11}, 955 state => $CFG->{force_opengl11},
813 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 "
814 . "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 "
815 . "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. "
816 . "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, "
817 . "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. "
818 . "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>",
819 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 962 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
820 ); 963 );
821 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
822 $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");
823 $table->add_at (1, $row++, new DC::UI::CheckBox 983 $table->add_at (1, $row++, new DC::UI::CheckBox
824 state => $CFG->{texture_compression}, 984 state => $CFG->{texture_compression},
825 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 "
826 . "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). "
827 . "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 "
828 . "forced OpenGL 1.1 mode.", 988 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
829 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 989 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
830 ); 990 );
831 991
832 $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");
833 $table->add_at (1, $row++, new DC::UI::CheckBox 993 $table->add_at (1, $row++, new DC::UI::CheckBox
834 state => $CFG->{fast}, 994 state => $CFG->{fast},
835 tooltip => "Lower the visual quality considerably to speed up rendering.", 995 tooltip => "Lower the visual quality considerably to speed up rendering.",
836 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
837 ); 997 );
838 998
839 $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");
840 $table->add_at (1, $row++, new DC::UI::Slider 1000 $table->add_at (1, $row++, new DC::UI::Slider
841 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1001 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
842 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.",
843 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1003 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
844 ); 1004 );
845 1005
846 $table->add_at (1, $row++, new DC::UI::Button 1006 $table->add_at (1, $row++, new DC::UI::Button
847 expand => 1, text => "Apply", 1007 expand => 1, text => "Apply",
848 tooltip => "Apply the video settings above.", 1008 tooltip => "Apply the video settings above.",
849 on_activate => sub { 1009 on_activate => sub {
850 video_shutdown (); 1010 video_shutdown ();
851 video_init (); 1011 video_init ();
1012 0
852 0 1013 }
853 } 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 }
854 ); 1030 );
855 1031
856 $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");
857 $table->add_at (1, $row++, new DC::UI::Slider 1033 $table->add_at (1, $row++, new DC::UI::Slider
858 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1034 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
859 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1035 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
860 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 }
861 ); 1037 );
862 1038
863 $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");
864 $table->add_at (1, $row++, new DC::UI::CheckBox 1040 $table->add_at (1, $row++, new DC::UI::CheckBox
865 state => $CFG->{map_smoothing}, 1041 state => $CFG->{map_smoothing},
866 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. "
867 . "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. "
868 . "Changes take effect at next login only.", 1044 . "Changes take effect at next login only.",
869 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1045 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
870 ); 1046 );
871 1047
872 $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");
873 $table->add_at (1, $row++, new DC::UI::CheckBox 1049 $table->add_at (1, $row++, new DC::UI::CheckBox
874 state => $CFG->{fow_enable}, 1050 state => $CFG->{fow_enable},
875 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.",
876 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
877 ); 1053 );
878 1054
879 $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");
880 $table->add_at (1, $row++, new DC::UI::Slider 1056 $table->add_at (1, $row++, new DC::UI::Slider
881 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1057 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
882 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.",
883 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1059 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
884 ); 1060 );
885 1061
886 $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");
887 $table->add_at (1, $row++, new DC::UI::Slider 1063 $table->add_at (1, $row++, new DC::UI::Slider
888 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1064 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
889 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, "
890 . "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.",
891 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 },
892 ); 1068 );
893 1069
894 $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");
895 $table->add_at (1, $row++, new DC::UI::Slider 1071 $table->add_at (1, $row++, new DC::UI::Slider
896 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1072 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
897 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.",
898 on_changed => sub { 1074 on_changed => sub {
899 $CFG->{gauge_fontsize} = $_[1]; 1075 $CFG->{gauge_fontsize} = $_[1];
900 &set_gauge_window_fontsize; 1076 &set_gauge_window_fontsize;
1077 0
901 0 1078 }
902 } 1079 );
903 );
904 1080
905 $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");
906 $table->add_at (1, $row++, new DC::UI::Slider 1082 $table->add_at (1, $row++, new DC::UI::Slider
907 range => [$CFG->{gauge_size}, 0.2, 0.8], 1083 range => [$CFG->{gauge_size}, 0.2, 0.8],
908 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.",
909 on_changed => sub { 1085 on_changed => sub {
910 $CFG->{gauge_size} = $_[1]; 1086 $CFG->{gauge_size} = $_[1];
911 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1087 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1088 0
912 0 1089 }
913 } 1090 );
914 ); 1091 }
915 1092
916 $vbox 1093 $vbox
917} 1094}
918 1095
919our $AUDIO_HW_CHUNKSIZE; 1096our $AUDIO_HW_CHUNKSIZE;
1082} 1259}
1083 1260
1084sub make_gauge_window { 1261sub make_gauge_window {
1085 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1262 my $gh = int $HEIGHT * $CFG->{gauge_size};
1086 1263
1087 my $win = new DC::UI::Frame ( 1264 $GAUGES->{win} = my $win = new DC::UI::Frame (
1088 force_x => 0, 1265 force_x => 0,
1089 force_y => "max", 1266 force_y => "max",
1090 force_w => $WIDTH, 1267 force_w => $WIDTH,
1091 force_h => $gh, 1268 force_h => $gh,
1092 ); 1269 );
1108 (new DC::UI::Empty expand => 1), 1285 (new DC::UI::Empty expand => 1),
1109 (my $hb = new DC::UI::HBox), 1286 (my $hb = new DC::UI::HBox),
1110 ], 1287 ],
1111 ); 1288 );
1112 1289
1113 $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");
1114 $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");
1115 $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");
1116 $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");
1117
1118 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1119 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1120 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1121 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1122
1123 $GAUGES = {
1124 exp => $exp, prg => $prg, sklprg => $sklprg,
1125 win => $win, range => $rng,
1126 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1127 };
1128 1294
1129 &set_gauge_window_fontsize; 1295 &set_gauge_window_fontsize;
1130 1296
1131 $win 1297 $win
1132} 1298}
1474 ); 1640 );
1475 1641
1476 $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");
1477 $table->add_at (1, 4, new DC::UI::Entry 1643 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1644 text => $CFG->{profile}{default}{user},
1479 tooltip => "The name of your character on the server.", 1645 tooltip => "The name of your character on the server. The name is case-sensitive!",
1480 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 }
1481 ); 1647 );
1482 1648
1483 $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");
1484 $table->add_at (1, 5, new DC::UI::Entry 1650 $table->add_at (1, 5, new DC::UI::Entry
1498 1 1664 1
1499 }, 1665 },
1500 ); 1666 );
1501 1667
1502 $vbox->add (new DC::UI::FancyFrame 1668 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1669 label => "How to Play",
1504 min_h => 200, 1670 min_h => 240,
1505 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1671 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 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). "
1507 "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 "
1508 . "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.",
1509 ), 1677 ),
1510 ); 1678 );
1511 1679
1512 $vbox 1680 $vbox
1584 1752
1585 my $row = 0; 1753 my $row = 0;
1586 1754
1587 $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");
1588 $table->add_at (1, $row++, new DC::UI::CheckBox 1756 $table->add_at (1, $row++, new DC::UI::CheckBox
1757 c_colspan => 2,
1589 state => $CFG->{show_tips}, 1758 state => $CFG->{show_tips},
1590 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?",
1591 on_changed => sub { 1760 on_changed => sub {
1592 my ($self, $value) = @_; 1761 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1762 $CFG->{show_tips} = $value;
1594 0 1763 0
1595 } 1764 }
1596 ); 1765 );
1597 1766
1598 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1767 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1599 $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,
1600 text => $CFG->{logview_max_par}, 1770 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1771 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1602 . "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 "
1603 . "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.",
1604 on_changed => sub { 1774 on_changed => sub {
1605 my ($self, $value) = @_; 1775 my ($self, $value) = @_;
1606 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1776 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1777 0
1608 }, 1778 },
1609 ); 1779 );
1610 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
1611 $table 1803 $table
1612} 1804}
1613 1805
1614sub autopickup_setup { 1806sub autopickup_setup {
1615 my $r = new DC::UI::ScrolledWindow ( 1807 my $r = new DC::UI::ScrolledWindow (
1621 col_expand => [0, 1, 0, 1], 1813 col_expand => [0, 1, 0, 1],
1622 ); 1814 );
1623 1815
1624 for ( 1816 for (
1625 ["General", 0, 0, 1817 ["General", 0, 0,
1626 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1627 ["Inhibit autopickup" => PICKUP_INHIBIT], 1818# ["Inhibit autopickup" => PICKUP_INHIBIT],
1628 ["Stop before pickup" => PICKUP_STOP], 1819 ["Stop before pickup" => PICKUP_STOP],
1629 ["Debug autopickup" => PICKUP_DEBUG], 1820 ["Debug autopickup" => PICKUP_DEBUG],
1630 ], 1821 ],
1631 ["Weapons", 0, 6, 1822 ["Weapons", 0, 6,
1632 ["All weapons" => PICKUP_ALLWEAPON], 1823 ["All weapons" => PICKUP_ALLWEAPON],
1658 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1849 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1659 ["Ignore cursed" => PICKUP_NOT_CURSED], 1850 ["Ignore cursed" => PICKUP_NOT_CURSED],
1660 ["Jewelery" => PICKUP_JEWELS], 1851 ["Jewelery" => PICKUP_JEWELS],
1661 ["Flesh" => PICKUP_FLESH], 1852 ["Flesh" => PICKUP_FLESH],
1662 ], 1853 ],
1663 ["Weight/Value ratio", 2, 17] 1854 ["Value/Weight ratio", 2, 17]
1664 ) 1855 )
1665 { 1856 {
1666 my ($title, $x, $y, @bits) = @$_; 1857 my ($title, $x, $y, @bits) = @$_;
1667 $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]);
1668 1859
1680 $::CFG->{pickup} |= $mask; 1871 $::CFG->{pickup} |= $mask;
1681 } else { 1872 } else {
1682 $::CFG->{pickup} &= ~$mask; 1873 $::CFG->{pickup} &= ~$mask;
1683 } 1874 }
1684 1875
1685 $::CONN->send_command ("pickup $::CFG->{pickup}") 1876 $::CONN->send_pickup ($::CFG->{pickup})
1686 if defined $::CONN; 1877 if defined $::CONN;
1687 1878
1688 0 1879 0
1689 }); 1880 });
1690 1881
1693 } 1884 }
1694 1885
1695 $table->add_at (2, 18, new DC::UI::ValSlider 1886 $table->add_at (2, 18, new DC::UI::ValSlider
1696 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1887 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1697 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).",
1698 to_value => sub { ">= " . 5 * $_[0] }, 1890 to_value => sub { ">= " . 5 * $_[0] },
1699 on_changed => sub { 1891 on_changed => sub {
1700 my ($slider, $value) = @_; 1892 my ($slider, $value) = @_;
1701 1893
1702 $::CFG->{pickup} &= ~0xF; 1894 $::CFG->{pickup} &= ~0xF;
1706 }); 1898 });
1707 1899
1708 $table->add_at (3, 18, new DC::UI::Button 1900 $table->add_at (3, 18, new DC::UI::Button
1709 text => "set", 1901 text => "set",
1710 on_activate => sub { 1902 on_activate => sub {
1711 $::CONN->send_command ("pickup $::CFG->{pickup}") 1903 $::CONN->send_pickup ($::CFG->{pickup})
1712 if defined $::CONN; 1904 if defined $::CONN;
1713 0 1905 0
1714 }); 1906 });
1715 1907
1716 $r 1908 $r
1717} 1909}
1718 1910
1719my %SORT_ORDER = ( 1911my %SORT_ORDER = (
1720 type => undef, 1912 type => sub {
1913 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1914 },
1721 mtime => sub { 1915 mtime => sub {
1722 my $NOW = time; 1916 my $NOW = time;
1723 sort { 1917 sort {
1724 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;
1725 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;
1756 $::CFG->{inv_sort} = $_[1]; 1950 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1951 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1952 },
1759 ); 1953 );
1760 $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);
1761 #TODO# update to weigh/maxweight 1955 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1956 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1957
1764 $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);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1959 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1960 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1827 $PL_NOTEBOOK->set_current_page ($widget); 2021 $PL_NOTEBOOK->set_current_page ($widget);
1828 $PL_WINDOW->show; 2022 $PL_WINDOW->show;
1829 } 2023 }
1830} 2024}
1831 2025
1832sub player_window { 2026sub make_playerbook {
1833 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2027 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1834 x => "center", 2028 x => "center",
1835 y => "center", 2029 y => "center",
1836 force_w => $WIDTH * 9/10, 2030 force_w => $WIDTH * 9/10,
1837 force_h => $HEIGHT * 9/10, 2031 force_h => $HEIGHT * 9/10,
1871 "License, Author and Source info for media sent by the server."); 2065 "License, Author and Source info for media sent by the server.");
1872 2066
1873 $ntb->set_current_page ($INVENTORY_PAGE); 2067 $ntb->set_current_page ($INVENTORY_PAGE);
1874 2068
1875 $plwin->add ($ntb); 2069 $plwin->add ($ntb);
1876 $plwin
1877} 2070}
1878 2071
1879sub keyboard_setup { 2072sub keyboard_setup {
1880 DC::Macro::keyboard_setup 2073 DC::Macro::keyboard_setup
1881} 2074}
1882 2075
1883sub help_window { 2076sub make_help_window {
1884 my $win = new DC::UI::Toplevel 2077 my $win = new DC::UI::Toplevel
1885 x => 'center', 2078 x => 'center',
1886 y => 'center', 2079 y => 'center',
1887 z => 4, 2080 z => 4,
1888 name => 'doc_browser', 2081 name => 'doc_browser',
1947 my @path = DC::Pod::full_path_of $node; 2140 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2141 pop @path; # drop current node
1949 2142
1950 for my $node (@path) { 2143 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2144 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2145 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2146 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2147 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2148 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2149 $load_node->($node);
1957 }, 2150 },
1958 ); 2151 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2152 $buttons->add (new DC::UI::Label text => "/");
1960 } 2153 }
1961 2154
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2155 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2156
1964 $curnode = $node; 2157 $curnode = $node;
1965 2158
1966 $viewer->clear; 2159 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2160 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
1977 2170
1978 $load_node->((DC::Pod::find @path)[0]); 2171 $load_node->((DC::Pod::find @path)[0]);
1979 $win->show; 2172 $win->show;
1980 }; 2173 };
1981 2174
1982 $win 2175 $HELP_WINDOW = $win;
1983}
1984
1985sub open_string_query {
1986 my ($title, $cb, $txt, $tooltip) = @_;
1987 my $dialog = new DC::UI::Toplevel
1988 x => "center",
1989 y => "center",
1990 z => 50,
1991 force_w => $WIDTH * 4/5,
1992 title => $title;
1993
1994 $dialog->add (
1995 my $e = new DC::UI::Entry
1996 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1997 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1998 tooltip => $tooltip
1999 );
2000
2001 $e->grab_focus;
2002 $e->set_text ($txt) if $txt;
2003 $dialog->show;
2004} 2176}
2005 2177
2006sub open_quit_dialog { 2178sub open_quit_dialog {
2007 unless ($QUIT_DIALOG) { 2179 unless ($QUIT_DIALOG) {
2008 $QUIT_DIALOG = new DC::UI::Toplevel 2180 $QUIT_DIALOG = new DC::UI::Toplevel
2030 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2202 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2031 ); 2203 );
2032 $hb->add (new DC::UI::Button 2204 $hb->add (new DC::UI::Button
2033 text => "Quit anyway", 2205 text => "Quit anyway",
2034 expand => 1, 2206 expand => 1,
2035 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2207 on_activate => sub {
2208 crash "Quit anyway";
2209 EV::unloop EV::UNLOOP_ALL;
2210 },
2036 ); 2211 );
2037 } 2212 }
2038 2213
2039 $QUIT_DIALOG->show; 2214 $QUIT_DIALOG->show;
2040 $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;
2041} 2324}
2042 2325
2043sub show_tip_of_the_day { 2326sub show_tip_of_the_day {
2044 # find all tips 2327 # find all tips
2045 my @tod = DC::Pod::find tip_of_the_day => "*"; 2328 my @tod = DC::Pod::find tip_of_the_day => "*";
2093 $dialog->show; 2376 $dialog->show;
2094 }; 2377 };
2095} 2378}
2096 2379
2097sub sdl_init { 2380sub sdl_init {
2098 DC::SDL_Init 2381 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2382 and die "SDL::Init failed!\n";
2100} 2383}
2101 2384
2102sub 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
2103 $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 }
2104 2408
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2409 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2410
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2411 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2412 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2413 $FAST = $CFG->{fast};
2110 2414
2415 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2111 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
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2418 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2419
2114 $SDL_ACTIVE = 1; 2420 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2421 $LAST_REFRESH = time - 0.01;
2116 2422
2146 force_x => "max", 2452 force_x => "max",
2147 force_y => 0; 2453 force_y => 0;
2148 $DEBUG_STATUS->show; 2454 $DEBUG_STATUS->show;
2149 2455
2150 $STATUSBOX = new DC::UI::Statusbox; 2456 $STATUSBOX = new DC::UI::Statusbox;
2151 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2457
2458 $MODBOX = new DC::UI::Label
2459 can_events => 1,
2460 can_hover => 1,
2461 markup => "",
2462 align => 0,
2463 font => $FONT_FIXED,
2464 tooltip => "#modifier_box",
2465 tooltip_width => 0.67,
2466 ;
2467
2468 update_modbox;
2152 2469
2153 (new DC::UI::Frame 2470 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2471 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2472 force_x => 0,
2156 force_y => "max", 2473 force_y => "max",
2157 child => $STATUSBOX, 2474 child => (my $LL = new DC::UI::VBox),
2158 )->show; 2475 )->show;
2476
2477 $LL->add ($STATUSBOX);
2478 $LL->add ($MODBOX);
2479 $LL->add (new DC::UI::Label
2480 align => 0,
2481 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2482 fontsize => 0.5,
2483 fg => [1, 1, 0, 0.7],
2484 );
2159 2485
2160 DC::UI::Toplevel->new ( 2486 DC::UI::Toplevel->new (
2161 title => "Minimap", 2487 title => "Minimap",
2162 name => "mapmap", 2488 name => "mapmap",
2163 x => 0, 2489 x => 0,
2164 y => $FONTSIZE + 8, 2490 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2165 border_bg => [1, 1, 1, 192/255], 2491 border_bg => [1, 1, 1, 192/255],
2166 bg => [1, 1, 1, 0], 2492 bg => [1, 1, 1, 0],
2167 child => ($MAPMAP = new DC::MapWidget::MapMap 2493 child => ($MAPMAP = new DC::MapWidget::MapMap
2168 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.",
2169 ), 2495 ),
2170 )->show; 2496 )->show;
2171 2497
2172 $MAPWIDGET = new DC::MapWidget; 2498 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2499 $MAPWIDGET->connect (activate_console => sub {
2194 force_h => $::HEIGHT * 0.6, 2520 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2521 has_close_button => 1,
2196 ; 2522 ;
2197 2523
2198 $METASERVER = metaserver_dialog; 2524 $METASERVER = metaserver_dialog;
2199 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2525 # the name is changed to not conflict with the older name as users could have hidden it
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
2200 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2534 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2535
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2536 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2537 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2538
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2539 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2540 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2541 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2220 . "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 "
2221 . "binding editor closes"); 2555 . "binding editor closes");
2222 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2556 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2223 "Some debuggin' options. Do not ask."); 2557 "Some debuggin' options. Do not ask.");
2224 2558
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2559 make_help_window;
2560 make_menubar;
2226 2561
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232
2233 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
2234
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2237
2238 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf";
2244 status "Configuration Saved";
2245 0
2246 },
2247 );
2248
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation");
2251
2252
2253 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit",
2255 tooltip => "Terminates the program",
2256 on_activate => sub {
2257 if ($CONN) {
2258 open_quit_dialog;
2259 } else {
2260 EV::unloop EV::UNLOOP_ALL;
2261 }
2262 0
2263 },
2264 );
2265
2266 $BUTTONBAR->show;
2267 $SETUP_DIALOG->show; 2562 $SETUP_DIALOG->show;
2268 $MESSAGE_WINDOW->show; 2563 $MESSAGE_WINDOW->show;
2269 } 2564 }
2270 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 ("Apple/NVIDIA Texture bug (slow)")
2571 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2572 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2573 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2574
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2575 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2576}
2273 2577
2274sub video_shutdown { 2578sub video_shutdown {
2275 DC::OpenGL::shutdown; 2579 DC::OpenGL::shutdown;
2580 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2581
2277 undef $SDL_ACTIVE; 2582 undef $SDL_ACTIVE;
2278} 2583}
2279 2584
2280my %animate_object; 2585my %animate_object;
2299my $want_refresh = EV::prepare_ns \&force_refresh; 2604my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2605
2301my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2606my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = EV::now; 2607 $NOW = EV::now;
2303 2608
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2609 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2305 for DC::poll_events; 2610 for DC::poll_events;
2306 2611
2307 if (%animate_object) { 2612 if (%animate_object) {
2308 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2613 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2309 $WANT_REFRESH = 1; 2614 $WANT_REFRESH = 1;
2321sub animation_stop { 2626sub animation_stop {
2322 my ($widget) = @_; 2627 my ($widget) = @_;
2323 delete $animate_object{$widget}; 2628 delete $animate_object{$widget};
2324} 2629}
2325 2630
2326%SDL_CB = (
2327 DC::SDL_QUIT => sub { 2631$SDL_CB[DC::SDL_QUIT] = sub {
2632 crash "SDL_QUIT";
2328 EV::unloop EV::UNLOOP_ALL; 2633 EV::unloop EV::UNLOOP_ALL;
2329 }, 2634};
2330 DC::SDL_VIDEORESIZE => sub { 2635$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2331 },
2332 DC::SDL_VIDEOEXPOSE => sub { 2636$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2333 DC::UI::full_refresh; 2637 DC::UI::full_refresh;
2334 }, 2638};
2335 DC::SDL_ACTIVEEVENT => sub { 2639$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2336# not useful, as APPACTIVE includes only iconified state, not unmapped 2640# not useful, as APPACTIVE includes only iconified state, not unmapped
2337# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2641# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2338# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2642# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2339# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2643# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2340# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2644# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2645# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2646};
2343 DC::SDL_KEYDOWN => sub { 2647$SDL_CB[DC::SDL_KEYDOWN] = sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2648 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2649 # alt-enter
2650 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2651 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2652 video_init;
2349 } else { 2653 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2654 &DC::UI::feed_sdl_key_down_event;
2351 }
2352 }, 2655 }
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2656 update_modbox;
2657};
2658$SDL_CB[DC::SDL_KEYUP] = sub {
2659 &DC::UI::feed_sdl_key_up_event;
2660 update_modbox;
2661};
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2662$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2663$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2664$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2665$SDL_CB[DC::SDL_USEREVENT] = sub {
2358 if ($_[0]{code} == 1) { 2666 if ($_[0]{code} == 1) {
2359 audio_channel_finished $_[0]{data1}; 2667 audio_channel_finished $_[0]{data1};
2360 } elsif ($_[0]{code} == 0) { 2668 } elsif ($_[0]{code} == 0) {
2361 audio_music_finished; 2669 audio_music_finished;
2362 }
2363 }, 2670 }
2364); 2671};
2365 2672
2366############################################################################# 2673#############################################################################
2367 2674
2368$SIG{INT} = $SIG{TERM} = sub { 2675$SIG{INT} = $SIG{TERM} = sub {
2369 EV::unloop; 2676 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2677 #d# TODO calling exit here hangs the process in some futex
2371}; 2678};
2372 2679
2373{ 2680# due to mac os x + sdl combined braindamage, we need this contortion
2681sub main {
2682 {
2683 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2684
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2685 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2686 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2687 } else {
2377 #TODO: compatibility cruft 2688 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2689 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuration file\n"; 2690 print STDERR "INFO: used old configuration file\n";
2380 } 2691 }
2381 2692
2382 DC::DB::Server::run; 2693 DC::DB::Server::run;
2383 2694
2695 if ($CFG->{db_schema} < 1) {
2696 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2697 DC::DB::nuke_db;
2698 $CFG->{db_schema} = 1;
2699 DC::write_cfg;
2700 }
2701
2702 DC::DB::open_db;
2703
2384 DC::UI::set_layout ($::CFG->{layout}); 2704 DC::UI::set_layout ($::CFG->{layout});
2385 2705
2386 my %DEF_CFG = ( 2706 my %DEF_CFG = (
2707 config_autosave => 1,
2387 sdl_mode => 0, 2708 sdl_mode => undef,
2388 fullscreen => 1, 2709 fullscreen => 1,
2389 fast => 0, 2710 fast => 0,
2390 force_opengl11 => undef, 2711 force_opengl11 => undef,
2712 disable_alpha => 0,
2713 smooth_movement => 1,
2391 texture_compression => 1, 2714 texture_compression => 1,
2392 map_scale => 1, 2715 map_scale => 1,
2393 fow_enable => 1, 2716 fow_enable => 1,
2394 fow_intensity => 0, 2717 fow_intensity => 0,
2395 map_smoothing => 1, 2718 map_smoothing => 1,
2396 gui_fontsize => 1, 2719 gui_fontsize => 1,
2397 log_fontsize => 0.7, 2720 log_fontsize => 0.7,
2398 gauge_fontsize => 1, 2721 gauge_fontsize => 1,
2399 gauge_size => 0.35, 2722 gauge_size => 0.35,
2400 stat_fontsize => 0.7, 2723 stat_fontsize => 0.7,
2401 mapsize => 100, 2724 mapsize => 100,
2402 audio_enable => 1, 2725 audio_enable => 1,
2403 audio_hw_channels => 0, 2726 audio_hw_channels => 0,
2404 audio_hw_frequency => 0, 2727 audio_hw_frequency => 0,
2405 audio_hw_chunksize => 0, 2728 audio_hw_chunksize => 0,
2406 audio_mix_channels => 8, 2729 audio_mix_channels => 8,
2407 effects_enable => 1, 2730 effects_enable => 1,
2408 effects_volume => 1, 2731 effects_volume => 1,
2409 bgm_enable => 1, 2732 bgm_enable => 1,
2410 bgm_volume => 0.5, 2733 bgm_volume => 0.5,
2411 output_rate => "", 2734 output_rate => "",
2412 pickup => 0, 2735 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2413 inv_sort => "mtime", 2736 inv_sort => "mtime",
2414 default => "profile", # default profile 2737 default => "profile", # default profile
2415 show_tips => 1, 2738 show_tips => 1,
2416 logview_max_par => 1000, 2739 logview_max_par => 1000,
2740 shift_fire_stop => 0,
2741 uitheme => "wood",
2742 map_shift_x => -24, # arbitrary
2743 map_shift_y => +24, # arbitrary
2417 ); 2744 );
2418 2745
2419 while (my ($k, $v) = each %DEF_CFG) { 2746 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2747 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2748 }
2422 2749
2423 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2750 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2424 $PROFILE = $CFG->{profile}{default}; 2751 $PROFILE = $CFG->{profile}{default};
2425 2752
2426 # convert old bindings (only default profile matters) 2753 # convert old bindings (only default profile matters)
2427 if (my $bindings = delete $PROFILE->{bindings}) { 2754 if (my $bindings = delete $PROFILE->{bindings}) {
2428 while (my ($mod, $syms) = each %$bindings) { 2755 while (my ($mod, $syms) = each %$bindings) {
2429 while (my ($sym, $cmds) = each %$syms) { 2756 while (my ($sym, $cmds) = each %$syms) {
2430 push @{ $PROFILE->{macro} }, { 2757 push @{ $PROFILE->{macro} }, {
2431 accelkey => [$mod*1, $sym*1], 2758 accelkey => [$mod*1, $sym*1],
2432 action => $cmds, 2759 action => $cmds,
2760 };
2433 }; 2761 }
2434 } 2762 }
2435 } 2763 }
2436 }
2437 2764
2438 sdl_init; 2765 sdl_init;
2439 2766
2440 @SDL_MODES = DC::SDL_ListModes 8, 8; 2767 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2441 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2768 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2442 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2443 2769
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2770 {
2445
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447
2448 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2771 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2772 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2773 DejaVuSansMono.ttf
2452 DejaVuSans-Bold.ttf 2774 DejaVuSans-Bold.ttf
2453 DejaVuSansMono-Bold.ttf 2775 DejaVuSansMono-Bold.ttf
2454 DejaVuSans-Oblique.ttf 2776 DejaVuSans-Oblique.ttf
2455 DejaVuSansMono-Oblique.ttf 2777 DejaVuSansMono-Oblique.ttf
2456 DejaVuSans-BoldOblique.ttf 2778 DejaVuSans-BoldOblique.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2779 DejaVuSansMono-BoldOblique.ttf
2780 mona.ttf
2458 ); 2781 );
2459 2782
2460 DC::add_font $_ for @fonts; 2783 DC::add_font $_ for @fonts;
2461 2784
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2785 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2786 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2787
2467 $FONT_PROP->make_default; 2788 $FONT_PROP->make_default;
2468 } 2789
2790 DC::pango_init;
2791 }
2469 2792
2470# compare mono (ft) vs. rgba (cairo) 2793# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2794# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2795# for my $rgba (0..1) {
2473# my $t1 = Time::HiRes::time; 2796# my $t1 = Time::HiRes::time;
2478# } 2801# }
2479# my $t2 = Time::HiRes::time; 2802# my $t2 = Time::HiRes::time;
2480# warn $t2-$t1; 2803# warn $t2-$t1;
2481# } 2804# }
2482 2805
2483 video_init; 2806 video_init;
2484 audio_init; 2807 audio_init;
2485} 2808 }
2486 2809
2487show_tip_of_the_day if $CFG->{show_tips}; 2810 show_tip_of_the_day if $CFG->{show_tips};
2488 2811
2489our $STARTUP_CANCEL = EV::idle sub { 2812 our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2813 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2814 $startup_done->();
2492}; 2815 };
2493 2816
2817 delete $SIG{__DIE__};
2494EV::loop; 2818 EV::loop;
2495 2819
2820 DC::write_cfg if $CFG->{config_autosave};
2821
2496#video_shutdown; 2822 #video_shutdown;
2497#audio_shutdown; 2823 #audio_shutdown;
2824
2498DC::OpenGL::quit; 2825 DC::OpenGL::quit;
2499DC::SDL_Quit; 2826 DC::SDL_Quit;
2500DC::DB::Server::stop; 2827 DC::DB::Server::stop;
2828}
2829
2830DC::SDL_braino; # see sub above
2501 2831
2502=head1 NAME 2832=head1 NAME
2503 2833
2504deliantra - A Deliantra MORPG game client 2834deliantra - A Deliantra MORPG game client
2505 2835
2522 4 show fps 2852 4 show fps
2523 8 suppress tooltips 2853 8 suppress tooltips
2524 2854
2525=head1 AUTHOR 2855=head1 AUTHOR
2526 2856
2527Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2857Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2528 2858
2529 2859
2530 2860

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines