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.27 by root, Fri Jan 25 14:30:09 2008 UTC vs.
Revision 1.85 by root, Sun Jan 11 03:19:47 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;
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;
… …
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;
214our $MODBOX;
195our $DEBUG_STATUS; 215our $DEBUG_STATUS;
196 216
197our $INV; 217our $INV;
198our $INVR; 218our $INVR;
199our $INVR_HB; 219our $INVR_HB;
200 220
201############################################################################# 221#############################################################################
202 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
203sub status { 263sub status {
204 $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]);
205} 265}
206 266
207sub debug { 267sub debug {
208 $DEBUG_STATUS->set_text ($_[0]); 268 $DEBUG_STATUS->set_text ($_[0]);
209} 269}
210 270
211sub message { 271sub message {
212 $MESSAGE_DIST->message (@_); 272 $MESSAGE_DIST->message (@_);
273}
274
275sub update_modbox {
276 my $mod = DC::SDL_GetModState;
277
278 my $markup;
279
280 $markup .= $mod & DC::KMOD_CTRL
281 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
282 : "[<span foreground='#888'> once </span>]";
283
284 $markup .= $mod & DC::KMOD_SHIFT
285 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
286 : "[<span foreground='#888'>move</span>]";
287
288 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
289 ? "[ALT]"
290 : "[<span foreground='#888'>alt</span>]";
291
292 $markup .= $mod & DC::KMOD_NUM
293 ? "[NUM]"
294 : "[<span foreground='#888'>num</span>]";
295
296 # <tt> around next statement works around some bug that keeps the
297 # "font =>" from being used on windows
298 $MODBOX->set_markup ("<tt>$markup</tt>");
213} 299}
214 300
215############################################################################# 301#############################################################################
216#TODO: maybe move into own audio module... 302#TODO: maybe move into own audio module...
217 303
… …
260 or return; 346 or return;
261 347
262 $meta->{data} 348 $meta->{data}
263 or return; 349 or return;
264 350
265 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
266 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
267 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
268 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
269 &audio_music_push ($face); 355 &audio_music_push ($face);
270 } 356 }
271 } else { 357 } else {
272 # fetch from database 358 # fetch from database
273 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
274 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
275 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
276 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;
277 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
278 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
279 365
280 audio_sound_push ($face); 366 audio_sound_push ($face);
281 }; 367 };
… …
328 414
329 audio_music_update_volume; 415 audio_music_update_volume;
330 416
331 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
332 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
333 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
334 ? 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
335 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
336 425
337 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
338 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
339 428
340 my $NOW = time; 429 my $NOW = time;
341 430
342 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
343 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
637 # right: accept 726 # right: accept
638 $table->add_at (4, 0, new DC::UI::Button 727 $table->add_at (4, 0, new DC::UI::Button
639 text => "Accept", 728 text => "Accept",
640 on_activate => sub { 729 on_activate => sub {
641 $conn->send ("reply n"); 730 $conn->send ("reply n");
642 $STATS_PAGE->hide;
643 destroy_query_dialog $conn; 731 destroy_query_dialog $conn;
644 0 732 0
645 }, 733 },
646 ); 734 );
647 735
… …
699 787
700 $vbox->add (@dialog); 788 $vbox->add (@dialog);
701 $dialog->show; 789 $dialog->show;
702} 790}
703 791
704sub start_game { 792sub dc_connect {
705 status "logging in..."; 793 my ($host, $port) = @_;
706 794
707 $LOGIN_BUTTON->set_text ("Logout");
708 $SETUP_DIALOG->hide;
709
710 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 795 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
796 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
711 797
712 my ($host, $port) = split /:/, $PROFILE->{host};
713
714 $MAP = new DC::Map;
715
716 $CONN = eval { 798 $CONN =
717 new DC::Protocol 799 new DC::Protocol
718 host => $host, 800 host => $host,
719 port => $port || 13327, 801 port => $port,
720 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
721 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
722 mapw => $mapsize, 804 mapw => $mapw,
723 maph => $mapsize, 805 maph => $maph,
724 806
725 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
726 808
727 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
728 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
… …
731 query => \&server_query, 813 query => \&server_query,
732 814
733 setup_req => { 815 setup_req => {
734 smoothing => $CFG->{map_smoothing}*1, 816 smoothing => $CFG->{map_smoothing}*1,
735 }, 817 },
736 };
737 818
738 if ($CONN) { 819 on_connect => sub {
820 if ($_[0]) {
739 DC::lowdelay fileno $CONN->{fh}; 821 DC::lowdelay fileno $CONN->{fh};
740 822
741 status "login successful"; 823 status "login successful";
824 } else {
825 undef $CONN;
826 status "unable to connect: $!";
827 stop_game();
828 }
829 },
830 ;
831}
832
833sub start_game {
834 status "logging in...";
835
836 $LOGIN_BUTTON->set_text ("Logout");
837 $SETUP_DIALOG->hide;
838
839 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
840
841 $MAP = new DC::Map;
842
843 # hack to make SURE we find the IP address all right
844 # can be removed once AnyEvent::DNS is proven stable.
845 if ($host eq "gameserver.deliantra.net") {
846 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
847 if ($_[0] ne "80.101.114.108") { # Perl
848 status "dns failure, using hardcoded address";
849 $host = "129.13.162.95";
850 }
851
852 dc_connect $host, $port;
853 };
742 } else { 854 } else {
743 status "unable to connect"; 855 dc_connect $host, $port;
744 stop_game();
745 } 856 }
746} 857}
747 858
748sub stop_game { 859sub stop_game {
860 crash "stop_game";
861
749 $LOGIN_BUTTON->set_text ("Login / Register"); 862 $LOGIN_BUTTON->set_text ("Login / Register");
750 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 863 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
751 $SETUP_DIALOG->show; 864 $SETUP_DIALOG->show;
752 $PL_WINDOW->hide; 865 $PL_WINDOW->hide;
753 $SPELL_LIST->clear_spells; 866 $SPELL_LIST->clear_spells;
… …
767} 880}
768 881
769sub graphics_setup { 882sub graphics_setup {
770 my $vbox = new DC::UI::VBox; 883 my $vbox = new DC::UI::VBox;
771 884
885 {
886 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
887
772 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 888 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
773 889
774 my $row = 0; 890 my $row = 0;
775 891
776 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 892 $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, 893 $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, 894 can_events => 1,
779 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 895 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
780 896
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
898 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
899 can_events => 1,
900 tooltip => "This field shows any known issues with your config or driver, such as "
901 . "a non-accelerated display format. You can try to work around these issues "
902 . "by selecting a different video mode, changing the settings below or "
903 . "by installing the right driver for your graphics card.");
904
905 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
906 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
907 value => $CFG->{uitheme},
908 options => [
909 [wood => "Wood (the default)"],
910 [plain => "Plain (very)"],
911 [blue => "Blue (dark)"],
912 [metal => "Metal (light)"],
913 ],
914 tooltip => "Choose the User Interface theme that you like most :)",
915 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
916 );
917
781 my $vidmode_tooltip = 918 my $vidmode_tooltip =
782 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 919 "<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>."; 920 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
784 921
785 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 922 $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); 923 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
787 924
788 $hbox->add (my $mode_slider = new DC::UI::Slider 925 $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], 926 c_rescale => 1,
927 force_w => $WIDTH * 0.1, expand => 1,
928 range => [ ($CFG->{sdl_mode}) x 3 ],
790 tooltip => $vidmode_tooltip); 929 tooltip => $vidmode_tooltip);
791 $hbox->add (my $mode_label = new DC::UI::Label 930 $hbox->add (my $mode_label = new DC::UI::Label
792 height => 0.8, template => "9999x9999@9+9", 931 height => 0.8, template => "9999x9999@9+9",
793 can_events => 1, tooltip => $vidmode_tooltip); 932 can_events => 1, tooltip => $vidmode_tooltip);
794 933
795 $mode_slider->connect (changed => sub { 934 $MODE_SLIDER->connect (changed => sub {
796 my ($self, $value) = @_; 935 my ($self, $value) = @_;
797 936
798 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 937 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
799 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 938 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
800 }); 939 });
801 $mode_slider->emit (changed => $mode_slider->{range}[0]); 940 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
802 941
803 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 942 $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 943 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
805 state => $CFG->{fullscreen}, 944 state => $CFG->{fullscreen},
806 tooltip => "Bring the client into fullscreen mode.", 945 tooltip => "Bring the client into fullscreen mode.",
807 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 946 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
808 ); 947 );
809 948
810 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 949 $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 950 $table->add_at (1, $row++, new DC::UI::CheckBox
812 state => $CFG->{force_opengl11}, 951 state => $CFG->{force_opengl11},
813 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 952 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 " 953 . "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. " 954 . "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, " 955 . "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 " 956 . "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>", 957 . "<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 } 958 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
820 ); 959 );
821 960
961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
962 $table->add_at (1, $row++, new DC::UI::CheckBox
963 state => $CFG->{disable_alpha},
964 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
965 . "by disabling a number of textures and transparency effects. Normally, these "
966 . "effects do not cost a lot of resources, but some graphics cards might fall "
967 . "back to extremely slow rendering if this is enabled. If disabling this option "
968 . "noticably improves the framerate of the client please report this! "
969 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
970 on_changed => sub {
971 my ($self, $value) = @_;
972 $CFG->{disable_alpha} = $value;
973 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
974 0
975 }
976 );
977
822 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 978 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
823 $table->add_at (1, $row++, new DC::UI::CheckBox 979 $table->add_at (1, $row++, new DC::UI::CheckBox
824 state => $CFG->{texture_compression}, 980 state => $CFG->{texture_compression},
825 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 981 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 " 982 . "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 " 983 . "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.", 984 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
829 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
830 ); 986 );
831 987
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
833 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
834 state => $CFG->{fast}, 990 state => $CFG->{fast},
835 tooltip => "Lower the visual quality considerably to speed up rendering.", 991 tooltip => "Lower the visual quality considerably to speed up rendering.",
836 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 992 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
837 ); 993 );
838 994
839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 995 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
840 $table->add_at (1, $row++, new DC::UI::Slider 996 $table->add_at (1, $row++, new DC::UI::Slider
841 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 997 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.", 998 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 }, 999 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
844 ); 1000 );
845 1001
846 $table->add_at (1, $row++, new DC::UI::Button 1002 $table->add_at (1, $row++, new DC::UI::Button
847 expand => 1, text => "Apply", 1003 expand => 1, text => "Apply",
848 tooltip => "Apply the video settings above.", 1004 tooltip => "Apply the video settings above.",
849 on_activate => sub { 1005 on_activate => sub {
850 video_shutdown (); 1006 video_shutdown ();
851 video_init (); 1007 video_init ();
1008 0
852 0 1009 }
853 } 1010 );
1011 }
1012
1013 {
1014 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1015
1016 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1017
1018 my $row = 0;
1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1020 $table->add_at (1, $row++, new DC::UI::CheckBox
1021 state => $CFG->{smooth_movement},
1022 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1023 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1024 . "then disable this option. Changes take effect immdiately.",
1025 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
854 ); 1026 );
855 1027
856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
857 $table->add_at (1, $row++, new DC::UI::Slider 1029 $table->add_at (1, $row++, new DC::UI::Slider
858 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1030 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
859 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1031 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
860 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1032 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
861 ); 1033 );
862 1034
863 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1035 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
864 $table->add_at (1, $row++, new DC::UI::CheckBox 1036 $table->add_at (1, $row++, new DC::UI::CheckBox
865 state => $CFG->{map_smoothing}, 1037 state => $CFG->{map_smoothing},
866 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1038 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. " 1039 . "This increases load on the graphics subsystem and works only with TRT servers. "
868 . "Changes take effect at next login only.", 1040 . "Changes take effect at next login only.",
869 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
870 ); 1042 );
871 1043
872 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1044 $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 1045 $table->add_at (1, $row++, new DC::UI::CheckBox
874 state => $CFG->{fow_enable}, 1046 state => $CFG->{fow_enable},
875 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1047 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 } 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
877 ); 1049 );
878 1050
879 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
880 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
881 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1053 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.", 1054 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 } 1055 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
884 ); 1056 );
885 1057
886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1058 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
887 $table->add_at (1, $row++, new DC::UI::Slider 1059 $table->add_at (1, $row++, new DC::UI::Slider
888 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1060 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, " 1061 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.", 1062 . "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 }, 1063 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
892 ); 1064 );
893 1065
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1066 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
895 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
896 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1068 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.", 1069 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
898 on_changed => sub { 1070 on_changed => sub {
899 $CFG->{gauge_fontsize} = $_[1]; 1071 $CFG->{gauge_fontsize} = $_[1];
900 &set_gauge_window_fontsize; 1072 &set_gauge_window_fontsize;
1073 0
901 0 1074 }
902 } 1075 );
903 );
904 1076
905 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1077 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
906 $table->add_at (1, $row++, new DC::UI::Slider 1078 $table->add_at (1, $row++, new DC::UI::Slider
907 range => [$CFG->{gauge_size}, 0.2, 0.8], 1079 range => [$CFG->{gauge_size}, 0.2, 0.8],
908 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1080 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
909 on_changed => sub { 1081 on_changed => sub {
910 $CFG->{gauge_size} = $_[1]; 1082 $CFG->{gauge_size} = $_[1];
911 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1083 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1084 0
912 0 1085 }
913 } 1086 );
914 ); 1087 }
915 1088
916 $vbox 1089 $vbox
917} 1090}
918 1091
919our $AUDIO_HW_CHUNKSIZE; 1092our $AUDIO_HW_CHUNKSIZE;
… …
1082} 1255}
1083 1256
1084sub make_gauge_window { 1257sub make_gauge_window {
1085 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1258 my $gh = int $HEIGHT * $CFG->{gauge_size};
1086 1259
1087 my $win = new DC::UI::Frame ( 1260 $GAUGES->{win} = my $win = new DC::UI::Frame (
1088 force_x => 0, 1261 force_x => 0,
1089 force_y => "max", 1262 force_y => "max",
1090 force_w => $WIDTH, 1263 force_w => $WIDTH,
1091 force_h => $gh, 1264 force_h => $gh,
1092 ); 1265 );
… …
1108 (new DC::UI::Empty expand => 1), 1281 (new DC::UI::Empty expand => 1),
1109 (my $hb = new DC::UI::HBox), 1282 (my $hb = new DC::UI::HBox),
1110 ], 1283 ],
1111 ); 1284 );
1112 1285
1113 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1286 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1114 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1287 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1115 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1288 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1116 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1289 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1117
1118 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1119 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1120 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1121 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1122
1123 $GAUGES = {
1124 exp => $exp, prg => $prg, sklprg => $sklprg,
1125 win => $win, range => $rng,
1126 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1127 };
1128 1290
1129 &set_gauge_window_fontsize; 1291 &set_gauge_window_fontsize;
1130 1292
1131 $win 1293 $win
1132} 1294}
… …
1498 1 1660 1
1499 }, 1661 },
1500 ); 1662 );
1501 1663
1502 $vbox->add (new DC::UI::FancyFrame 1664 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1665 label => "How to Play",
1504 min_h => 200, 1666 min_h => 240,
1505 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1667 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1668 markup =>
1669 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1670 . "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 " 1671 . "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.", 1672 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1673 ),
1510 ); 1674 );
1511 1675
1512 $vbox 1676 $vbox
… …
1528 1692
1529 $vbox->add ( 1693 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1694 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1695 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1696 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1697 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1698 on_changed => sub {
1535 my ($self, $value) = @_; 1699 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1700 $CFG->{profile}{default}{host} = $value;
1537 1 1701 1
1538 } 1702 }
… …
1541 if (0) { #d# disabled 1705 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1706 $vbox->add (new DC::UI::Button
1543 expand => 1, 1707 expand => 1,
1544 text => "Server List", 1708 text => "Server List",
1545 other => $METASERVER, 1709 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1710 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1711 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1712 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1713 );
1550 }#d# 1714 }#d#
1551 } 1715 }
… …
1584 1748
1585 my $row = 0; 1749 my $row = 0;
1586 1750
1587 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1751 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1588 $table->add_at (1, $row++, new DC::UI::CheckBox 1752 $table->add_at (1, $row++, new DC::UI::CheckBox
1753 c_colspan => 2,
1589 state => $CFG->{show_tips}, 1754 state => $CFG->{show_tips},
1590 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1755 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1591 on_changed => sub { 1756 on_changed => sub {
1592 my ($self, $value) = @_; 1757 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1758 $CFG->{show_tips} = $value;
1594 0 1759 0
1595 } 1760 }
1596 ); 1761 );
1597 1762
1598 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1763 $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 1764 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1765 c_colspan => 2,
1600 text => $CFG->{logview_max_par}, 1766 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1767 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 " 1768 . "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.", 1769 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1770 on_changed => sub {
1605 my ($self, $value) = @_; 1771 my ($self, $value) = @_;
1606 $MESSAGE_DIST->set_max_para ($CFG->{logview_max_par} = $value*1); 1772 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1773 0
1608 }, 1774 },
1775 );
1776
1777 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1778 $table->add_at (1, $row, new DC::UI::CheckBox
1779 state => $CFG->{config_autosave},
1780 tooltip => "Normally, configuration settings and the user interface layout "
1781 . "are saved on client exit. You can disable this behaviour by "
1782 . "unchecking this checkbox.",
1783 on_changed => sub {
1784 my ($self, $value) = @_;
1785 $CFG->{config_autosave} = $value;
1786 0
1787 }
1788 );
1789 $table->add_at (2, $row++, new DC::UI::Button
1790 text => "Save Now",
1791 tooltip => "Use this to manually save configuration and UI layout when "
1792 . "autosave is disabled.",
1793 on_activate => sub {
1794 DC::write_cfg;
1795 0
1796 }
1609 ); 1797 );
1610 1798
1611 $table 1799 $table
1612} 1800}
1613 1801
… …
1658 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1846 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1659 ["Ignore cursed" => PICKUP_NOT_CURSED], 1847 ["Ignore cursed" => PICKUP_NOT_CURSED],
1660 ["Jewelery" => PICKUP_JEWELS], 1848 ["Jewelery" => PICKUP_JEWELS],
1661 ["Flesh" => PICKUP_FLESH], 1849 ["Flesh" => PICKUP_FLESH],
1662 ], 1850 ],
1663 ["Weight/Value ratio", 2, 17] 1851 ["Value/Weight ratio", 2, 17]
1664 ) 1852 )
1665 { 1853 {
1666 my ($title, $x, $y, @bits) = @$_; 1854 my ($title, $x, $y, @bits) = @$_;
1667 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1855 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1668 1856
… …
1693 } 1881 }
1694 1882
1695 $table->add_at (2, 18, new DC::UI::ValSlider 1883 $table->add_at (2, 18, new DC::UI::ValSlider
1696 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1884 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1697 template => ">= 99", 1885 template => ">= 99",
1886 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] }, 1887 to_value => sub { ">= " . 5 * $_[0] },
1699 on_changed => sub { 1888 on_changed => sub {
1700 my ($slider, $value) = @_; 1889 my ($slider, $value) = @_;
1701 1890
1702 $::CFG->{pickup} &= ~0xF; 1891 $::CFG->{pickup} &= ~0xF;
… …
1715 1904
1716 $r 1905 $r
1717} 1906}
1718 1907
1719my %SORT_ORDER = ( 1908my %SORT_ORDER = (
1720 type => undef, 1909 type => sub {
1910 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1911 },
1721 mtime => sub { 1912 mtime => sub {
1722 my $NOW = time; 1913 my $NOW = time;
1723 sort { 1914 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1915 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; 1916 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1756 $::CFG->{inv_sort} = $_[1]; 1947 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1948 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1949 },
1759 ); 1950 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1951 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1952 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1953 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1954
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1955 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1956 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1957 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1827 $PL_NOTEBOOK->set_current_page ($widget); 2018 $PL_NOTEBOOK->set_current_page ($widget);
1828 $PL_WINDOW->show; 2019 $PL_WINDOW->show;
1829 } 2020 }
1830} 2021}
1831 2022
1832sub player_window { 2023sub make_playerbook {
1833 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2024 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1834 x => "center", 2025 x => "center",
1835 y => "center", 2026 y => "center",
1836 force_w => $WIDTH * 9/10, 2027 force_w => $WIDTH * 9/10,
1837 force_h => $HEIGHT * 9/10, 2028 force_h => $HEIGHT * 9/10,
… …
1871 "License, Author and Source info for media sent by the server."); 2062 "License, Author and Source info for media sent by the server.");
1872 2063
1873 $ntb->set_current_page ($INVENTORY_PAGE); 2064 $ntb->set_current_page ($INVENTORY_PAGE);
1874 2065
1875 $plwin->add ($ntb); 2066 $plwin->add ($ntb);
1876 $plwin
1877} 2067}
1878 2068
1879sub keyboard_setup { 2069sub keyboard_setup {
1880 DC::Macro::keyboard_setup 2070 DC::Macro::keyboard_setup
1881} 2071}
… …
1947 my @path = DC::Pod::full_path_of $node; 2137 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2138 pop @path; # drop current node
1949 2139
1950 for my $node (@path) { 2140 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2141 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2142 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2143 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2144 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2145 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2146 $load_node->($node);
1957 }, 2147 },
1958 ); 2148 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2149 $buttons->add (new DC::UI::Label text => "/");
1960 } 2150 }
1961 2151
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2152 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2153
1964 $curnode = $node; 2154 $curnode = $node;
1965 2155
1966 $viewer->clear; 2156 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2157 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
1978 $load_node->((DC::Pod::find @path)[0]); 2168 $load_node->((DC::Pod::find @path)[0]);
1979 $win->show; 2169 $win->show;
1980 }; 2170 };
1981 2171
1982 $win 2172 $win
1983}
1984
1985sub open_string_query {
1986 my ($title, $cb, $txt, $tooltip) = @_;
1987 my $dialog = new DC::UI::Toplevel
1988 x => "center",
1989 y => "center",
1990 z => 50,
1991 force_w => $WIDTH * 4/5,
1992 title => $title;
1993
1994 $dialog->add (
1995 my $e = new DC::UI::Entry
1996 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1997 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1998 tooltip => $tooltip
1999 );
2000
2001 $e->grab_focus;
2002 $e->set_text ($txt) if $txt;
2003 $dialog->show;
2004} 2173}
2005 2174
2006sub open_quit_dialog { 2175sub open_quit_dialog {
2007 unless ($QUIT_DIALOG) { 2176 unless ($QUIT_DIALOG) {
2008 $QUIT_DIALOG = new DC::UI::Toplevel 2177 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2030 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2199 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2031 ); 2200 );
2032 $hb->add (new DC::UI::Button 2201 $hb->add (new DC::UI::Button
2033 text => "Quit anyway", 2202 text => "Quit anyway",
2034 expand => 1, 2203 expand => 1,
2035 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2204 on_activate => sub {
2205 crash "Quit anyway";
2206 EV::unloop EV::UNLOOP_ALL;
2207 },
2036 ); 2208 );
2037 } 2209 }
2038 2210
2039 $QUIT_DIALOG->show; 2211 $QUIT_DIALOG->show;
2040 $QUIT_DIALOG->grab_focus; 2212 $QUIT_DIALOG->grab_focus;
2213}
2214
2215sub make_menuframe {
2216 $MENUFRAME = new DC::UI::Toplevel
2217 border => 0,
2218 force_x => 0,
2219 force_y => 0,
2220 force_w => $::WIDTH,
2221 child => ($MENUBAR = new DC::UI::HBox),
2222 ;
2223
2224 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2225
2226 # 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
2227 make_gauge_window->show;
2228
2229# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2230# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231
2232 make_playerbook;
2233
2234 $MENUPOPUP = DC::UI::Menu->new (items => [
2235 ["Setup…" , sub { $SETUP_DIALOG->toggle_visibility}],
2236 ["Playerbook…\tTab", sub { $PL_WINDOW ->toggle_visibility}],
2237 ["Help Browser…" , sub { $HELP_WINDOW ->toggle_visibility}],
2238 ["Quit…" , sub {
2239 if ($CONN) {
2240 open_quit_dialog;
2241 } else {
2242 EV::unloop EV::UNLOOP_ALL;
2243 }
2244 }],
2245 ]);
2246
2247 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2248 tooltip => "Shows the main menu",
2249 on_button_down => sub { $MENUPOPUP->popup ($_[1]) },
2250 );
2251
2252 $MENUBAR->add ($GAUGES->{prg} = new DC::UI::ExperienceProgress
2253 c_rescale => 1,
2254 padding_x => 6,
2255 padding_y => 3,
2256 force_w => $::WIDTH * 0.1,
2257 tooltip => "This progress bar shows your progress towards the next character level.",
2258 );
2259 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::Label
2260 align => 1, can_hover => 1, can_events => 1,
2261 text => "Total Experience",
2262 tooltip => "#stat_exp",
2263 fontsize => 0.8,
2264 );
2265 $MENUBAR->add ($GAUGES->{sklprg} = new DC::UI::ExperienceProgress
2266 c_rescale => 1,
2267 padding_x => 6,
2268 padding_y => 3,
2269 force_w => $::WIDTH * 0.2,
2270 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2271 );
2272 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2273 expand => 1,
2274 align => 1, can_hover => 1, can_events => 1,
2275 text => "Range and Combat Slots",
2276 tooltip => "#stat_ranged",
2277 );
2278
2279 $MENUFRAME->show;
2280}
2281
2282sub open_string_query {
2283 my ($title, $cb, $txt, $tooltip) = @_;
2284 my $dialog = new DC::UI::Toplevel
2285 x => "center",
2286 y => "center",
2287 z => 50,
2288 force_w => $WIDTH * 4/5,
2289 title => $title;
2290
2291 $dialog->add (
2292 my $e = new DC::UI::Entry
2293 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2294 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2295 tooltip => $tooltip
2296 );
2297
2298 $e->grab_focus;
2299 $e->set_text ($txt) if $txt;
2300 $dialog->show;
2041} 2301}
2042 2302
2043sub show_tip_of_the_day { 2303sub show_tip_of_the_day {
2044 # find all tips 2304 # find all tips
2045 my @tod = DC::Pod::find tip_of_the_day => "*"; 2305 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2093 $dialog->show; 2353 $dialog->show;
2094 }; 2354 };
2095} 2355}
2096 2356
2097sub sdl_init { 2357sub sdl_init {
2098 DC::SDL_Init 2358 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2359 and die "SDL::Init failed!\n";
2100} 2360}
2101 2361
2102sub video_init { 2362sub video_init {
2363 DC::set_theme $CFG->{uitheme};
2364
2365 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2366 $SDL_REINIT = 0;
2367
2368 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2369 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2370 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2371 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2372
2373 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2374
2103 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2375 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2376 $CFG->{sdl_mode} = 0; # lowest resolution by default
2377
2378 # now choose biggest mode <= 1024x768
2379 for (0 .. $#SDL_MODES) {
2380 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2381 $CFG->{sdl_mode} = $_;
2382 }
2383 }
2384 }
2104 2385
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2386 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2387
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2388 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2389 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2390 $FAST = $CFG->{fast};
2110 2391
2392 # 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 2393 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2394 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2395 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2396
2114 $SDL_ACTIVE = 1; 2397 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2398 $LAST_REFRESH = time - 0.01;
2116 2399
… …
2146 force_x => "max", 2429 force_x => "max",
2147 force_y => 0; 2430 force_y => 0;
2148 $DEBUG_STATUS->show; 2431 $DEBUG_STATUS->show;
2149 2432
2150 $STATUSBOX = new DC::UI::Statusbox; 2433 $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]); 2434
2435 $MODBOX = new DC::UI::Label
2436 can_events => 1,
2437 can_hover => 1,
2438 markup => "",
2439 align => 0,
2440 font => $FONT_FIXED,
2441 tooltip => "#modifier_box",
2442 tooltip_width => 0.67,
2443 ;
2444
2445 update_modbox;
2152 2446
2153 (new DC::UI::Frame 2447 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2448 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2449 force_x => 0,
2156 force_y => "max", 2450 force_y => "max",
2157 child => $STATUSBOX, 2451 child => (my $LL = new DC::UI::VBox),
2158 )->show; 2452 )->show;
2453
2454 $LL->add ($STATUSBOX);
2455 $LL->add ($MODBOX);
2456 $LL->add (new DC::UI::Label
2457 align => 0,
2458 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2459 fontsize => 0.5,
2460 fg => [1, 1, 0, 0.7],
2461 );
2159 2462
2160 DC::UI::Toplevel->new ( 2463 DC::UI::Toplevel->new (
2161 title => "Minimap", 2464 title => "Minimap",
2162 name => "mapmap", 2465 name => "mapmap",
2163 x => 0, 2466 x => 0,
2164 y => $FONTSIZE + 8, 2467 y => $FONTSIZE + 8,
2165 border_bg => [1, 1, 1, 192/255], 2468 border_bg => [1, 1, 1, 192/255],
2166 bg => [1, 1, 1, 0], 2469 bg => [1, 1, 1, 0],
2167 child => ($MAPMAP = new DC::MapWidget::MapMap 2470 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.", 2471 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2169 ), 2472 ),
2170 )->show; 2473 )->show;
2171 2474
2172 $MAPWIDGET = new DC::MapWidget; 2475 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2476 $MAPWIDGET->connect (activate_console => sub {
… …
2194 force_h => $::HEIGHT * 0.6, 2497 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2498 has_close_button => 1,
2196 ; 2499 ;
2197 2500
2198 $METASERVER = metaserver_dialog; 2501 $METASERVER = metaserver_dialog;
2199 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2502 # the name is changed to not conflict with the older name as users could have hidden it
2503 $MESSAGE_WINDOW = new DC::UI::Dockbar
2504 name => "message_window2",
2505 title => 'Messages',
2506 force_w => $::WIDTH * 0.6,
2507 force_h => $::HEIGHT * 0.25,
2508 ;
2509
2200 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2510 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2511
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2512 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2513 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2514
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2515 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2516 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2517 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2220 . "After pressing the combo the binding will be saved automatically and the " 2530 . "After pressing the combo the binding will be saved automatically and the "
2221 . "binding editor closes"); 2531 . "binding editor closes");
2222 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2532 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2223 "Some debuggin' options. Do not ask."); 2533 "Some debuggin' options. Do not ask.");
2224 2534
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2535 make_menuframe;
2226 2536
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232
2233 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2234
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2237
2238 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf";
2244 status "Configuration Saved";
2245 0
2246 },
2247 );
2248
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation");
2251
2252
2253 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit",
2255 tooltip => "Terminates the program",
2256 on_activate => sub {
2257 if ($CONN) {
2258 open_quit_dialog;
2259 } else {
2260 EV::unloop EV::UNLOOP_ALL;
2261 }
2262 0
2263 },
2264 );
2265
2266 $BUTTONBAR->show;
2267 $SETUP_DIALOG->show; 2537 $SETUP_DIALOG->show;
2268 $MESSAGE_WINDOW->show; 2538 $MESSAGE_WINDOW->show;
2269 } 2539 }
2270 2540
2541 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2542 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2543
2544 $CAVEAT_LABEL->set_text ("None :)");
2545 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2546 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2547
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2548 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2549}
2273 2550
2274sub video_shutdown { 2551sub video_shutdown {
2275 DC::OpenGL::shutdown; 2552 DC::OpenGL::shutdown;
2553 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2554
2277 undef $SDL_ACTIVE; 2555 undef $SDL_ACTIVE;
2278} 2556}
2279 2557
2280my %animate_object; 2558my %animate_object;
… …
2323 delete $animate_object{$widget}; 2601 delete $animate_object{$widget};
2324} 2602}
2325 2603
2326%SDL_CB = ( 2604%SDL_CB = (
2327 DC::SDL_QUIT => sub { 2605 DC::SDL_QUIT => sub {
2606 crash "SDL_QUIT";
2328 EV::unloop EV::UNLOOP_ALL; 2607 EV::unloop EV::UNLOOP_ALL;
2329 }, 2608 },
2330 DC::SDL_VIDEORESIZE => sub { 2609 DC::SDL_VIDEORESIZE => sub {
2331 }, 2610 },
2332 DC::SDL_VIDEOEXPOSE => sub { 2611 DC::SDL_VIDEOEXPOSE => sub {
… …
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2620# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2621 },
2343 DC::SDL_KEYDOWN => sub { 2622 DC::SDL_KEYDOWN => sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2623 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2624 # alt-enter
2625 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2626 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2627 video_init;
2349 } else { 2628 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2629 &DC::UI::feed_sdl_key_down_event;
2351 } 2630 }
2631 update_modbox;
2352 }, 2632 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2633 DC::SDL_KEYUP => sub {
2634 &DC::UI::feed_sdl_key_up_event;
2635 update_modbox;
2636 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2637 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2638 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2639 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2640 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2641 if ($_[0]{code} == 1) {
… …
2368$SIG{INT} = $SIG{TERM} = sub { 2651$SIG{INT} = $SIG{TERM} = sub {
2369 EV::unloop; 2652 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2653 #d# TODO calling exit here hangs the process in some futex
2371}; 2654};
2372 2655
2373{ 2656# due to mac os x + sdl combined braindamage, we need this contortion
2657sub main {
2658 {
2659 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2660
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2661 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2662 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2663 } else {
2377 #TODO: compatibility cruft 2664 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2665 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuration file\n"; 2666 print STDERR "INFO: used old configuration file\n";
2380 } 2667 }
2381 2668
2382 DC::DB::Server::run; 2669 DC::DB::Server::run;
2383 2670
2671 if ($CFG->{db_schema} < 1) {
2672 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2673 DC::DB::nuke_db;
2674 $CFG->{db_schema} = 1;
2675 DC::write_cfg;
2676 }
2677
2678 DC::DB::open_db;
2679
2384 DC::UI::set_layout ($::CFG->{layout}); 2680 DC::UI::set_layout ($::CFG->{layout});
2385 2681
2386 my %DEF_CFG = ( 2682 my %DEF_CFG = (
2683 config_autosave => 1,
2387 sdl_mode => 0, 2684 sdl_mode => undef,
2388 fullscreen => 1, 2685 fullscreen => 1,
2389 fast => 0, 2686 fast => 0,
2390 force_opengl11 => undef, 2687 force_opengl11 => undef,
2688 disable_alpha => 0,
2689 smooth_movement => 1,
2391 texture_compression => 1, 2690 texture_compression => 1,
2392 map_scale => 1, 2691 map_scale => 1,
2393 fow_enable => 1, 2692 fow_enable => 1,
2394 fow_intensity => 0, 2693 fow_intensity => 0,
2395 map_smoothing => 1, 2694 map_smoothing => 1,
2396 gui_fontsize => 1, 2695 gui_fontsize => 1,
2397 log_fontsize => 0.7, 2696 log_fontsize => 0.7,
2398 gauge_fontsize => 1, 2697 gauge_fontsize => 1,
2399 gauge_size => 0.35, 2698 gauge_size => 0.35,
2400 stat_fontsize => 0.7, 2699 stat_fontsize => 0.7,
2401 mapsize => 100, 2700 mapsize => 100,
2402 audio_enable => 1, 2701 audio_enable => 1,
2403 audio_hw_channels => 0, 2702 audio_hw_channels => 0,
2404 audio_hw_frequency => 0, 2703 audio_hw_frequency => 0,
2405 audio_hw_chunksize => 0, 2704 audio_hw_chunksize => 0,
2406 audio_mix_channels => 8, 2705 audio_mix_channels => 8,
2407 effects_enable => 1, 2706 effects_enable => 1,
2408 effects_volume => 1, 2707 effects_volume => 1,
2409 bgm_enable => 1, 2708 bgm_enable => 1,
2410 bgm_volume => 0.5, 2709 bgm_volume => 0.5,
2411 output_rate => "", 2710 output_rate => "",
2412 pickup => 0, 2711 pickup => 0,
2413 inv_sort => "mtime", 2712 inv_sort => "mtime",
2414 default => "profile", # default profile 2713 default => "profile", # default profile
2415 show_tips => 1, 2714 show_tips => 1,
2416 logview_max_par => 1000, 2715 logview_max_par => 1000,
2716 shift_fire_stop => 0,
2717 uitheme => "wood",
2417 ); 2718 );
2418 2719
2419 while (my ($k, $v) = each %DEF_CFG) { 2720 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2721 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2722 }
2422 2723
2423 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2724 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2424 $PROFILE = $CFG->{profile}{default}; 2725 $PROFILE = $CFG->{profile}{default};
2425 2726
2426 # convert old bindings (only default profile matters) 2727 # convert old bindings (only default profile matters)
2427 if (my $bindings = delete $PROFILE->{bindings}) { 2728 if (my $bindings = delete $PROFILE->{bindings}) {
2428 while (my ($mod, $syms) = each %$bindings) { 2729 while (my ($mod, $syms) = each %$bindings) {
2429 while (my ($sym, $cmds) = each %$syms) { 2730 while (my ($sym, $cmds) = each %$syms) {
2430 push @{ $PROFILE->{macro} }, { 2731 push @{ $PROFILE->{macro} }, {
2431 accelkey => [$mod*1, $sym*1], 2732 accelkey => [$mod*1, $sym*1],
2432 action => $cmds, 2733 action => $cmds,
2734 };
2433 }; 2735 }
2434 } 2736 }
2435 } 2737 }
2436 }
2437 2738
2438 sdl_init; 2739 sdl_init;
2439 2740
2440 @SDL_MODES = DC::SDL_ListModes 8, 8; 2741 {
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( 2742 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2743 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2744 DejaVuSansMono.ttf
2452 DejaVuSans-Bold.ttf 2745 DejaVuSans-Bold.ttf
2453 DejaVuSansMono-Bold.ttf 2746 DejaVuSansMono-Bold.ttf
2454 DejaVuSans-Oblique.ttf 2747 DejaVuSans-Oblique.ttf
2455 DejaVuSansMono-Oblique.ttf 2748 DejaVuSansMono-Oblique.ttf
2456 DejaVuSans-BoldOblique.ttf 2749 DejaVuSans-BoldOblique.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2750 DejaVuSansMono-BoldOblique.ttf
2458 ); 2751 );
2459 2752
2460 DC::add_font $_ for @fonts; 2753 DC::add_font $_ for @fonts;
2461 2754
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2755 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2756 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2757
2467 $FONT_PROP->make_default; 2758 $FONT_PROP->make_default;
2468 } 2759
2760 DC::pango_init;
2761 }
2469 2762
2470# compare mono (ft) vs. rgba (cairo) 2763# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2764# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2765# for my $rgba (0..1) {
2473# my $t1 = Time::HiRes::time; 2766# my $t1 = Time::HiRes::time;
… …
2478# } 2771# }
2479# my $t2 = Time::HiRes::time; 2772# my $t2 = Time::HiRes::time;
2480# warn $t2-$t1; 2773# warn $t2-$t1;
2481# } 2774# }
2482 2775
2483 video_init; 2776 video_init;
2484 audio_init; 2777 audio_init;
2485} 2778 }
2486 2779
2487show_tip_of_the_day if $CFG->{show_tips}; 2780 show_tip_of_the_day if $CFG->{show_tips};
2488 2781
2489our $STARTUP_CANCEL = EV::idle sub { 2782 our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2783 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2784 $startup_done->();
2492}; 2785 };
2493 2786
2787 delete $SIG{__DIE__};
2494EV::loop; 2788 EV::loop;
2495 2789
2790 DC::write_cfg if $CFG->{config_autosave};
2791
2496#video_shutdown; 2792 #video_shutdown;
2497#audio_shutdown; 2793 #audio_shutdown;
2794
2498DC::OpenGL::quit; 2795 DC::OpenGL::quit;
2499DC::SDL_Quit; 2796 DC::SDL_Quit;
2500DC::DB::Server::stop; 2797 DC::DB::Server::stop;
2798}
2799
2800DC::SDL_braino; # see sub above
2501 2801
2502=head1 NAME 2802=head1 NAME
2503 2803
2504deliantra - A Deliantra MORPG game client 2804deliantra - A Deliantra MORPG game client
2505 2805
… …
2522 4 show fps 2822 4 show fps
2523 8 suppress tooltips 2823 8 suppress tooltips
2524 2824
2525=head1 AUTHOR 2825=head1 AUTHOR
2526 2826
2527Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2827Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2528 2828
2529 2829
2530 2830

Diff Legend

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