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.29 by root, Mon Mar 24 00:24:47 2008 UTC vs.
Revision 1.99 by root, Tue Dec 22 00:35:44 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
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
140
130our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
131 142
132our $LAST_REFRESH; 143our $LAST_REFRESH;
133our $NOW; 144our $NOW;
134 145
135our $CFG; 146our $CFG;
136our $CONN;
137our $PROFILE; # current profile 147our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 149
140our $WANT_REFRESH; 150our $WANT_REFRESH;
141 151
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
154
142our @SDL_MODES; 155our @SDL_MODES;
156our $SDL_REINIT = 1;
143our $WIDTH; 157our $WIDTH;
144our $HEIGHT; 158our $HEIGHT;
145our $FULLSCREEN; 159our $FULLSCREEN;
146our $FONTSIZE; 160our $FONTSIZE;
147 161
148our $FONT_PROP; 162our $FONT_PROP;
149our $FONT_FIXED; 163our $FONT_FIXED;
150 164
165our $CONN;
166
151our $MAP; 167our $MAP;
152our $MAPMAP; 168our $MAPMAP;
153our $MAPWIDGET; 169our $MAPWIDGET;
154our $COMPLETER; 170our $COMPLETER;
155our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
156our $METASERVER; 175our $METASERVER;
157our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
158our $QUIT_DIALOG; 177our $QUIT_DIALOG;
159our $HOST_ENTRY; 178our $HOST_ENTRY;
160our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
186our $FLOORBOX; 205our $FLOORBOX;
187our $GAUGES; 206our $GAUGES;
188our $STATWIDS; 207our $STATWIDS;
189 208
190our $SDL_ACTIVE; 209our $SDL_ACTIVE;
191our %SDL_CB; 210our @SDL_CB;
192 211
193our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 213our $STATUSBOX;
195our $MODBOX; 214our $MODBOX;
196our $DEBUG_STATUS; 215our $DEBUG_STATUS;
199our $INVR; 218our $INVR;
200our $INVR_HB; 219our $INVR_HB;
201 220
202############################################################################# 221#############################################################################
203 222
223# write a crash message blockingly to the socket, if possible
224# this is a bit too complicated for my tastes, but it was easy.
225*crash = sub($;$) {
226 my ($msg, $backtrace) = @_;
227
228 warn $msg;
229
230 return unless $CONN;
231
232 my $fh = $CONN->{fh}
233 or return;
234
235 my $buf = delete $CONN->{wbuf};
236
237 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
238
239 AnyEvent::Util::fh_nonblocking $fh, 0;
240 syswrite $fh, $buf;
241 AnyEvent::Util::fh_nonblocking $fh, 1;
242
243 $msg =~ s/\s+$//;
244
245 # backtrace as second step, in case it crashes, too
246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
247 if $backtrace;
248};
249
250sub clienterror($;$) {
251 my ($msg, $backtrace) = @_;
252
253 warn $msg;
254
255 return unless $CONN;
256
257 $CONN->send_exti_msg (clientlog => $msg);
258 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
259}
260
261#############################################################################
262
204sub status { 263sub status {
205 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
206} 265}
207 266
208sub debug { 267sub debug {
232 291
233 $markup .= $mod & DC::KMOD_NUM 292 $markup .= $mod & DC::KMOD_NUM
234 ? "[NUM]" 293 ? "[NUM]"
235 : "[<span foreground='#888'>num</span>]"; 294 : "[<span foreground='#888'>num</span>]";
236 295
296 # <tt> around next statement works around some bug that keeps the
297 # "font =>" from being used on windows
237 $MODBOX->set_markup ($markup); 298 $MODBOX->set_markup ("<tt>$markup</tt>");
238} 299}
239 300
240############################################################################# 301#############################################################################
241#TODO: maybe move into own audio module... 302#TODO: maybe move into own audio module...
242 303
285 or return; 346 or return;
286 347
287 $meta->{data} 348 $meta->{data}
288 or return; 349 or return;
289 350
290 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
291 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
292 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
293 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
294 &audio_music_push ($face); 355 &audio_music_push ($face);
295 } 356 }
296 } else { 357 } else {
297 # fetch from database 358 # fetch from database
298 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
299 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
300 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
301 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
302 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
303 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
304 365
305 audio_sound_push ($face); 366 audio_sound_push ($face);
306 }; 367 };
353 414
354 audio_music_update_volume; 415 audio_music_update_volume;
355 416
356 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
357 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
358 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
359 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
360 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
361 425
362 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
363 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
364 428
365 my $NOW = time; 429 my $NOW = time;
366 430
367 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
368 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
486 $MUSIC_WANT = []; 550 $MUSIC_WANT = [];
487 @MUSIC_JINGLE = (); 551 @MUSIC_JINGLE = ();
488 %AUDIO_PLAY = (); 552 %AUDIO_PLAY = ();
489 %AUDIO_CHUNK = (); 553 %AUDIO_CHUNK = ();
490 554
555 DC::MixMusic::halt;
556 DC::Mix_AllocateChannels 0;
491 DC::Mix_CloseAudio if $SDL_MIXER; 557 DC::Mix_CloseAudio if $SDL_MIXER;
492 undef $SDL_MIXER; 558 undef $SDL_MIXER;
493} 559}
494 560
495############################################################################# 561#############################################################################
662 # right: accept 728 # right: accept
663 $table->add_at (4, 0, new DC::UI::Button 729 $table->add_at (4, 0, new DC::UI::Button
664 text => "Accept", 730 text => "Accept",
665 on_activate => sub { 731 on_activate => sub {
666 $conn->send ("reply n"); 732 $conn->send ("reply n");
667 $STATS_PAGE->hide;
668 destroy_query_dialog $conn; 733 destroy_query_dialog $conn;
669 0 734 0
670 }, 735 },
671 ); 736 );
672 737
724 789
725 $vbox->add (@dialog); 790 $vbox->add (@dialog);
726 $dialog->show; 791 $dialog->show;
727} 792}
728 793
729sub start_game { 794sub dc_connect {
730 status "logging in..."; 795 my ($host, $port) = @_;
731 796
732 $LOGIN_BUTTON->set_text ("Logout");
733 $SETUP_DIALOG->hide;
734
735 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 797 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
798 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
736 799
737 my ($host, $port) = split /:/, $PROFILE->{host};
738
739 $MAP = new DC::Map;
740
741 $CONN = eval { 800 $CONN =
742 new DC::Protocol 801 new DC::Protocol
743 host => $host, 802 host => $host,
744 port => $port || 13327, 803 port => $port,
745 user => $PROFILE->{user}, 804 user => $PROFILE->{user},
746 pass => $PROFILE->{password}, 805 pass => $PROFILE->{password},
747 mapw => $mapsize, 806 mapw => $mapw,
748 maph => $mapsize, 807 maph => $maph,
749 808
750 client => "$DC::VERSION $] $^O", 809 client => "$DC::VERSION $] $^O",
751 810
752 map_widget => $MAPWIDGET, 811 map_widget => $MAPWIDGET,
753 statusbox => $STATUSBOX, 812 statusbox => $STATUSBOX,
756 query => \&server_query, 815 query => \&server_query,
757 816
758 setup_req => { 817 setup_req => {
759 smoothing => $CFG->{map_smoothing}*1, 818 smoothing => $CFG->{map_smoothing}*1,
760 }, 819 },
761 };
762 820
763 if ($CONN) { 821 on_connect => sub {
822 if ($_[0]) {
764 DC::lowdelay fileno $CONN->{fh}; 823 DC::lowdelay fileno $CONN->{fh};
765 824
766 status "login successful"; 825 status "successfully connected to the server";
826 } else {
827 undef $CONN;
828 status "unable to connect: $!";
829 stop_game();
830 }
831 },
832 ;
833}
834
835sub start_game {
836 status "logging in...";
837
838 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
839 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
840 or return status "$server: unable to parse server address, try an empty field.";
841
842 $LOGIN_BUTTON->set_text ("Logout");
843 $SETUP_DIALOG->hide;
844
845 $MAP = new DC::Map;
846
847 # hack to make SURE we find the IP address all right
848 # can be removed once AnyEvent::DNS is proven stable.
849 if ($host eq "gameserver.deliantra.net") {
850 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
851 if ($_[0] ne "80.101.114.108") { # Perl
852 status "dns failure, trying differently";
853 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
854 unless (defined $host) {
855 status "dns failure, using hardcoded address";
856 $host = "129.13.162.95";
857 }
858 }
859
860 dc_connect $host, $port;
861 };
767 } else { 862 } else {
768 status "unable to connect"; 863 dc_connect $host, $port;
769 stop_game();
770 } 864 }
771} 865}
772 866
773sub stop_game { 867sub stop_game {
868 crash "stop_game";
869
774 $LOGIN_BUTTON->set_text ("Login / Register"); 870 $LOGIN_BUTTON->set_text ("Login / Register");
775 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 871 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
776 $SETUP_DIALOG->show; 872 $SETUP_DIALOG->show;
777 $PL_WINDOW->hide; 873 $PL_WINDOW->hide;
778 $SPELL_LIST->clear_spells; 874 $SPELL_LIST->clear_spells;
792} 888}
793 889
794sub graphics_setup { 890sub graphics_setup {
795 my $vbox = new DC::UI::VBox; 891 my $vbox = new DC::UI::VBox;
796 892
893 {
894 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
895
797 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 896 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
798 897
799 my $row = 0; 898 my $row = 0;
800 899
801 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 900 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
802 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 901 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
803 can_events => 1, 902 can_events => 1,
804 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 903 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
805 904
905 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
906 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
907 can_events => 1,
908 tooltip => "This field shows any known issues with your config or driver, such as "
909 . "a non-accelerated display format. You can try to work around these issues "
910 . "by selecting a different video mode, changing the settings below or "
911 . "by installing the right driver for your graphics card.");
912
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
914 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
915 value => $CFG->{uitheme},
916 options => [
917 [wood => "Wood (the default)"],
918 [plain => "Plain (very)"],
919 [blue => "Blue (dark)"],
920 [metal => "Metal (light)"],
921 ],
922 tooltip => "Choose the User Interface theme that you like most :)",
923 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
924 );
925
806 my $vidmode_tooltip = 926 my $vidmode_tooltip =
807 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 927 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
808 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 928 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
809 929
810 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 930 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
811 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 931 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
812 932
813 $hbox->add (my $mode_slider = new DC::UI::Slider 933 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
814 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 934 c_rescale => 1,
935 force_w => $WIDTH * 0.1, expand => 1,
936 range => [ ($CFG->{sdl_mode}) x 3 ],
815 tooltip => $vidmode_tooltip); 937 tooltip => $vidmode_tooltip);
816 $hbox->add (my $mode_label = new DC::UI::Label 938 $hbox->add (my $mode_label = new DC::UI::Label
817 height => 0.8, template => "9999x9999@9+9", 939 height => 0.8, template => "9999x9999@9+9",
818 can_events => 1, tooltip => $vidmode_tooltip); 940 can_events => 1, tooltip => $vidmode_tooltip);
819 941
820 $mode_slider->connect (changed => sub { 942 $MODE_SLIDER->connect (changed => sub {
821 my ($self, $value) = @_; 943 my ($self, $value) = @_;
822 944
823 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 945 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
824 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 946 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
825 }); 947 });
826 $mode_slider->emit (changed => $mode_slider->{range}[0]); 948 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
827 949
828 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 950 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
829 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 951 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
830 state => $CFG->{fullscreen}, 952 state => $CFG->{fullscreen},
831 tooltip => "Bring the client into fullscreen mode.", 953 tooltip => "Bring the client into fullscreen mode.",
832 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 954 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
833 ); 955 );
834 956
835 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
836 $table->add_at (1, $row++, new DC::UI::CheckBox 958 $table->add_at (1, $row++, new DC::UI::CheckBox
837 state => $CFG->{force_opengl11}, 959 state => $CFG->{force_opengl11},
838 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 960 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
839 . "higher memory usage and slower performance. It will, however, help tremendously on " 961 . "higher memory usage and slower performance. It will, however, help tremendously on "
840 . "cards that claim to support a feature but fall back to software rendering. " 962 . "cards that claim to support a feature but fall back to software rendering. "
841 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 963 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
842 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 964 . "but cards and drivers from other vendors (ATI) are often just as bad. "
843 . "experience extremely low framerates and your card should do better, try this option.</b>", 965 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
844 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 966 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
845 ); 967 );
846 968
969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
970 $table->add_at (1, $row++, new DC::UI::CheckBox
971 state => $CFG->{disable_alpha},
972 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
973 . "by disabling a number of textures and transparency effects. Normally, these "
974 . "effects do not cost a lot of resources, but some graphics cards might fall "
975 . "back to extremely slow rendering if this is enabled. If disabling this option "
976 . "noticably improves the framerate of the client please report this! "
977 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
978 on_changed => sub {
979 my ($self, $value) = @_;
980 $CFG->{disable_alpha} = $value;
981 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
982 0
983 }
984 );
985
847 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
848 $table->add_at (1, $row++, new DC::UI::CheckBox 987 $table->add_at (1, $row++, new DC::UI::CheckBox
849 state => $CFG->{texture_compression}, 988 state => $CFG->{texture_compression},
850 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 989 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
851 . "will save a lot of memory and increase performance. The compression algorithm " 990 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
852 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 991 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
853 . "forced OpenGL 1.1 mode.", 992 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
854 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 993 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
855 ); 994 );
856 995
857 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 996 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
858 $table->add_at (1, $row++, new DC::UI::CheckBox 997 $table->add_at (1, $row++, new DC::UI::CheckBox
859 state => $CFG->{fast}, 998 state => $CFG->{fast},
860 tooltip => "Lower the visual quality considerably to speed up rendering.", 999 tooltip => "Lower the visual quality considerably to speed up rendering.",
861 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
862 ); 1001 );
863 1002
864 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
865 $table->add_at (1, $row++, new DC::UI::Slider 1004 $table->add_at (1, $row++, new DC::UI::Slider
866 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1005 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
867 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1006 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
868 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1007 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
869 ); 1008 );
870 1009
871 $table->add_at (1, $row++, new DC::UI::Button 1010 $table->add_at (1, $row++, new DC::UI::Button
872 expand => 1, text => "Apply", 1011 expand => 1, text => "Apply",
873 tooltip => "Apply the video settings above.", 1012 tooltip => "Apply the video settings above.",
874 on_activate => sub { 1013 on_activate => sub {
875 video_shutdown (); 1014 video_shutdown ();
876 video_init (); 1015 video_init ();
1016 0
877 0 1017 }
878 } 1018 );
1019 }
1020
1021 {
1022 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1023
1024 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1025
1026 my $row = 0;
1027 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1028 $table->add_at (1, $row++, new DC::UI::CheckBox
1029 state => $CFG->{smooth_movement},
1030 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1031 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1032 . "then disable this option. Changes take effect immdiately.",
1033 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
879 ); 1034 );
880 1035
1036 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1037 $table->add_at (1, $row++, new DC::UI::CheckBox
1038 state => $CFG->{smooth_transitions},
1039 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1040 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1041 . "then disable this option. Requires Smooth Movement and OpenGL 1.4 or up. Changes take effect immdiately.",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1043 );
1044
1045
881 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
882 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
883 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1048 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
884 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1049 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
885 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1050 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
886 ); 1051 );
887 1052
888 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
889 $table->add_at (1, $row++, new DC::UI::CheckBox 1054 $table->add_at (1, $row++, new DC::UI::CheckBox
890 state => $CFG->{map_smoothing}, 1055 state => $CFG->{map_smoothing},
891 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1056 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
892 . "This increases load on the graphics subsystem and works only with TRT servers. " 1057 . "This increases load on the graphics subsystem and works only with TRT servers. "
893 . "Changes take effect at next login only.", 1058 . "Changes take effect at next login only.",
894 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1059 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
895 ); 1060 );
896 1061
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1062 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
898 $table->add_at (1, $row++, new DC::UI::CheckBox 1063 $table->add_at (1, $row++, new DC::UI::CheckBox
899 state => $CFG->{fow_enable}, 1064 state => $CFG->{fow_enable},
900 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1065 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
901 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
902 ); 1067 );
903 1068
1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1070 $table->add_at (1, $row++, new DC::UI::ImageButton
1071 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1072 bg => [0.3, 0.3, 0.2],
1073 force_w => 64,
1074 force_h => 64,
1075 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1076 on_activate => sub {
1077 my ($self) = @_;
1078 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1079 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1080 }
1081 );
1082
904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1083 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
905 $table->add_at (1, $row++, new DC::UI::Slider 1084 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1085 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
907 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1086 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
908 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1087 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
909 ); 1088 );
910 1089
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1090 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
912 $table->add_at (1, $row++, new DC::UI::Slider 1091 $table->add_at (1, $row++, new DC::UI::Slider
913 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1092 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
914 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1093 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
915 . "but you still need to press apply to correctly re-layout the widget.", 1094 . "but you still need to press apply to correctly re-layout the widget.",
916 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1095 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
917 ); 1096 );
918 1097
919 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1098 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
920 $table->add_at (1, $row++, new DC::UI::Slider 1099 $table->add_at (1, $row++, new DC::UI::Slider
921 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1100 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
922 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1101 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
923 on_changed => sub { 1102 on_changed => sub {
924 $CFG->{gauge_fontsize} = $_[1]; 1103 $CFG->{gauge_fontsize} = $_[1];
925 &set_gauge_window_fontsize; 1104 &set_gauge_window_fontsize;
1105 0
926 0 1106 }
927 } 1107 );
928 );
929 1108
930 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1109 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
931 $table->add_at (1, $row++, new DC::UI::Slider 1110 $table->add_at (1, $row++, new DC::UI::Slider
932 range => [$CFG->{gauge_size}, 0.2, 0.8], 1111 range => [$CFG->{gauge_size}, 0.2, 0.8],
933 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1112 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
934 on_changed => sub { 1113 on_changed => sub {
935 $CFG->{gauge_size} = $_[1]; 1114 $CFG->{gauge_size} = $_[1];
936 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1115 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1116 0
937 0 1117 }
938 } 1118 );
939 ); 1119 }
940 1120
941 $vbox 1121 $vbox
942} 1122}
943 1123
944our $AUDIO_HW_CHUNKSIZE; 1124our $AUDIO_HW_CHUNKSIZE;
1107} 1287}
1108 1288
1109sub make_gauge_window { 1289sub make_gauge_window {
1110 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1290 my $gh = int $HEIGHT * $CFG->{gauge_size};
1111 1291
1112 my $win = new DC::UI::Frame ( 1292 $GAUGES->{win} = my $win = new DC::UI::Frame (
1113 force_x => 0, 1293 force_x => 0,
1114 force_y => "max", 1294 force_y => "max",
1115 force_w => $WIDTH, 1295 force_w => $WIDTH,
1116 force_h => $gh, 1296 force_h => $gh,
1117 ); 1297 );
1133 (new DC::UI::Empty expand => 1), 1313 (new DC::UI::Empty expand => 1),
1134 (my $hb = new DC::UI::HBox), 1314 (my $hb = new DC::UI::HBox),
1135 ], 1315 ],
1136 ); 1316 );
1137 1317
1138 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1318 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1139 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1319 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1140 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1320 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1141 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1321 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1142
1143 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1144 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1145 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1146 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1147
1148 $GAUGES = {
1149 exp => $exp, prg => $prg, sklprg => $sklprg,
1150 win => $win, range => $rng,
1151 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1152 };
1153 1322
1154 &set_gauge_window_fontsize; 1323 &set_gauge_window_fontsize;
1155 1324
1156 $win 1325 $win
1157} 1326}
1499 ); 1668 );
1500 1669
1501 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1670 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1502 $table->add_at (1, 4, new DC::UI::Entry 1671 $table->add_at (1, 4, new DC::UI::Entry
1503 text => $CFG->{profile}{default}{user}, 1672 text => $CFG->{profile}{default}{user},
1504 tooltip => "The name of your character on the server.", 1673 tooltip => "The name of your character on the server. The name is case-sensitive!",
1505 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1674 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1506 ); 1675 );
1507 1676
1508 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1677 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1509 $table->add_at (1, 5, new DC::UI::Entry 1678 $table->add_at (1, 5, new DC::UI::Entry
1523 1 1692 1
1524 }, 1693 },
1525 ); 1694 );
1526 1695
1527 $vbox->add (new DC::UI::FancyFrame 1696 $vbox->add (new DC::UI::FancyFrame
1528 label => "Registering", 1697 label => "How to Play",
1529 min_h => 200, 1698 min_h => 240,
1530 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1699 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1531 markup => 1700 markup =>
1701 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1702 . "Then register a new account (or use an existing one if you have one). "
1532 "To register a new account, choose a username that hasn't been taken yet and " 1703 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1533 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1704 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1534 ), 1705 ),
1535 ); 1706 );
1536 1707
1537 $vbox 1708 $vbox
1609 1780
1610 my $row = 0; 1781 my $row = 0;
1611 1782
1612 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1783 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1613 $table->add_at (1, $row++, new DC::UI::CheckBox 1784 $table->add_at (1, $row++, new DC::UI::CheckBox
1785 c_colspan => 2,
1614 state => $CFG->{show_tips}, 1786 state => $CFG->{show_tips},
1615 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1787 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1616 on_changed => sub { 1788 on_changed => sub {
1617 my ($self, $value) = @_; 1789 my ($self, $value) = @_;
1618 $CFG->{show_tips} = $value; 1790 $CFG->{show_tips} = $value;
1619 0 1791 0
1620 } 1792 }
1621 ); 1793 );
1622 1794
1623 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1795 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1624 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1796 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1797 c_colspan => 2,
1625 text => $CFG->{logview_max_par}, 1798 text => $CFG->{logview_max_par},
1626 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1799 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1627 . "sends more messages than this number, older messages get removed to save memory and " 1800 . "sends more messages than this number, older messages get removed to save memory and "
1628 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1801 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1629 on_changed => sub { 1802 on_changed => sub {
1630 my ($self, $value) = @_; 1803 my ($self, $value) = @_;
1631 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1804 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1632 0 1805 0
1633 }, 1806 },
1634 ); 1807 );
1635 1808
1809 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1810 $table->add_at (1, $row, new DC::UI::CheckBox
1811 state => $CFG->{config_autosave},
1812 tooltip => "Normally, configuration settings and the user interface layout "
1813 . "are saved on client exit. You can disable this behaviour by "
1814 . "unchecking this checkbox.",
1815 on_changed => sub {
1816 my ($self, $value) = @_;
1817 $CFG->{config_autosave} = $value;
1818 0
1819 }
1820 );
1821 $table->add_at (2, $row++, new DC::UI::Button
1822 text => "Save Now",
1823 tooltip => "Use this to manually save configuration and UI layout when "
1824 . "autosave is disabled.",
1825 on_activate => sub {
1826 DC::write_cfg;
1827 0
1828 }
1829 );
1830
1636 $table 1831 $table
1637} 1832}
1638 1833
1639sub autopickup_setup { 1834sub autopickup_setup {
1640 my $r = new DC::UI::ScrolledWindow ( 1835 my $r = new DC::UI::ScrolledWindow (
1646 col_expand => [0, 1, 0, 1], 1841 col_expand => [0, 1, 0, 1],
1647 ); 1842 );
1648 1843
1649 for ( 1844 for (
1650 ["General", 0, 0, 1845 ["General", 0, 0,
1651 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1652 ["Inhibit autopickup" => PICKUP_INHIBIT], 1846# ["Inhibit autopickup" => PICKUP_INHIBIT],
1653 ["Stop before pickup" => PICKUP_STOP], 1847 ["Stop before pickup" => PICKUP_STOP],
1654 ["Debug autopickup" => PICKUP_DEBUG], 1848 ["Debug autopickup" => PICKUP_DEBUG],
1655 ], 1849 ],
1656 ["Weapons", 0, 6, 1850 ["Weapons", 0, 6,
1657 ["All weapons" => PICKUP_ALLWEAPON], 1851 ["All weapons" => PICKUP_ALLWEAPON],
1683 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1877 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1684 ["Ignore cursed" => PICKUP_NOT_CURSED], 1878 ["Ignore cursed" => PICKUP_NOT_CURSED],
1685 ["Jewelery" => PICKUP_JEWELS], 1879 ["Jewelery" => PICKUP_JEWELS],
1686 ["Flesh" => PICKUP_FLESH], 1880 ["Flesh" => PICKUP_FLESH],
1687 ], 1881 ],
1688 ["Weight/Value ratio", 2, 17] 1882 ["Value/Weight ratio", 2, 17]
1689 ) 1883 )
1690 { 1884 {
1691 my ($title, $x, $y, @bits) = @$_; 1885 my ($title, $x, $y, @bits) = @$_;
1692 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1886 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1693 1887
1705 $::CFG->{pickup} |= $mask; 1899 $::CFG->{pickup} |= $mask;
1706 } else { 1900 } else {
1707 $::CFG->{pickup} &= ~$mask; 1901 $::CFG->{pickup} &= ~$mask;
1708 } 1902 }
1709 1903
1710 $::CONN->send_command ("pickup $::CFG->{pickup}") 1904 $::CONN->send_pickup ($::CFG->{pickup})
1711 if defined $::CONN; 1905 if defined $::CONN;
1712 1906
1713 0 1907 0
1714 }); 1908 });
1715 1909
1718 } 1912 }
1719 1913
1720 $table->add_at (2, 18, new DC::UI::ValSlider 1914 $table->add_at (2, 18, new DC::UI::ValSlider
1721 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1915 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1722 template => ">= 99", 1916 template => ">= 99",
1917 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1723 to_value => sub { ">= " . 5 * $_[0] }, 1918 to_value => sub { ">= " . 5 * $_[0] },
1724 on_changed => sub { 1919 on_changed => sub {
1725 my ($slider, $value) = @_; 1920 my ($slider, $value) = @_;
1726 1921
1727 $::CFG->{pickup} &= ~0xF; 1922 $::CFG->{pickup} &= ~0xF;
1731 }); 1926 });
1732 1927
1733 $table->add_at (3, 18, new DC::UI::Button 1928 $table->add_at (3, 18, new DC::UI::Button
1734 text => "set", 1929 text => "set",
1735 on_activate => sub { 1930 on_activate => sub {
1736 $::CONN->send_command ("pickup $::CFG->{pickup}") 1931 $::CONN->send_pickup ($::CFG->{pickup})
1737 if defined $::CONN; 1932 if defined $::CONN;
1738 0 1933 0
1739 }); 1934 });
1740 1935
1741 $r 1936 $r
1742} 1937}
1743 1938
1744my %SORT_ORDER = ( 1939my %SORT_ORDER = (
1745 type => undef, 1940 type => sub {
1941 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1942 },
1746 mtime => sub { 1943 mtime => sub {
1747 my $NOW = time; 1944 my $NOW = time;
1748 sort { 1945 sort {
1749 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1946 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1750 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1947 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1781 $::CFG->{inv_sort} = $_[1]; 1978 $::CFG->{inv_sort} = $_[1];
1782 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1979 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1783 }, 1980 },
1784 ); 1981 );
1785 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1982 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1786 #TODO# update to weigh/maxweight 1983 #TODO# update to weight/maxweight
1787 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1984 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1788 1985
1789 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1986 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1790 $sw1->add ($INV = new DC::UI::Inventory); 1987 $sw1->add ($INV = new DC::UI::Inventory);
1791 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1988 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1852 $PL_NOTEBOOK->set_current_page ($widget); 2049 $PL_NOTEBOOK->set_current_page ($widget);
1853 $PL_WINDOW->show; 2050 $PL_WINDOW->show;
1854 } 2051 }
1855} 2052}
1856 2053
1857sub player_window { 2054sub make_playerbook {
1858 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2055 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1859 x => "center", 2056 x => "center",
1860 y => "center", 2057 y => "center",
1861 force_w => $WIDTH * 9/10, 2058 force_w => $WIDTH * 9/10,
1862 force_h => $HEIGHT * 9/10, 2059 force_h => $HEIGHT * 9/10,
1896 "License, Author and Source info for media sent by the server."); 2093 "License, Author and Source info for media sent by the server.");
1897 2094
1898 $ntb->set_current_page ($INVENTORY_PAGE); 2095 $ntb->set_current_page ($INVENTORY_PAGE);
1899 2096
1900 $plwin->add ($ntb); 2097 $plwin->add ($ntb);
1901 $plwin
1902} 2098}
1903 2099
1904sub keyboard_setup { 2100sub keyboard_setup {
1905 DC::Macro::keyboard_setup 2101 DC::Macro::keyboard_setup
1906} 2102}
1907 2103
1908sub help_window { 2104sub make_help_window {
1909 my $win = new DC::UI::Toplevel 2105 my $win = new DC::UI::Toplevel
1910 x => 'center', 2106 x => 'center',
1911 y => 'center', 2107 y => 'center',
1912 z => 4, 2108 z => 4,
1913 name => 'doc_browser', 2109 name => 'doc_browser',
1972 my @path = DC::Pod::full_path_of $node; 2168 my @path = DC::Pod::full_path_of $node;
1973 pop @path; # drop current node 2169 pop @path; # drop current node
1974 2170
1975 for my $node (@path) { 2171 for my $node (@path) {
1976 $buttons->add (new DC::UI::Button 2172 $buttons->add (new DC::UI::Button
1977 text => $node->{kw}[0], 2173 text => $node->[DC::Pod::N_KW][0],
1978 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2174 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1979 on_activate => sub { 2175 on_activate => sub {
1980 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2176 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1981 $load_node->($node); 2177 $load_node->($node);
1982 }, 2178 },
1983 ); 2179 );
1984 $buttons->add (new DC::UI::Label text => "/"); 2180 $buttons->add (new DC::UI::Label text => "/");
1985 } 2181 }
1986 2182
1987 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2183 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1988 2184
1989 $curnode = $node; 2185 $curnode = $node;
1990 2186
1991 $viewer->clear; 2187 $viewer->clear;
1992 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2188 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
2002 2198
2003 $load_node->((DC::Pod::find @path)[0]); 2199 $load_node->((DC::Pod::find @path)[0]);
2004 $win->show; 2200 $win->show;
2005 }; 2201 };
2006 2202
2007 $win 2203 $HELP_WINDOW = $win;
2008}
2009
2010sub open_string_query {
2011 my ($title, $cb, $txt, $tooltip) = @_;
2012 my $dialog = new DC::UI::Toplevel
2013 x => "center",
2014 y => "center",
2015 z => 50,
2016 force_w => $WIDTH * 4/5,
2017 title => $title;
2018
2019 $dialog->add (
2020 my $e = new DC::UI::Entry
2021 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2022 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2023 tooltip => $tooltip
2024 );
2025
2026 $e->grab_focus;
2027 $e->set_text ($txt) if $txt;
2028 $dialog->show;
2029} 2204}
2030 2205
2031sub open_quit_dialog { 2206sub open_quit_dialog {
2032 unless ($QUIT_DIALOG) { 2207 unless ($QUIT_DIALOG) {
2033 $QUIT_DIALOG = new DC::UI::Toplevel 2208 $QUIT_DIALOG = new DC::UI::Toplevel
2055 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2230 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2056 ); 2231 );
2057 $hb->add (new DC::UI::Button 2232 $hb->add (new DC::UI::Button
2058 text => "Quit anyway", 2233 text => "Quit anyway",
2059 expand => 1, 2234 expand => 1,
2060 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2235 on_activate => sub {
2236 crash "Quit anyway";
2237 EV::unloop EV::UNLOOP_ALL;
2238 },
2061 ); 2239 );
2062 } 2240 }
2063 2241
2064 $QUIT_DIALOG->show; 2242 $QUIT_DIALOG->show;
2065 $QUIT_DIALOG->grab_focus; 2243 $QUIT_DIALOG->grab_focus;
2244}
2245
2246sub make_menubar {
2247 $MENUFRAME = new DC::UI::Toplevel
2248 border => 0,
2249 force_x => 0,
2250 force_y => 0,
2251 force_w => $::WIDTH,
2252 child => ($MENUBAR = new DC::UI::HBox),
2253 ;
2254
2255 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2256
2257 # 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
2258 make_gauge_window->show;
2259
2260# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2261# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2262
2263 make_playerbook;
2264
2265 $MENUPOPUP = DC::UI::Menu->new (items => [
2266 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2267 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2268 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2269 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2270 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2271 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2272 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2273 ["Quit…" , sub {
2274 if ($CONN) {
2275 open_quit_dialog;
2276 } else {
2277 EV::unloop EV::UNLOOP_ALL;
2278 }
2279 }],
2280 ]);
2281
2282 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2283 tooltip => "Shows the main menu",
2284 on_button_down => sub {
2285 my ($self, $ev) = @_;
2286 local $ev->{x} = 0;
2287 local $ev->{y} = 0;
2288 $MENUPOPUP->popup ($ev);
2289 },
2290 );
2291
2292 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2293 padding_x => 6,
2294 padding_y => 3,
2295 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2296 template => " Exp: 888,888,888,888 (lvl 188) ",
2297 );
2298
2299 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2300 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2301 . "will automatically pick up items as defined by your item pickup settings "
2302 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2303 . "disable autopickup by disabling this checkbox.",
2304 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2305 on_changed => sub {
2306 my ($self, $value) = @_;
2307 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2308 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2309 $CONN->send_pickup ($CFG->{pickup})
2310 if $CONN;
2311 },
2312 );
2313
2314 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2315 c_rescale => 1,
2316 padding_x => 6,
2317 padding_y => 3,
2318 force_w => $::WIDTH * 0.2,
2319 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2320 template => "two handed weapons 99%",
2321 );
2322
2323 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2324 expand => 1,
2325 align => 1, can_hover => 1, can_events => 1,
2326 text => "Range and Combat Slots",
2327 tooltip => "#stat_ranged",
2328 );
2329
2330 $MENUFRAME->show;
2331}
2332
2333sub open_string_query {
2334 my ($title, $cb, $txt, $tooltip) = @_;
2335 my $dialog = new DC::UI::Toplevel
2336 x => "center",
2337 y => "center",
2338 z => 50,
2339 force_w => $WIDTH * 4/5,
2340 title => $title;
2341
2342 $dialog->add (
2343 my $e = new DC::UI::Entry
2344 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2345 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2346 tooltip => $tooltip
2347 );
2348
2349 $e->grab_focus;
2350 $e->set_text ($txt) if $txt;
2351 $dialog->show;
2066} 2352}
2067 2353
2068sub show_tip_of_the_day { 2354sub show_tip_of_the_day {
2069 # find all tips 2355 # find all tips
2070 my @tod = DC::Pod::find tip_of_the_day => "*"; 2356 my @tod = DC::Pod::find tip_of_the_day => "*";
2118 $dialog->show; 2404 $dialog->show;
2119 }; 2405 };
2120} 2406}
2121 2407
2122sub sdl_init { 2408sub sdl_init {
2123 DC::SDL_Init 2409 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2124 and die "SDL::Init failed!\n"; 2410 and die "SDL::Init failed!\n";
2125} 2411}
2126 2412
2127sub video_init { 2413sub video_init {
2414 DC::set_theme $CFG->{uitheme};
2415
2416 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2417 $SDL_REINIT = 0;
2418
2419 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2420 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2421 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2422 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2423
2424 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2425
2128 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2426 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2427 $CFG->{sdl_mode} = 0; # lowest resolution by default
2428
2429 # now choose biggest mode <= 1024x768
2430 for (0 .. $#SDL_MODES) {
2431 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2432 $CFG->{sdl_mode} = $_;
2433 }
2434 }
2435 }
2129 2436
2130 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2437 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2131 2438
2132 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2439 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2133 $FULLSCREEN = $CFG->{fullscreen}; 2440 $FULLSCREEN = $CFG->{fullscreen};
2134 $FAST = $CFG->{fast}; 2441 $FAST = $CFG->{fast};
2135 2442
2443 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2136 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2444 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2445 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2137 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2446 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2138 2447
2139 $SDL_ACTIVE = 1; 2448 $SDL_ACTIVE = 1;
2140 $LAST_REFRESH = time - 0.01; 2449 $LAST_REFRESH = time - 0.01;
2141 2450
2178 can_events => 1, 2487 can_events => 1,
2179 can_hover => 1, 2488 can_hover => 1,
2180 markup => "", 2489 markup => "",
2181 align => 0, 2490 align => 0,
2182 font => $FONT_FIXED, 2491 font => $FONT_FIXED,
2183 tooltip => "#modifier_box"; 2492 tooltip => "#modifier_box",
2493 tooltip_width => 0.67,
2494 ;
2184 2495
2185 update_modbox; 2496 update_modbox;
2186 2497
2187 (new DC::UI::Frame 2498 (new DC::UI::Frame
2188 bg => [0, 0, 0, 0.4], 2499 bg => [0, 0, 0, 0.4],
2189 force_x => 0, 2500 force_x => 0,
2190 force_y => "max", 2501 force_y => "max",
2191 child => (my $LR = new DC::UI::VBox), 2502 child => (my $LL = new DC::UI::VBox),
2192 )->show; 2503 )->show;
2193 2504
2194 $LR->add ($STATUSBOX); 2505 $LL->add ($STATUSBOX);
2195 $LR->add ($MODBOX); 2506 $LL->add ($MODBOX);
2196 $LR->add (new DC::UI::Label 2507 $LL->add (new DC::UI::Label
2197 align => 0, 2508 align => 0,
2198 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2509 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2199 fontsize => 0.5, 2510 fontsize => 0.5,
2200 fg => [1, 1, 0, 0.7], 2511 fg => [1, 1, 0, 0.7],
2201 ); 2512 );
2202 2513
2203 DC::UI::Toplevel->new ( 2514 DC::UI::Toplevel->new (
2204 title => "Minimap", 2515 title => "Minimap",
2205 name => "mapmap", 2516 name => "mapmap",
2206 x => 0, 2517 x => 0,
2207 y => $FONTSIZE + 8, 2518 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2208 border_bg => [1, 1, 1, 192/255], 2519 border_bg => [1, 1, 1, 192/255],
2209 bg => [1, 1, 1, 0], 2520 bg => [1, 1, 1, 0],
2210 child => ($MAPMAP = new DC::MapWidget::MapMap 2521 child => ($MAPMAP = new DC::MapWidget::MapMap
2211 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2522 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2212 ), 2523 ),
2213 )->show; 2524 )->show;
2214 2525
2215 $MAPWIDGET = new DC::MapWidget; 2526 $MAPWIDGET = new DC::MapWidget;
2216 $MAPWIDGET->connect (activate_console => sub { 2527 $MAPWIDGET->connect (activate_console => sub {
2237 force_h => $::HEIGHT * 0.6, 2548 force_h => $::HEIGHT * 0.6,
2238 has_close_button => 1, 2549 has_close_button => 1,
2239 ; 2550 ;
2240 2551
2241 $METASERVER = metaserver_dialog; 2552 $METASERVER = metaserver_dialog;
2242 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2553 # the name is changed to not conflict with the older name as users could have hidden it
2554 $MESSAGE_WINDOW = new DC::UI::Dockbar
2555 name => "message_window2",
2556 title => 'Messages',
2557 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2558 force_w => $::WIDTH * 0.6,
2559 force_h => $::HEIGHT * 0.25,
2560 ;
2561
2243 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2562 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2244 2563
2245 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2564 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2246 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2565 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2247 2566
2248 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2567 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2249 "Configure the server to play on, your username and password."); 2568 "Configure the server to play on, your username and password.");
2250 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2569 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2263 . "After pressing the combo the binding will be saved automatically and the " 2582 . "After pressing the combo the binding will be saved automatically and the "
2264 . "binding editor closes"); 2583 . "binding editor closes");
2265 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2584 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2266 "Some debuggin' options. Do not ask."); 2585 "Some debuggin' options. Do not ask.");
2267 2586
2268 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2587 make_help_window;
2588 make_menubar;
2269 2589
2270 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2271 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2272
2273 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2274 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2275
2276 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
2277
2278 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2279 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2280
2281 $BUTTONBAR->add (new DC::UI::Button
2282 text => "Save Config",
2283 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2284 on_activate => sub {
2285 $::CFG->{layout} = DC::UI::get_layout;
2286 DC::write_cfg "$Deliantra::VARDIR/client.cf";
2287 status "Configuration Saved";
2288 0
2289 },
2290 );
2291
2292 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2293 tooltip => "View Documentation");
2294
2295
2296 $BUTTONBAR->add (new DC::UI::Button
2297 text => "Quit",
2298 tooltip => "Terminates the program",
2299 on_activate => sub {
2300 if ($CONN) {
2301 open_quit_dialog;
2302 } else {
2303 EV::unloop EV::UNLOOP_ALL;
2304 }
2305 0
2306 },
2307 );
2308
2309 $BUTTONBAR->show;
2310 $SETUP_DIALOG->show; 2590 $SETUP_DIALOG->show;
2311 $MESSAGE_WINDOW->show; 2591 $MESSAGE_WINDOW->show;
2312 } 2592 }
2313 2593
2594 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2595 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2596
2597 $CAVEAT_LABEL->set_text ("None :)");
2598 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2599 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2600 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2601 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2602
2314 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2603 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2315} 2604}
2316 2605
2317sub video_shutdown { 2606sub video_shutdown {
2318 DC::OpenGL::shutdown; 2607 DC::OpenGL::shutdown;
2608 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2319 2609
2320 undef $SDL_ACTIVE; 2610 undef $SDL_ACTIVE;
2321} 2611}
2322 2612
2323my %animate_object; 2613my %animate_object;
2342my $want_refresh = EV::prepare_ns \&force_refresh; 2632my $want_refresh = EV::prepare_ns \&force_refresh;
2343 2633
2344my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2634my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2345 $NOW = EV::now; 2635 $NOW = EV::now;
2346 2636
2347 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2637 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2348 for DC::poll_events; 2638 for DC::poll_events;
2349 2639
2350 if (%animate_object) { 2640 if (%animate_object) {
2351 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2641 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2352 $WANT_REFRESH = 1; 2642 $WANT_REFRESH = 1;
2364sub animation_stop { 2654sub animation_stop {
2365 my ($widget) = @_; 2655 my ($widget) = @_;
2366 delete $animate_object{$widget}; 2656 delete $animate_object{$widget};
2367} 2657}
2368 2658
2369%SDL_CB = (
2370 DC::SDL_QUIT => sub { 2659$SDL_CB[DC::SDL_QUIT] = sub {
2660 crash "SDL_QUIT";
2371 EV::unloop EV::UNLOOP_ALL; 2661 EV::unloop EV::UNLOOP_ALL;
2372 }, 2662};
2373 DC::SDL_VIDEORESIZE => sub { 2663$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2374 },
2375 DC::SDL_VIDEOEXPOSE => sub { 2664$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2376 DC::UI::full_refresh; 2665 DC::UI::full_refresh;
2377 }, 2666};
2378 DC::SDL_ACTIVEEVENT => sub { 2667$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2379# not useful, as APPACTIVE includes only iconified state, not unmapped 2668# not useful, as APPACTIVE includes only iconified state, not unmapped
2380# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2669# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2381# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2670# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2382# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2671# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2383# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2672# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2384# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2673# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2385 }, 2674};
2386 DC::SDL_KEYDOWN => sub { 2675$SDL_CB[DC::SDL_KEYDOWN] = sub {
2387 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2676 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2388 # alt-enter 2677 # alt-enter
2678 video_shutdown;
2389 $FULLSCREEN_ENABLE->toggle; 2679 $FULLSCREEN_ENABLE->toggle;
2390 video_shutdown;
2391 video_init; 2680 video_init;
2392 } else { 2681 } else {
2393 &DC::UI::feed_sdl_key_down_event; 2682 &DC::UI::feed_sdl_key_down_event;
2394 } 2683 }
2395 update_modbox; 2684 update_modbox;
2396 }, 2685};
2397 DC::SDL_KEYUP => sub { 2686$SDL_CB[DC::SDL_KEYUP] = sub {
2398 &DC::UI::feed_sdl_key_up_event; 2687 &DC::UI::feed_sdl_key_up_event;
2399 update_modbox; 2688 update_modbox;
2400 }, 2689};
2401 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2690$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2402 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2691$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2403 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2692$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2404 DC::SDL_USEREVENT => sub { 2693$SDL_CB[DC::SDL_USEREVENT] = sub {
2405 if ($_[0]{code} == 1) { 2694 if ($_[0]{code} == 1) {
2406 audio_channel_finished $_[0]{data1}; 2695 audio_channel_finished $_[0]{data1};
2407 } elsif ($_[0]{code} == 0) { 2696 } elsif ($_[0]{code} == 0) {
2408 audio_music_finished; 2697 audio_music_finished;
2409 }
2410 }, 2698 }
2411); 2699};
2412 2700
2413############################################################################# 2701#############################################################################
2414 2702
2415$SIG{INT} = $SIG{TERM} = sub { 2703$SIG{INT} = $SIG{TERM} = sub {
2416 EV::unloop; 2704 EV::unloop;
2417 #d# TODO calling exit here hangs the process in some futex 2705 #d# TODO calling exit here hangs the process in some futex
2418}; 2706};
2419 2707
2420{ 2708# due to mac os x + sdl combined braindamage, we need this contortion
2709sub main {
2710 {
2711 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2712
2421 if (-e "$Deliantra::VARDIR/client.cf") { 2713 if (-e "$Deliantra::VARDIR/client.cf") {
2422 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2714 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2423 } else { 2715 } else {
2424 #TODO: compatibility cruft 2716 #TODO: compatibility cruft
2425 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2717 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2426 print STDERR "INFO: used old configuration file\n"; 2718 print STDERR "INFO: used old configuration file\n";
2427 } 2719 }
2428 2720
2429 DC::DB::Server::run; 2721 DC::DB::Server::run;
2430 2722
2723 if ($CFG->{db_schema} < 1) {
2724 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2725 DC::DB::nuke_db;
2726 $CFG->{db_schema} = 1;
2727 DC::write_cfg;
2728 }
2729
2730 DC::DB::open_db;
2731
2431 DC::UI::set_layout ($::CFG->{layout}); 2732 DC::UI::set_layout ($::CFG->{layout});
2432 2733
2433 my %DEF_CFG = ( 2734 my %DEF_CFG = (
2735 config_autosave => 1,
2434 sdl_mode => 0, 2736 sdl_mode => undef,
2435 fullscreen => 1, 2737 fullscreen => 1,
2436 fast => 0, 2738 fast => 0,
2437 force_opengl11 => undef, 2739 force_opengl11 => undef,
2740 disable_alpha => 0,
2741 smooth_movement => 1,
2742 smooth_transitions => 1,
2438 texture_compression => 1, 2743 texture_compression => 1,
2439 map_scale => 1, 2744 map_scale => 1,
2440 fow_enable => 1, 2745 fow_enable => 1,
2441 fow_intensity => 0, 2746 fow_intensity => 0,
2747 fow_texture => 0,
2442 map_smoothing => 1, 2748 map_smoothing => 1,
2443 gui_fontsize => 1, 2749 gui_fontsize => 1,
2444 log_fontsize => 0.7, 2750 log_fontsize => 0.7,
2445 gauge_fontsize => 1, 2751 gauge_fontsize => 1,
2446 gauge_size => 0.35, 2752 gauge_size => 0.35,
2447 stat_fontsize => 0.7, 2753 stat_fontsize => 0.7,
2448 mapsize => 100, 2754 mapsize => 100,
2449 audio_enable => 1, 2755 audio_enable => 1,
2450 audio_hw_channels => 0, 2756 audio_hw_channels => 0,
2451 audio_hw_frequency => 0, 2757 audio_hw_frequency => 0,
2452 audio_hw_chunksize => 0, 2758 audio_hw_chunksize => 0,
2453 audio_mix_channels => 8, 2759 audio_mix_channels => 8,
2454 effects_enable => 1, 2760 effects_enable => 1,
2455 effects_volume => 1, 2761 effects_volume => 1,
2456 bgm_enable => 1, 2762 bgm_enable => 1,
2457 bgm_volume => 0.5, 2763 bgm_volume => 0.5,
2458 output_rate => "", 2764 output_rate => "",
2459 pickup => 0, 2765 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2460 inv_sort => "mtime", 2766 inv_sort => "mtime",
2461 default => "profile", # default profile 2767 default => "profile", # default profile
2462 show_tips => 1, 2768 show_tips => 1,
2463 logview_max_par => 1000, 2769 logview_max_par => 1000,
2770 shift_fire_stop => 0,
2771 uitheme => "wood",
2772 map_shift_x => -24, # arbitrary
2773 map_shift_y => +24, # arbitrary
2464 ); 2774 );
2465 2775
2466 while (my ($k, $v) = each %DEF_CFG) { 2776 while (my ($k, $v) = each %DEF_CFG) {
2467 $CFG->{$k} = $v unless exists $CFG->{$k}; 2777 $CFG->{$k} = $v unless exists $CFG->{$k};
2468 } 2778 }
2469 2779
2470 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2780 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2471 $PROFILE = $CFG->{profile}{default}; 2781 $PROFILE = $CFG->{profile}{default};
2472 2782
2473 # convert old bindings (only default profile matters) 2783 # convert old bindings (only default profile matters)
2474 if (my $bindings = delete $PROFILE->{bindings}) { 2784 if (my $bindings = delete $PROFILE->{bindings}) {
2475 while (my ($mod, $syms) = each %$bindings) { 2785 while (my ($mod, $syms) = each %$bindings) {
2476 while (my ($sym, $cmds) = each %$syms) { 2786 while (my ($sym, $cmds) = each %$syms) {
2477 push @{ $PROFILE->{macro} }, { 2787 push @{ $PROFILE->{macro} }, {
2478 accelkey => [$mod*1, $sym*1], 2788 accelkey => [$mod*1, $sym*1],
2479 action => $cmds, 2789 action => $cmds,
2790 };
2480 }; 2791 }
2481 } 2792 }
2482 } 2793 }
2483 }
2484 2794
2485 sdl_init; 2795 sdl_init;
2486 2796
2487 @SDL_MODES = DC::SDL_ListModes 8, 8; 2797 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2488 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2798 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2489 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2490 2799
2491 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2800 {
2492
2493 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2494
2495 {
2496 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2801 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2497 DejaVuSans.ttf 2802 DejaVuSans.ttf
2498 DejaVuSansMono.ttf 2803 DejaVuSansMono.ttf
2499 DejaVuSans-Bold.ttf 2804 DejaVuSans-Bold.ttf
2500 DejaVuSansMono-Bold.ttf 2805 DejaVuSansMono-Bold.ttf
2501 DejaVuSans-Oblique.ttf 2806 DejaVuSans-Oblique.ttf
2502 DejaVuSansMono-Oblique.ttf 2807 DejaVuSansMono-Oblique.ttf
2503 DejaVuSans-BoldOblique.ttf 2808 DejaVuSans-BoldOblique.ttf
2504 DejaVuSansMono-BoldOblique.ttf 2809 DejaVuSansMono-BoldOblique.ttf
2810 mona.ttf
2505 ); 2811 );
2506 2812
2507 DC::add_font $_ for @fonts; 2813 DC::add_font $_ for @fonts;
2508 2814
2509 DC::pango_init;
2510
2511 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2815 $FONT_PROP = new_from_file DC::Font $fonts[0];
2512 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2816 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2513 2817
2514 $FONT_PROP->make_default; 2818 $FONT_PROP->make_default;
2515 } 2819
2820 DC::pango_init;
2821 }
2516 2822
2517# compare mono (ft) vs. rgba (cairo) 2823# compare mono (ft) vs. rgba (cairo)
2518# ft - 1.8s, cairo 3s, even in alpha-only mode 2824# ft - 1.8s, cairo 3s, even in alpha-only mode
2519# for my $rgba (0..1) { 2825# for my $rgba (0..1) {
2520# my $t1 = Time::HiRes::time; 2826# my $t1 = Time::HiRes::time;
2525# } 2831# }
2526# my $t2 = Time::HiRes::time; 2832# my $t2 = Time::HiRes::time;
2527# warn $t2-$t1; 2833# warn $t2-$t1;
2528# } 2834# }
2529 2835
2530 video_init; 2836 video_init;
2531 audio_init; 2837 audio_init;
2532} 2838 }
2533 2839
2534show_tip_of_the_day if $CFG->{show_tips}; 2840 show_tip_of_the_day if $CFG->{show_tips};
2535 2841
2536our $STARTUP_CANCEL = EV::idle sub { 2842 our $STARTUP_CANCEL = EV::idle sub {
2537 undef $::STARTUP_CANCEL; 2843 undef $::STARTUP_CANCEL;
2538 $startup_done->(); 2844 $startup_done->();
2539}; 2845 };
2540 2846
2847 delete $SIG{__DIE__};
2541EV::loop; 2848 EV::loop;
2542 2849
2850 DC::write_cfg if $CFG->{config_autosave};
2851
2543#video_shutdown; 2852 #video_shutdown;
2544#audio_shutdown; 2853 #audio_shutdown;
2854
2545DC::OpenGL::quit; 2855 DC::OpenGL::quit;
2546DC::SDL_Quit; 2856 DC::SDL_Quit;
2547DC::DB::Server::stop; 2857 DC::DB::Server::stop;
2858}
2859
2860DC::SDL_braino; # see sub above
2548 2861
2549=head1 NAME 2862=head1 NAME
2550 2863
2551deliantra - A Deliantra MORPG game client 2864deliantra - A Deliantra MORPG game client
2552 2865
2569 4 show fps 2882 4 show fps
2570 8 suppress tooltips 2883 8 suppress tooltips
2571 2884
2572=head1 AUTHOR 2885=head1 AUTHOR
2573 2886
2574Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2887Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2575 2888
2576 2889
2577 2890

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines