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.25 by elmex, Sun Jan 6 17:40:45 2008 UTC vs.
Revision 1.84 by root, Fri Jan 9 22:38:17 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: $!"; 61 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 my $PANGO = <$fh>; 62 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
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"; 63 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 64 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 65 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 66 }
75 67
76 unshift @INC, $root; 68 unshift @INC, $root;
77 } 69 }
78} 70}
… …
90 82
91# need to do it again because that pile of garbage called PAR nukes it before main 83# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 84unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 85 if %PAR::LibCache;
94 86
95use Time::HiRes 'time';
96use EV; 87use EV;
88BEGIN { *time = \&EV::time }
89
97use List::Util qw(max min); 90use List::Util qw(max min);
98 91
99use Deliantra; 92use Deliantra;
100use Deliantra::Protocol::Constants; 93use Deliantra::Protocol::Constants;
101 94
95use AnyEvent::Util ();
96use AnyEvent::Socket ();
97use AnyEvent::DNS ();
98
102use Compress::LZF; 99use Compress::LZF;
100use JSON::XS;
103 101
104use DC; 102use DC;
103
104sub crash($;$) {
105 # nop during compiletime
106}
107
108BEGIN {
109 $SIG{__DIE__} = sub {
110 return if $^S;
111 crash "CRASH/DIE: $_[0]" => 1;
112 DC::fatal Carp::longmess "$_[0]";
113 }
114}
115
105use DC::OpenGL (); 116use DC::OpenGL ();
106use DC::Protocol; 117use DC::Protocol;
107use DC::DB; 118use DC::DB;
108use DC::UI; 119use DC::UI;
109use DC::UI::Canvas; 120use DC::UI::Canvas;
110use DC::UI::Inventory; 121use DC::UI::Inventory;
111use DC::UI::SpellList; 122use DC::UI::SpellList;
112use DC::UI::Dockable; 123use DC::UI::Dockable;
113use DC::UI::Dockbar; 124use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 125use DC::UI::ChatView;
116use DC::MessageDistributor; 126use DC::MessageDistributor;
117use DC::Pod; 127use DC::Pod;
118use DC::MapWidget; 128use DC::MapWidget;
119use DC::Macro; 129use DC::Macro;
120 130
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 131$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 132$SIG{PIPE} = 'IGNORE';
123 133
124$EV::DIED = sub { 134$EV::DIED = sub {
135 crash "CRASH/EV::DIED: $@" => 0;
125 DC::fatal Carp::longmess $@; 136 DC::fatal Carp::longmess $@;
126}; 137};
127 138
128my $MAX_FPS = 60; 139my $MAX_FPS = 60;
129 140
… …
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;
164
165our $CONN;
150 166
151our $MAP; 167our $MAP;
152our $MAPMAP; 168our $MAPMAP;
153our $MAPWIDGET; 169our $MAPWIDGET;
154our $COMPLETER; 170our $COMPLETER;
… …
190our $SDL_ACTIVE; 206our $SDL_ACTIVE;
191our %SDL_CB; 207our %SDL_CB;
192 208
193our $ALT_ENTER_MESSAGE; 209our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 210our $STATUSBOX;
211our $MODBOX;
195our $DEBUG_STATUS; 212our $DEBUG_STATUS;
196 213
197our $INV; 214our $INV;
198our $INVR; 215our $INVR;
199our $INVR_HB; 216our $INVR_HB;
200 217
201############################################################################# 218#############################################################################
202 219
220# write a crash message blockingly to the socket, if possible
221# this is a bit too complicated for my tastes, but it was easy.
222*crash = sub($;$) {
223 my ($msg, $backtrace) = @_;
224
225 warn $msg;
226
227 return unless $CONN;
228
229 my $fh = $CONN->{fh}
230 or return;
231
232 my $buf = delete $CONN->{wbuf};
233
234 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
235
236 AnyEvent::Util::fh_nonblocking $fh, 0;
237 syswrite $fh, $buf;
238 AnyEvent::Util::fh_nonblocking $fh, 1;
239
240 $msg =~ s/\s+$//;
241
242 # backtrace as second step, in case it crashes, too
243 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
244 if $backtrace;
245};
246
247sub clienterror($;$) {
248 my ($msg, $backtrace) = @_;
249
250 warn $msg;
251
252 return unless $CONN;
253
254 $CONN->send_exti_msg (clientlog => $msg);
255 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
256}
257
258#############################################################################
259
203sub status { 260sub status {
204 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 261 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
205} 262}
206 263
207sub debug { 264sub debug {
208 $DEBUG_STATUS->set_text ($_[0]); 265 $DEBUG_STATUS->set_text ($_[0]);
209} 266}
210 267
211sub message { 268sub message {
212 $MESSAGE_DIST->message (@_); 269 $MESSAGE_DIST->message (@_);
270}
271
272sub update_modbox {
273 my $mod = DC::SDL_GetModState;
274
275 my $markup;
276
277 $markup .= $mod & DC::KMOD_CTRL
278 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
279 : "[<span foreground='#888'> once </span>]";
280
281 $markup .= $mod & DC::KMOD_SHIFT
282 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
283 : "[<span foreground='#888'>move</span>]";
284
285 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
286 ? "[ALT]"
287 : "[<span foreground='#888'>alt</span>]";
288
289 $markup .= $mod & DC::KMOD_NUM
290 ? "[NUM]"
291 : "[<span foreground='#888'>num</span>]";
292
293 # <tt> around next statement works around some bug that keeps the
294 # "font =>" from being used on windows
295 $MODBOX->set_markup ("<tt>$markup</tt>");
213} 296}
214 297
215############################################################################# 298#############################################################################
216#TODO: maybe move into own audio module... 299#TODO: maybe move into own audio module...
217 300
… …
333 my $rwops = $meta->{path} 416 my $rwops = $meta->{path}
334 ? new_from_file DC::RW $meta->{path} 417 ? new_from_file DC::RW $meta->{path}
335 : new DC::RW $$MUSIC_PLAYING_DATA; 418 : new DC::RW $$MUSIC_PLAYING_DATA;
336 419
337 $MUSIC_PLAYER = new DC::MixMusic $rwops 420 $MUSIC_PLAYER = new DC::MixMusic $rwops
338 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 421 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
339 422
340 my $NOW = time; 423 my $NOW = time;
341 424
342 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 425 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
343 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 426 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
637 # right: accept 720 # right: accept
638 $table->add_at (4, 0, new DC::UI::Button 721 $table->add_at (4, 0, new DC::UI::Button
639 text => "Accept", 722 text => "Accept",
640 on_activate => sub { 723 on_activate => sub {
641 $conn->send ("reply n"); 724 $conn->send ("reply n");
642 $STATS_PAGE->hide;
643 destroy_query_dialog $conn; 725 destroy_query_dialog $conn;
644 0 726 0
645 }, 727 },
646 ); 728 );
647 729
… …
699 781
700 $vbox->add (@dialog); 782 $vbox->add (@dialog);
701 $dialog->show; 783 $dialog->show;
702} 784}
703 785
704sub start_game { 786sub dc_connect {
705 status "logging in..."; 787 my ($host, $port) = @_;
706 788
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; 789 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
790 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
711 791
712 my ($host, $port) = split /:/, $PROFILE->{host};
713
714 $MAP = new DC::Map;
715
716 $CONN = eval { 792 $CONN =
717 new DC::Protocol 793 new DC::Protocol
718 host => $host, 794 host => $host,
719 port => $port || 13327, 795 port => $port,
720 user => $PROFILE->{user}, 796 user => $PROFILE->{user},
721 pass => $PROFILE->{password}, 797 pass => $PROFILE->{password},
722 mapw => $mapsize, 798 mapw => $mapw,
723 maph => $mapsize, 799 maph => $maph,
724 800
725 client => "cfplus $DC::VERSION $] $^O", 801 client => "$DC::VERSION $] $^O",
726 802
727 map_widget => $MAPWIDGET, 803 map_widget => $MAPWIDGET,
728 statusbox => $STATUSBOX, 804 statusbox => $STATUSBOX,
729 map => $MAP, 805 map => $MAP,
730 mapmap => $MAPMAP, 806 mapmap => $MAPMAP,
731 query => \&server_query, 807 query => \&server_query,
732 808
733 setup_req => { 809 setup_req => {
734 smoothing => $CFG->{map_smoothing}*1, 810 smoothing => $CFG->{map_smoothing}*1,
735 }, 811 },
736 };
737 812
738 if ($CONN) { 813 on_connect => sub {
814 if ($_[0]) {
739 DC::lowdelay fileno $CONN->{fh}; 815 DC::lowdelay fileno $CONN->{fh};
740 816
741 status "login successful"; 817 status "login successful";
818 } else {
819 undef $CONN;
820 status "unable to connect: $!";
821 stop_game();
822 }
823 },
824 ;
825}
826
827sub start_game {
828 status "logging in...";
829
830 $LOGIN_BUTTON->set_text ("Logout");
831 $SETUP_DIALOG->hide;
832
833 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
834
835 $MAP = new DC::Map;
836
837 # hack to make SURE we find the IP address all right
838 # can be removed once AnyEvent::DNS is proven stable.
839 if ($host eq "gameserver.deliantra.net") {
840 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
841 if ($_[0] ne "80.101.114.108") { # Perl
842 status "dns failure, using hardcoded address";
843 $host = "129.13.162.95";
844 }
845
846 dc_connect $host, $port;
847 };
742 } else { 848 } else {
743 status "unable to connect"; 849 dc_connect $host, $port;
744 stop_game();
745 } 850 }
746} 851}
747 852
748sub stop_game { 853sub stop_game {
854 crash "stop_game";
855
749 $LOGIN_BUTTON->set_text ("Login / Register"); 856 $LOGIN_BUTTON->set_text ("Login / Register");
750 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 857 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
751 $SETUP_DIALOG->show; 858 $SETUP_DIALOG->show;
752 $PL_WINDOW->hide; 859 $PL_WINDOW->hide;
753 $SPELL_LIST->clear_spells; 860 $SPELL_LIST->clear_spells;
… …
767} 874}
768 875
769sub graphics_setup { 876sub graphics_setup {
770 my $vbox = new DC::UI::VBox; 877 my $vbox = new DC::UI::VBox;
771 878
879 {
880 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
881
772 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 882 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
773 883
774 my $row = 0; 884 my $row = 0;
775 885
776 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 886 $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, 887 $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, 888 can_events => 1,
779 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 889 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
780 890
891 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
892 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
893 can_events => 1,
894 tooltip => "This field shows any known issues with your config or driver, such as "
895 . "a non-accelerated display format. You can try to work around these issues "
896 . "by selecting a different video mode, changing the settings below or "
897 . "by installing the right driver for your graphics card.");
898
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
900 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
901 value => $CFG->{uitheme},
902 options => [
903 [wood => "Wood (the default)"],
904 [plain => "Plain (very)"],
905 [blue => "Blue (dark)"],
906 [metal => "Metal (light)"],
907 ],
908 tooltip => "Choose the User Interface theme that you like most :)",
909 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
910 );
911
781 my $vidmode_tooltip = 912 my $vidmode_tooltip =
782 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 913 "<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>."; 914 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
784 915
785 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 916 $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); 917 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
787 918
788 $hbox->add (my $mode_slider = new DC::UI::Slider 919 $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], 920 force_w => $WIDTH * 0.1, expand => 1,
921 range => [ ($CFG->{sdl_mode}) x 3 ],
790 tooltip => $vidmode_tooltip); 922 tooltip => $vidmode_tooltip);
791 $hbox->add (my $mode_label = new DC::UI::Label 923 $hbox->add (my $mode_label = new DC::UI::Label
792 height => 0.8, template => "9999x9999@9+9", 924 height => 0.8, template => "9999x9999@9+9",
793 can_events => 1, tooltip => $vidmode_tooltip); 925 can_events => 1, tooltip => $vidmode_tooltip);
794 926
795 $mode_slider->connect (changed => sub { 927 $MODE_SLIDER->connect (changed => sub {
796 my ($self, $value) = @_; 928 my ($self, $value) = @_;
797 929
798 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 930 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
799 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 931 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
800 }); 932 });
801 $mode_slider->emit (changed => $mode_slider->{range}[0]); 933 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
802 934
803 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 935 $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 936 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
805 state => $CFG->{fullscreen}, 937 state => $CFG->{fullscreen},
806 tooltip => "Bring the client into fullscreen mode.", 938 tooltip => "Bring the client into fullscreen mode.",
807 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 939 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
808 ); 940 );
809 941
810 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 942 $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 943 $table->add_at (1, $row++, new DC::UI::CheckBox
812 state => $CFG->{force_opengl11}, 944 state => $CFG->{force_opengl11},
813 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 945 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 " 946 . "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. " 947 . "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, " 948 . "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 " 949 . "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>", 950 . "<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 } 951 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
820 ); 952 );
821 953
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
955 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{disable_alpha},
957 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
958 . "by disabling a number of textures and transparency effects. Normally, these "
959 . "effects do not cost a lot of resources, but some graphics cards might fall "
960 . "back to extremely slow rendering if this is enabled. If disabling this option "
961 . "noticably improves the framerate of the client please report this! "
962 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
963 on_changed => sub {
964 my ($self, $value) = @_;
965 $CFG->{disable_alpha} = $value;
966 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
967 0
968 }
969 );
970
822 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 971 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
823 $table->add_at (1, $row++, new DC::UI::CheckBox 972 $table->add_at (1, $row++, new DC::UI::CheckBox
824 state => $CFG->{texture_compression}, 973 state => $CFG->{texture_compression},
825 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 974 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 " 975 . "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 " 976 . "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.", 977 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
829 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 978 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
830 ); 979 );
831 980
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 981 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
833 $table->add_at (1, $row++, new DC::UI::CheckBox 982 $table->add_at (1, $row++, new DC::UI::CheckBox
834 state => $CFG->{fast}, 983 state => $CFG->{fast},
835 tooltip => "Lower the visual quality considerably to speed up rendering.", 984 tooltip => "Lower the visual quality considerably to speed up rendering.",
836 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
837 ); 986 );
838 987
839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
840 $table->add_at (1, $row++, new DC::UI::Slider 989 $table->add_at (1, $row++, new DC::UI::Slider
841 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 990 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.", 991 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 }, 992 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
844 ); 993 );
845 994
846 $table->add_at (1, $row++, new DC::UI::Button 995 $table->add_at (1, $row++, new DC::UI::Button
847 expand => 1, text => "Apply", 996 expand => 1, text => "Apply",
848 tooltip => "Apply the video settings above.", 997 tooltip => "Apply the video settings above.",
849 on_activate => sub { 998 on_activate => sub {
850 video_shutdown (); 999 video_shutdown ();
851 video_init (); 1000 video_init ();
1001 0
852 0 1002 }
853 } 1003 );
1004 }
1005
1006 {
1007 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1008
1009 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1010
1011 my $row = 0;
1012 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1013 $table->add_at (1, $row++, new DC::UI::CheckBox
1014 state => $CFG->{smooth_movement},
1015 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1016 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1017 . "then disable this option. Changes take effect immdiately.",
1018 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
854 ); 1019 );
855 1020
856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1021 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
857 $table->add_at (1, $row++, new DC::UI::Slider 1022 $table->add_at (1, $row++, new DC::UI::Slider
858 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1023 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
859 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1024 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
860 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1025 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
861 ); 1026 );
862 1027
863 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
864 $table->add_at (1, $row++, new DC::UI::CheckBox 1029 $table->add_at (1, $row++, new DC::UI::CheckBox
865 state => $CFG->{map_smoothing}, 1030 state => $CFG->{map_smoothing},
866 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1031 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. " 1032 . "This increases load on the graphics subsystem and works only with TRT servers. "
868 . "Changes take effect at next login only.", 1033 . "Changes take effect at next login only.",
869 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1034 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
870 ); 1035 );
871 1036
872 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1037 $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 1038 $table->add_at (1, $row++, new DC::UI::CheckBox
874 state => $CFG->{fow_enable}, 1039 state => $CFG->{fow_enable},
875 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1040 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 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
877 ); 1042 );
878 1043
879 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
880 $table->add_at (1, $row++, new DC::UI::Slider 1045 $table->add_at (1, $row++, new DC::UI::Slider
881 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1046 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.", 1047 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 } 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
884 ); 1049 );
885 1050
886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
887 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
888 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1053 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, " 1054 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.", 1055 . "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 }, 1056 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
892 ); 1057 );
893 1058
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1059 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
895 $table->add_at (1, $row++, new DC::UI::Slider 1060 $table->add_at (1, $row++, new DC::UI::Slider
896 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1061 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.", 1062 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
898 on_changed => sub { 1063 on_changed => sub {
899 $CFG->{gauge_fontsize} = $_[1]; 1064 $CFG->{gauge_fontsize} = $_[1];
900 &set_gauge_window_fontsize; 1065 &set_gauge_window_fontsize;
1066 0
901 0 1067 }
902 } 1068 );
903 );
904 1069
905 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
906 $table->add_at (1, $row++, new DC::UI::Slider 1071 $table->add_at (1, $row++, new DC::UI::Slider
907 range => [$CFG->{gauge_size}, 0.2, 0.8], 1072 range => [$CFG->{gauge_size}, 0.2, 0.8],
908 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1073 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
909 on_changed => sub { 1074 on_changed => sub {
910 $CFG->{gauge_size} = $_[1]; 1075 $CFG->{gauge_size} = $_[1];
911 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1076 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1077 0
912 0 1078 }
913 } 1079 );
914 ); 1080 }
915 1081
916 $vbox 1082 $vbox
917} 1083}
918 1084
919our $AUDIO_HW_CHUNKSIZE; 1085our $AUDIO_HW_CHUNKSIZE;
… …
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
… …
1528 1696
1529 $vbox->add ( 1697 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1698 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1699 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1700 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1701 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1702 on_changed => sub {
1535 my ($self, $value) = @_; 1703 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1704 $CFG->{profile}{default}{host} = $value;
1537 1 1705 1
1538 } 1706 }
… …
1541 if (0) { #d# disabled 1709 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1710 $vbox->add (new DC::UI::Button
1543 expand => 1, 1711 expand => 1,
1544 text => "Server List", 1712 text => "Server List",
1545 other => $METASERVER, 1713 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1714 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1715 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1716 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1717 );
1550 }#d# 1718 }#d#
1551 } 1719 }
… …
1593 $CFG->{show_tips} = $value; 1761 $CFG->{show_tips} = $value;
1594 0 1762 0
1595 } 1763 }
1596 ); 1764 );
1597 1765
1598 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1766 $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 1767 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1768 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1769 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 " 1770 . "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.", 1771 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1772 on_changed => sub {
1605 my ($self, $value) = @_; 1773 my ($self, $value) = @_;
1606 $MESSAGE_DIST->set_max_para ($CFG->{logview_max_par} = $value*1); 1774 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1775 0
1608 }, 1776 },
1609 ); 1777 );
1610 1778
1611 $table 1779 $table
… …
1658 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1826 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1659 ["Ignore cursed" => PICKUP_NOT_CURSED], 1827 ["Ignore cursed" => PICKUP_NOT_CURSED],
1660 ["Jewelery" => PICKUP_JEWELS], 1828 ["Jewelery" => PICKUP_JEWELS],
1661 ["Flesh" => PICKUP_FLESH], 1829 ["Flesh" => PICKUP_FLESH],
1662 ], 1830 ],
1663 ["Weight/Value ratio", 2, 17] 1831 ["Value/Weight ratio", 2, 17]
1664 ) 1832 )
1665 { 1833 {
1666 my ($title, $x, $y, @bits) = @$_; 1834 my ($title, $x, $y, @bits) = @$_;
1667 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1835 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1668 1836
… …
1693 } 1861 }
1694 1862
1695 $table->add_at (2, 18, new DC::UI::ValSlider 1863 $table->add_at (2, 18, new DC::UI::ValSlider
1696 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1864 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1697 template => ">= 99", 1865 template => ">= 99",
1866 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] }, 1867 to_value => sub { ">= " . 5 * $_[0] },
1699 on_changed => sub { 1868 on_changed => sub {
1700 my ($slider, $value) = @_; 1869 my ($slider, $value) = @_;
1701 1870
1702 $::CFG->{pickup} &= ~0xF; 1871 $::CFG->{pickup} &= ~0xF;
… …
1715 1884
1716 $r 1885 $r
1717} 1886}
1718 1887
1719my %SORT_ORDER = ( 1888my %SORT_ORDER = (
1720 type => undef, 1889 type => sub {
1890 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1891 },
1721 mtime => sub { 1892 mtime => sub {
1722 my $NOW = time; 1893 my $NOW = time;
1723 sort { 1894 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1895 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; 1896 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1756 $::CFG->{inv_sort} = $_[1]; 1927 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1928 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1929 },
1759 ); 1930 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1931 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1932 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1933 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1934
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1935 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1936 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1937 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1947 my @path = DC::Pod::full_path_of $node; 2118 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2119 pop @path; # drop current node
1949 2120
1950 for my $node (@path) { 2121 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2122 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2123 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2124 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2125 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2126 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2127 $load_node->($node);
1957 }, 2128 },
1958 ); 2129 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2130 $buttons->add (new DC::UI::Label text => "/");
1960 } 2131 }
1961 2132
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2133 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2134
1964 $curnode = $node; 2135 $curnode = $node;
1965 2136
1966 $viewer->clear; 2137 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2138 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2030 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2201 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2031 ); 2202 );
2032 $hb->add (new DC::UI::Button 2203 $hb->add (new DC::UI::Button
2033 text => "Quit anyway", 2204 text => "Quit anyway",
2034 expand => 1, 2205 expand => 1,
2035 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2206 on_activate => sub {
2207 crash "Quit anyway";
2208 EV::unloop EV::UNLOOP_ALL;
2209 },
2036 ); 2210 );
2037 } 2211 }
2038 2212
2039 $QUIT_DIALOG->show; 2213 $QUIT_DIALOG->show;
2040 $QUIT_DIALOG->grab_focus; 2214 $QUIT_DIALOG->grab_focus;
… …
2093 $dialog->show; 2267 $dialog->show;
2094 }; 2268 };
2095} 2269}
2096 2270
2097sub sdl_init { 2271sub sdl_init {
2098 DC::SDL_Init 2272 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2273 and die "SDL::Init failed!\n";
2100} 2274}
2101 2275
2102sub video_init { 2276sub video_init {
2277 DC::set_theme $CFG->{uitheme};
2278
2279 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2280 $SDL_REINIT = 0;
2281
2282 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2283 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2284 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2285 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2286
2287 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2288
2103 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2289 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2290 $CFG->{sdl_mode} = 0; # lowest resolution by default
2291
2292 # now choose biggest mode <= 1024x768
2293 for (0 .. $#SDL_MODES) {
2294 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2295 $CFG->{sdl_mode} = $_;
2296 }
2297 }
2298 }
2104 2299
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2300 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2301
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2302 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2303 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2304 $FAST = $CFG->{fast};
2110 2305
2306 # 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 2307 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2308 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2309 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2310
2114 $SDL_ACTIVE = 1; 2311 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2312 $LAST_REFRESH = time - 0.01;
2116 2313
… …
2146 force_x => "max", 2343 force_x => "max",
2147 force_y => 0; 2344 force_y => 0;
2148 $DEBUG_STATUS->show; 2345 $DEBUG_STATUS->show;
2149 2346
2150 $STATUSBOX = new DC::UI::Statusbox; 2347 $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]); 2348
2349 $MODBOX = new DC::UI::Label
2350 can_events => 1,
2351 can_hover => 1,
2352 markup => "",
2353 align => 0,
2354 font => $FONT_FIXED,
2355 tooltip => "#modifier_box",
2356 tooltip_width => 0.67,
2357 ;
2358
2359 update_modbox;
2152 2360
2153 (new DC::UI::Frame 2361 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2362 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2363 force_x => 0,
2156 force_y => "max", 2364 force_y => "max",
2157 child => $STATUSBOX, 2365 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2366 )->show;
2367
2368 $LR->add ($STATUSBOX);
2369 $LR->add ($MODBOX);
2370 $LR->add (new DC::UI::Label
2371 align => 0,
2372 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2373 fontsize => 0.5,
2374 fg => [1, 1, 0, 0.7],
2375 );
2159 2376
2160 DC::UI::Toplevel->new ( 2377 DC::UI::Toplevel->new (
2161 title => "Minimap", 2378 title => "Minimap",
2162 name => "mapmap", 2379 name => "mapmap",
2163 x => 0, 2380 x => 0,
2164 y => $FONTSIZE + 8, 2381 y => $FONTSIZE + 8,
2165 border_bg => [1, 1, 1, 192/255], 2382 border_bg => [1, 1, 1, 192/255],
2166 bg => [1, 1, 1, 0], 2383 bg => [1, 1, 1, 0],
2167 child => ($MAPMAP = new DC::MapWidget::MapMap 2384 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.", 2385 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2169 ), 2386 ),
2170 )->show; 2387 )->show;
2171 2388
2172 $MAPWIDGET = new DC::MapWidget; 2389 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2390 $MAPWIDGET->connect (activate_console => sub {
… …
2194 force_h => $::HEIGHT * 0.6, 2411 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2412 has_close_button => 1,
2196 ; 2413 ;
2197 2414
2198 $METASERVER = metaserver_dialog; 2415 $METASERVER = metaserver_dialog;
2199 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2416 # the name is changed to not conflict with the older name as users could have hidden it
2417 $MESSAGE_WINDOW = new DC::UI::Dockbar
2418 name => "message_window2",
2419 title => 'Messages',
2420 force_w => $::WIDTH * 0.6,
2421 force_h => $::HEIGHT * 0.25,
2422 ;
2423
2200 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2424 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2425
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2426 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2427 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2428
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2429 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2430 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2431 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2449 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2450
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2451 $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."); 2452 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2453
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2454# $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."); 2455# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2456
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 2457 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 2458
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2459 $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."); 2460 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2238 $BUTTONBAR->add (new DC::UI::Button 2462 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2463 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.", 2464 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 { 2465 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2466 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2467 DC::write_cfg;
2244 status "Configuration Saved"; 2468 status "Configuration Saved";
2245 0 2469 0
2246 }, 2470 },
2247 ); 2471 );
2248 2472
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2473 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2474 tooltip => "View Documentation");
2251
2252 2475
2253 $BUTTONBAR->add (new DC::UI::Button 2476 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2477 text => "Quit",
2255 tooltip => "Terminates the program", 2478 tooltip => "Terminates the program",
2256 on_activate => sub { 2479 on_activate => sub {
… …
2266 $BUTTONBAR->show; 2489 $BUTTONBAR->show;
2267 $SETUP_DIALOG->show; 2490 $SETUP_DIALOG->show;
2268 $MESSAGE_WINDOW->show; 2491 $MESSAGE_WINDOW->show;
2269 } 2492 }
2270 2493
2494 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2495 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2496
2497 $CAVEAT_LABEL->set_text ("None :)");
2498 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2499 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2500
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2501 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2502}
2273 2503
2274sub video_shutdown { 2504sub video_shutdown {
2275 DC::OpenGL::shutdown; 2505 DC::OpenGL::shutdown;
2506 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2507
2277 undef $SDL_ACTIVE; 2508 undef $SDL_ACTIVE;
2278} 2509}
2279 2510
2280my %animate_object; 2511my %animate_object;
… …
2323 delete $animate_object{$widget}; 2554 delete $animate_object{$widget};
2324} 2555}
2325 2556
2326%SDL_CB = ( 2557%SDL_CB = (
2327 DC::SDL_QUIT => sub { 2558 DC::SDL_QUIT => sub {
2559 crash "SDL_QUIT";
2328 EV::unloop EV::UNLOOP_ALL; 2560 EV::unloop EV::UNLOOP_ALL;
2329 }, 2561 },
2330 DC::SDL_VIDEORESIZE => sub { 2562 DC::SDL_VIDEORESIZE => sub {
2331 }, 2563 },
2332 DC::SDL_VIDEOEXPOSE => sub { 2564 DC::SDL_VIDEOEXPOSE => sub {
… …
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2573# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2574 },
2343 DC::SDL_KEYDOWN => sub { 2575 DC::SDL_KEYDOWN => sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2576 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2577 # alt-enter
2578 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2579 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2580 video_init;
2349 } else { 2581 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2582 &DC::UI::feed_sdl_key_down_event;
2351 } 2583 }
2584 update_modbox;
2352 }, 2585 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2586 DC::SDL_KEYUP => sub {
2587 &DC::UI::feed_sdl_key_up_event;
2588 update_modbox;
2589 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2590 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2591 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2592 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2593 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2594 if ($_[0]{code} == 1) {
… …
2368$SIG{INT} = $SIG{TERM} = sub { 2604$SIG{INT} = $SIG{TERM} = sub {
2369 EV::unloop; 2605 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2606 #d# TODO calling exit here hangs the process in some futex
2371}; 2607};
2372 2608
2373{ 2609# due to mac os x + sdl combined braindamage, we need this contortion
2610sub main {
2611 {
2612 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2613
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2614 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2615 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2616 } else {
2377 #TODO: compatibility cruft 2617 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2618 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2619 print STDERR "INFO: used old configuration file\n";
2380 } 2620 }
2381 2621
2382 DC::DB::Server::run; 2622 DC::DB::Server::run;
2383 2623
2624 if ($CFG->{db_schema} < 1) {
2625 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2626 DC::DB::nuke_db;
2627 $CFG->{db_schema} = 1;
2628 DC::write_cfg;
2629 }
2630
2631 DC::DB::open_db;
2632
2384 DC::UI::set_layout ($::CFG->{layout}); 2633 DC::UI::set_layout ($::CFG->{layout});
2385 2634
2386 my %DEF_CFG = ( 2635 my %DEF_CFG = (
2387 sdl_mode => 0, 2636 sdl_mode => undef,
2388 fullscreen => 1, 2637 fullscreen => 1,
2389 fast => 0, 2638 fast => 0,
2390 force_opengl11 => undef, 2639 force_opengl11 => undef,
2640 disable_alpha => 0,
2641 smooth_movement => 1,
2391 texture_compression => 1, 2642 texture_compression => 1,
2392 map_scale => 1, 2643 map_scale => 1,
2393 fow_enable => 1, 2644 fow_enable => 1,
2394 fow_intensity => 0, 2645 fow_intensity => 0,
2395 map_smoothing => 1, 2646 map_smoothing => 1,
2396 gui_fontsize => 1, 2647 gui_fontsize => 1,
2397 log_fontsize => 0.7, 2648 log_fontsize => 0.7,
2398 gauge_fontsize => 1, 2649 gauge_fontsize => 1,
2399 gauge_size => 0.35, 2650 gauge_size => 0.35,
2400 stat_fontsize => 0.7, 2651 stat_fontsize => 0.7,
2401 mapsize => 100, 2652 mapsize => 100,
2402 audio_enable => 1, 2653 audio_enable => 1,
2403 audio_hw_channels => 0, 2654 audio_hw_channels => 0,
2404 audio_hw_frequency => 0, 2655 audio_hw_frequency => 0,
2405 audio_hw_chunksize => 0, 2656 audio_hw_chunksize => 0,
2406 audio_mix_channels => 8, 2657 audio_mix_channels => 8,
2407 effects_enable => 1, 2658 effects_enable => 1,
2408 effects_volume => 1, 2659 effects_volume => 1,
2409 bgm_enable => 1, 2660 bgm_enable => 1,
2410 bgm_volume => 0.5, 2661 bgm_volume => 0.5,
2411 output_rate => "", 2662 output_rate => "",
2412 pickup => 0, 2663 pickup => 0,
2413 inv_sort => "mtime", 2664 inv_sort => "mtime",
2414 default => "profile", # default profile 2665 default => "profile", # default profile
2415 show_tips => 1, 2666 show_tips => 1,
2416 logview_max_par => 1000, 2667 logview_max_par => 1000,
2668 shift_fire_stop => 0,
2669 uitheme => "wood",
2417 ); 2670 );
2418 2671
2419 while (my ($k, $v) = each %DEF_CFG) { 2672 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2673 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2674 }
2422 2675
2423 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2676 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2424 $PROFILE = $CFG->{profile}{default}; 2677 $PROFILE = $CFG->{profile}{default};
2425 2678
2426 # convert old bindings (only default profile matters) 2679 # convert old bindings (only default profile matters)
2427 if (my $bindings = delete $PROFILE->{bindings}) { 2680 if (my $bindings = delete $PROFILE->{bindings}) {
2428 while (my ($mod, $syms) = each %$bindings) { 2681 while (my ($mod, $syms) = each %$bindings) {
2429 while (my ($sym, $cmds) = each %$syms) { 2682 while (my ($sym, $cmds) = each %$syms) {
2430 push @{ $PROFILE->{macro} }, { 2683 push @{ $PROFILE->{macro} }, {
2431 accelkey => [$mod*1, $sym*1], 2684 accelkey => [$mod*1, $sym*1],
2432 action => $cmds, 2685 action => $cmds,
2686 };
2433 }; 2687 }
2434 } 2688 }
2435 } 2689 }
2436 }
2437 2690
2438 sdl_init; 2691 sdl_init;
2439 2692
2440 @SDL_MODES = DC::SDL_ListModes 8, 8; 2693 {
2441 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2442 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2443
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2445
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447
2448 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2694 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2695 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2696 DejaVuSansMono.ttf
2452 DejaVuSans-Bold.ttf 2697 DejaVuSans-Bold.ttf
2453 DejaVuSansMono-Bold.ttf 2698 DejaVuSansMono-Bold.ttf
2454 DejaVuSans-Oblique.ttf 2699 DejaVuSans-Oblique.ttf
2455 DejaVuSansMono-Oblique.ttf 2700 DejaVuSansMono-Oblique.ttf
2456 DejaVuSans-BoldOblique.ttf 2701 DejaVuSans-BoldOblique.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2702 DejaVuSansMono-BoldOblique.ttf
2458 ); 2703 );
2459 2704
2460 DC::add_font $_ for @fonts; 2705 DC::add_font $_ for @fonts;
2461 2706
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2707 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2708 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2709
2467 $FONT_PROP->make_default; 2710 $FONT_PROP->make_default;
2468 } 2711
2712 DC::pango_init;
2713 }
2469 2714
2470# compare mono (ft) vs. rgba (cairo) 2715# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2716# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2717# for my $rgba (0..1) {
2473# my $t1 = Time::HiRes::time; 2718# my $t1 = Time::HiRes::time;
… …
2478# } 2723# }
2479# my $t2 = Time::HiRes::time; 2724# my $t2 = Time::HiRes::time;
2480# warn $t2-$t1; 2725# warn $t2-$t1;
2481# } 2726# }
2482 2727
2483 video_init; 2728 video_init;
2484 audio_init; 2729 audio_init;
2485} 2730 }
2486 2731
2487show_tip_of_the_day if $CFG->{show_tips}; 2732 show_tip_of_the_day if $CFG->{show_tips};
2488 2733
2489our $STARTUP_CANCEL = EV::idle sub { 2734 our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2735 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2736 $startup_done->();
2492}; 2737 };
2493 2738
2739 delete $SIG{__DIE__};
2494EV::loop; 2740 EV::loop;
2495 2741
2496#video_shutdown; 2742#video_shutdown;
2497#audio_shutdown; 2743#audio_shutdown;
2498DC::OpenGL::quit; 2744 DC::OpenGL::quit;
2499DC::SDL_Quit; 2745 DC::SDL_Quit;
2500DC::DB::Server::stop; 2746 DC::DB::Server::stop;
2747}
2748
2749DC::SDL_braino; # see sub above
2501 2750
2502=head1 NAME 2751=head1 NAME
2503 2752
2504deliantra - A Deliantra MORPG game client 2753deliantra - A Deliantra MORPG game client
2505 2754
… …
2522 4 show fps 2771 4 show fps
2523 8 suppress tooltips 2772 8 suppress tooltips
2524 2773
2525=head1 AUTHOR 2774=head1 AUTHOR
2526 2775
2527Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2776Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2528 2777
2529 2778
2530 2779

Diff Legend

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