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.51 by root, Thu Jul 17 15:23:43 2008 UTC vs.
Revision 1.95 by root, Sun Apr 26 19:10:57 2009 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
… …
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } else { 59 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 60 # OS X
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 63 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 64 }
75 65
76 unshift @INC, $root; 66 unshift @INC, $root;
77 } 67 }
78} 68}
79 69
80# prepend private library directory 70# prepend private library directory and prepare env
81BEGIN { 71BEGIN {
82 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 74 if (-d $path) {
85 unshift @INC, $path; 75 unshift @INC, $path;
… …
90 80
91# need to do it again because that pile of garbage called PAR nukes it before main 81# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 82unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 83 if %PAR::LibCache;
94 84
95use Time::HiRes 'time';
96use EV; 85use EV;
86BEGIN { *time = \&EV::time }
87
97use List::Util qw(max min); 88use List::Util qw(max min);
98 89
99use Deliantra; 90use Deliantra;
100use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
101 92
102use AnyEvent::DNS; 93use AnyEvent::Util ();
103use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
104 96
105use Compress::LZF; 97use Compress::LZF;
98use JSON::XS;
106 99
107use DC; 100use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 101
102sub crash($;$) {
103 # nop during compiletime
104}
105
106BEGIN {
107 $SIG{__DIE__} = sub {
108 return if $^S;
109 crash "CRASH/DIE: $_[0]" => 1;
110 DC::fatal Carp::longmess "$_[0]";
111 }
112}
113
109use DC::OpenGL (); 114use DC::OpenGL ();
110use DC::Protocol; 115use DC::Protocol;
111use DC::DB; 116use DC::DB;
112use DC::UI; 117use DC::UI;
113use DC::UI::Canvas; 118use DC::UI::Canvas;
114use DC::UI::Inventory; 119use DC::UI::Inventory;
115use DC::UI::SpellList; 120use DC::UI::SpellList;
116use DC::UI::Dockable; 121use DC::UI::Dockable;
117use DC::UI::Dockbar; 122use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 123use DC::UI::ChatView;
120use DC::MessageDistributor; 124use DC::MessageDistributor;
121use DC::Pod; 125use DC::Pod;
122use DC::MapWidget; 126use DC::MapWidget;
123use DC::Macro; 127use DC::Macro;
124 128
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
127 131
128$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
129 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
130}; 135};
131 136
132my $MAX_FPS = 60; 137my $MAX_FPS = 60;
133 138
… …
135 140
136our $LAST_REFRESH; 141our $LAST_REFRESH;
137our $NOW; 142our $NOW;
138 143
139our $CFG; 144our $CFG;
140our $CONN;
141our $PROFILE; # current profile 145our $PROFILE; # current profile
142our $FAST; # fast, low-quality mode, possibly useful for software-rendering 146our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143 147
144our $WANT_REFRESH; 148our $WANT_REFRESH;
145 149
150our $MODE_SLIDER;
151our $CAVEAT_LABEL;
152
146our @SDL_MODES; 153our @SDL_MODES;
154our $SDL_REINIT = 1;
147our $WIDTH; 155our $WIDTH;
148our $HEIGHT; 156our $HEIGHT;
149our $FULLSCREEN; 157our $FULLSCREEN;
150our $FONTSIZE; 158our $FONTSIZE;
151 159
152our $FONT_PROP; 160our $FONT_PROP;
153our $FONT_FIXED; 161our $FONT_FIXED;
154 162
163our $CONN;
164
155our $MAP; 165our $MAP;
156our $MAPMAP; 166our $MAPMAP;
157our $MAPWIDGET; 167our $MAPWIDGET;
158our $COMPLETER; 168our $COMPLETER;
159our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
160our $METASERVER; 173our $METASERVER;
161our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
162our $QUIT_DIALOG; 175our $QUIT_DIALOG;
163our $HOST_ENTRY; 176our $HOST_ENTRY;
164our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
190our $FLOORBOX; 203our $FLOORBOX;
191our $GAUGES; 204our $GAUGES;
192our $STATWIDS; 205our $STATWIDS;
193 206
194our $SDL_ACTIVE; 207our $SDL_ACTIVE;
195our %SDL_CB; 208our @SDL_CB;
196 209
197our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
198our $STATUSBOX; 211our $STATUSBOX;
199our $MODBOX; 212our $MODBOX;
200our $DEBUG_STATUS; 213our $DEBUG_STATUS;
201 214
202our $INV; 215our $INV;
203our $INVR; 216our $INVR;
204our $INVR_HB; 217our $INVR_HB;
218
219#############################################################################
220
221# write a crash message blockingly to the socket, if possible
222# this is a bit too complicated for my tastes, but it was easy.
223*crash = sub($;$) {
224 my ($msg, $backtrace) = @_;
225
226 warn $msg;
227
228 return unless $CONN;
229
230 my $fh = $CONN->{fh}
231 or return;
232
233 my $buf = delete $CONN->{wbuf};
234
235 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
236
237 AnyEvent::Util::fh_nonblocking $fh, 0;
238 syswrite $fh, $buf;
239 AnyEvent::Util::fh_nonblocking $fh, 1;
240
241 $msg =~ s/\s+$//;
242
243 # backtrace as second step, in case it crashes, too
244 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
245 if $backtrace;
246};
247
248sub clienterror($;$) {
249 my ($msg, $backtrace) = @_;
250
251 warn $msg;
252
253 return unless $CONN;
254
255 $CONN->send_exti_msg (clientlog => $msg);
256 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
257}
205 258
206############################################################################# 259#############################################################################
207 260
208sub status { 261sub status {
209 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 262 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
291 or return; 344 or return;
292 345
293 $meta->{data} 346 $meta->{data}
294 or return; 347 or return;
295 348
296 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
297 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
298 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 351 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
299 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
300 &audio_music_push ($face); 353 &audio_music_push ($face);
301 } 354 }
302 } else { 355 } else {
303 # fetch from database 356 # fetch from database
304 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
305 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
306 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
307 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 360 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
308 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
309 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
310 363
311 audio_sound_push ($face); 364 audio_sound_push ($face);
312 }; 365 };
… …
359 412
360 audio_music_update_volume; 413 audio_music_update_volume;
361 414
362 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
363 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
364 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
365 ? new_from_file DC::RW $meta->{path} 421 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
366 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
367 423
368 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
369 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
370 426
371 my $NOW = time; 427 my $NOW = time;
372 428
373 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
374 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
732} 788}
733 789
734sub dc_connect { 790sub dc_connect {
735 my ($host, $port) = @_; 791 my ($host, $port) = @_;
736 792
737 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 793 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
794 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
738 795
739 $CONN = 796 $CONN =
740 new DC::Protocol 797 new DC::Protocol
741 host => $host, 798 host => $host,
742 port => $port, 799 port => $port,
743 user => $PROFILE->{user}, 800 user => $PROFILE->{user},
744 pass => $PROFILE->{password}, 801 pass => $PROFILE->{password},
745 mapw => $mapsize, 802 mapw => $mapw,
746 maph => $mapsize, 803 maph => $maph,
747 804
748 client => "$DC::VERSION $] $^O", 805 client => "$DC::VERSION $] $^O",
749 806
750 map_widget => $MAPWIDGET, 807 map_widget => $MAPWIDGET,
751 statusbox => $STATUSBOX, 808 statusbox => $STATUSBOX,
… …
759 816
760 on_connect => sub { 817 on_connect => sub {
761 if ($_[0]) { 818 if ($_[0]) {
762 DC::lowdelay fileno $CONN->{fh}; 819 DC::lowdelay fileno $CONN->{fh};
763 820
764 status "login successful"; 821 status "successfully connected to the server";
765 } else { 822 } else {
766 undef $CONN; 823 undef $CONN;
767 status "unable to connect: $!"; 824 status "unable to connect: $!";
768 stop_game(); 825 stop_game();
769 } 826 }
… …
784 # hack to make SURE we find the IP address all right 841 # hack to make SURE we find the IP address all right
785 # can be removed once AnyEvent::DNS is proven stable. 842 # can be removed once AnyEvent::DNS is proven stable.
786 if ($host eq "gameserver.deliantra.net") { 843 if ($host eq "gameserver.deliantra.net") {
787 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 844 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
788 if ($_[0] ne "80.101.114.108") { # Perl 845 if ($_[0] ne "80.101.114.108") { # Perl
846 status "dns failure, trying differently";
847 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
848 unless (defined $host) {
789 status "dns failure, using hardcoded address"; 849 status "dns failure, using hardcoded address";
790 $host = "129.13.162.95"; 850 $host = "129.13.162.95";
851 }
791 } 852 }
792 853
793 dc_connect $host, $port; 854 dc_connect $host, $port;
794 }; 855 };
795 } else { 856 } else {
796 dc_connect $host, $port; 857 dc_connect $host, $port;
797 } 858 }
798} 859}
799 860
800sub stop_game { 861sub stop_game {
862 crash "stop_game";
863
801 $LOGIN_BUTTON->set_text ("Login / Register"); 864 $LOGIN_BUTTON->set_text ("Login / Register");
802 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 865 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
803 $SETUP_DIALOG->show; 866 $SETUP_DIALOG->show;
804 $PL_WINDOW->hide; 867 $PL_WINDOW->hide;
805 $SPELL_LIST->clear_spells; 868 $SPELL_LIST->clear_spells;
… …
819} 882}
820 883
821sub graphics_setup { 884sub graphics_setup {
822 my $vbox = new DC::UI::VBox; 885 my $vbox = new DC::UI::VBox;
823 886
887 {
888 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
889
824 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 890 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
825 891
826 my $row = 0; 892 my $row = 0;
827 893
828 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
829 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 895 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
830 can_events => 1, 896 can_events => 1,
831 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 897 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
832 898
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
900 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
901 can_events => 1,
902 tooltip => "This field shows any known issues with your config or driver, such as "
903 . "a non-accelerated display format. You can try to work around these issues "
904 . "by selecting a different video mode, changing the settings below or "
905 . "by installing the right driver for your graphics card.");
906
907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
908 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
909 value => $CFG->{uitheme},
910 options => [
911 [wood => "Wood (the default)"],
912 [plain => "Plain (very)"],
913 [blue => "Blue (dark)"],
914 [metal => "Metal (light)"],
915 ],
916 tooltip => "Choose the User Interface theme that you like most :)",
917 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
918 );
919
833 my $vidmode_tooltip = 920 my $vidmode_tooltip =
834 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 921 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
835 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 922 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
836 923
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
838 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 925 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
839 926
840 $hbox->add (my $mode_slider = new DC::UI::Slider 927 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
841 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 928 c_rescale => 1,
929 force_w => $WIDTH * 0.1, expand => 1,
930 range => [ ($CFG->{sdl_mode}) x 3 ],
842 tooltip => $vidmode_tooltip); 931 tooltip => $vidmode_tooltip);
843 $hbox->add (my $mode_label = new DC::UI::Label 932 $hbox->add (my $mode_label = new DC::UI::Label
844 height => 0.8, template => "9999x9999@9+9", 933 height => 0.8, template => "9999x9999@9+9",
845 can_events => 1, tooltip => $vidmode_tooltip); 934 can_events => 1, tooltip => $vidmode_tooltip);
846 935
847 $mode_slider->connect (changed => sub { 936 $MODE_SLIDER->connect (changed => sub {
848 my ($self, $value) = @_; 937 my ($self, $value) = @_;
849 938
850 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 939 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
851 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 940 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
852 }); 941 });
853 $mode_slider->emit (changed => $mode_slider->{range}[0]); 942 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
854 943
855 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
856 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 945 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
857 state => $CFG->{fullscreen}, 946 state => $CFG->{fullscreen},
858 tooltip => "Bring the client into fullscreen mode.", 947 tooltip => "Bring the client into fullscreen mode.",
859 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 948 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
860 ); 949 );
861 950
862 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 951 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
863 $table->add_at (1, $row++, new DC::UI::CheckBox 952 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{force_opengl11}, 953 state => $CFG->{force_opengl11},
865 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 954 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
866 . "higher memory usage and slower performance. It will, however, help tremendously on " 955 . "higher memory usage and slower performance. It will, however, help tremendously on "
867 . "cards that claim to support a feature but fall back to software rendering. " 956 . "cards that claim to support a feature but fall back to software rendering. "
868 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 957 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
869 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 958 . "but cards and drivers from other vendors (ATI) are often just as bad. "
870 . "experience extremely low framerates and your card should do better, try this option.</b>", 959 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
871 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 960 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
872 ); 961 );
873 962
963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
964 $table->add_at (1, $row++, new DC::UI::CheckBox
965 state => $CFG->{disable_alpha},
966 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
967 . "by disabling a number of textures and transparency effects. Normally, these "
968 . "effects do not cost a lot of resources, but some graphics cards might fall "
969 . "back to extremely slow rendering if this is enabled. If disabling this option "
970 . "noticably improves the framerate of the client please report this! "
971 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
972 on_changed => sub {
973 my ($self, $value) = @_;
974 $CFG->{disable_alpha} = $value;
975 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
976 0
977 }
978 );
979
874 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 980 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
875 $table->add_at (1, $row++, new DC::UI::CheckBox 981 $table->add_at (1, $row++, new DC::UI::CheckBox
876 state => $CFG->{texture_compression}, 982 state => $CFG->{texture_compression},
877 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 983 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
878 . "will save a lot of memory and increase performance. The compression algorithm " 984 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
879 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 985 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
880 . "forced OpenGL 1.1 mode.", 986 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
881 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 987 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
882 ); 988 );
883 989
884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 990 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
885 $table->add_at (1, $row++, new DC::UI::CheckBox 991 $table->add_at (1, $row++, new DC::UI::CheckBox
886 state => $CFG->{fast}, 992 state => $CFG->{fast},
887 tooltip => "Lower the visual quality considerably to speed up rendering.", 993 tooltip => "Lower the visual quality considerably to speed up rendering.",
888 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 994 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
889 ); 995 );
890 996
891 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 997 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
892 $table->add_at (1, $row++, new DC::UI::Slider 998 $table->add_at (1, $row++, new DC::UI::Slider
893 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 999 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
894 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1000 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
895 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1001 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
896 ); 1002 );
897 1003
898 $table->add_at (1, $row++, new DC::UI::Button 1004 $table->add_at (1, $row++, new DC::UI::Button
899 expand => 1, text => "Apply", 1005 expand => 1, text => "Apply",
900 tooltip => "Apply the video settings above.", 1006 tooltip => "Apply the video settings above.",
901 on_activate => sub { 1007 on_activate => sub {
902 video_shutdown (); 1008 video_shutdown ();
903 video_init (); 1009 video_init ();
1010 0
904 0 1011 }
905 } 1012 );
1013 }
1014
1015 {
1016 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1017
1018 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1019
1020 my $row = 0;
1021 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1022 $table->add_at (1, $row++, new DC::UI::CheckBox
1023 state => $CFG->{smooth_movement},
1024 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1025 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1026 . "then disable this option. Changes take effect immdiately.",
1027 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
906 ); 1028 );
907 1029
908 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
909 $table->add_at (1, $row++, new DC::UI::Slider 1031 $table->add_at (1, $row++, new DC::UI::Slider
910 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1032 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
911 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1033 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
912 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1034 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
913 ); 1035 );
914 1036
915 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
916 $table->add_at (1, $row++, new DC::UI::CheckBox 1038 $table->add_at (1, $row++, new DC::UI::CheckBox
917 state => $CFG->{map_smoothing}, 1039 state => $CFG->{map_smoothing},
918 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1040 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
919 . "This increases load on the graphics subsystem and works only with TRT servers. " 1041 . "This increases load on the graphics subsystem and works only with TRT servers. "
920 . "Changes take effect at next login only.", 1042 . "Changes take effect at next login only.",
921 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1043 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
922 ); 1044 );
923 1045
924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
925 $table->add_at (1, $row++, new DC::UI::CheckBox 1047 $table->add_at (1, $row++, new DC::UI::CheckBox
926 state => $CFG->{fow_enable}, 1048 state => $CFG->{fow_enable},
927 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1049 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
928 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1050 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
929 ); 1051 );
930 1052
931 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
932 $table->add_at (1, $row++, new DC::UI::Slider 1054 $table->add_at (1, $row++, new DC::UI::Slider
933 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1055 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
934 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1056 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
935 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1057 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
936 ); 1058 );
937 1059
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
939 $table->add_at (1, $row++, new DC::UI::Slider 1061 $table->add_at (1, $row++, new DC::UI::Slider
940 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1062 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
941 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1063 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
942 . "but you still need to press apply to correctly re-layout the widget.", 1064 . "but you still need to press apply to correctly re-layout the widget.",
943 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1065 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
944 ); 1066 );
945 1067
946 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1068 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
947 $table->add_at (1, $row++, new DC::UI::Slider 1069 $table->add_at (1, $row++, new DC::UI::Slider
948 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1070 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
949 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1071 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
950 on_changed => sub { 1072 on_changed => sub {
951 $CFG->{gauge_fontsize} = $_[1]; 1073 $CFG->{gauge_fontsize} = $_[1];
952 &set_gauge_window_fontsize; 1074 &set_gauge_window_fontsize;
1075 0
953 0 1076 }
954 } 1077 );
955 );
956 1078
957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1079 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
958 $table->add_at (1, $row++, new DC::UI::Slider 1080 $table->add_at (1, $row++, new DC::UI::Slider
959 range => [$CFG->{gauge_size}, 0.2, 0.8], 1081 range => [$CFG->{gauge_size}, 0.2, 0.8],
960 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1082 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
961 on_changed => sub { 1083 on_changed => sub {
962 $CFG->{gauge_size} = $_[1]; 1084 $CFG->{gauge_size} = $_[1];
963 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1085 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1086 0
964 0 1087 }
965 } 1088 );
966 ); 1089 }
967 1090
968 $vbox 1091 $vbox
969} 1092}
970 1093
971our $AUDIO_HW_CHUNKSIZE; 1094our $AUDIO_HW_CHUNKSIZE;
… …
1134} 1257}
1135 1258
1136sub make_gauge_window { 1259sub make_gauge_window {
1137 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1260 my $gh = int $HEIGHT * $CFG->{gauge_size};
1138 1261
1139 my $win = new DC::UI::Frame ( 1262 $GAUGES->{win} = my $win = new DC::UI::Frame (
1140 force_x => 0, 1263 force_x => 0,
1141 force_y => "max", 1264 force_y => "max",
1142 force_w => $WIDTH, 1265 force_w => $WIDTH,
1143 force_h => $gh, 1266 force_h => $gh,
1144 ); 1267 );
… …
1160 (new DC::UI::Empty expand => 1), 1283 (new DC::UI::Empty expand => 1),
1161 (my $hb = new DC::UI::HBox), 1284 (my $hb = new DC::UI::HBox),
1162 ], 1285 ],
1163 ); 1286 );
1164 1287
1165 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1288 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1166 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1289 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1167 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1290 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1168 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1291 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1169
1170 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1171 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1172 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1173 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1174
1175 $GAUGES = {
1176 exp => $exp, prg => $prg, sklprg => $sklprg,
1177 win => $win, range => $rng,
1178 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1179 };
1180 1292
1181 &set_gauge_window_fontsize; 1293 &set_gauge_window_fontsize;
1182 1294
1183 $win 1295 $win
1184} 1296}
… …
1526 ); 1638 );
1527 1639
1528 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1640 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1529 $table->add_at (1, 4, new DC::UI::Entry 1641 $table->add_at (1, 4, new DC::UI::Entry
1530 text => $CFG->{profile}{default}{user}, 1642 text => $CFG->{profile}{default}{user},
1531 tooltip => "The name of your character on the server.", 1643 tooltip => "The name of your character on the server. The name is case-sensitive!",
1532 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1644 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1533 ); 1645 );
1534 1646
1535 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1647 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1536 $table->add_at (1, 5, new DC::UI::Entry 1648 $table->add_at (1, 5, new DC::UI::Entry
… …
1550 1 1662 1
1551 }, 1663 },
1552 ); 1664 );
1553 1665
1554 $vbox->add (new DC::UI::FancyFrame 1666 $vbox->add (new DC::UI::FancyFrame
1555 label => "Registering", 1667 label => "How to Play",
1556 min_h => 200, 1668 min_h => 240,
1557 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1669 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1558 markup => 1670 markup =>
1671 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1672 . "Then register a new account (or use an existing one if you have one). "
1559 "To register a new account, choose a username that hasn't been taken yet and " 1673 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1560 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1674 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1561 ), 1675 ),
1562 ); 1676 );
1563 1677
1564 $vbox 1678 $vbox
… …
1636 1750
1637 my $row = 0; 1751 my $row = 0;
1638 1752
1639 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1753 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1640 $table->add_at (1, $row++, new DC::UI::CheckBox 1754 $table->add_at (1, $row++, new DC::UI::CheckBox
1755 c_colspan => 2,
1641 state => $CFG->{show_tips}, 1756 state => $CFG->{show_tips},
1642 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1757 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1643 on_changed => sub { 1758 on_changed => sub {
1644 my ($self, $value) = @_; 1759 my ($self, $value) = @_;
1645 $CFG->{show_tips} = $value; 1760 $CFG->{show_tips} = $value;
… …
1647 } 1762 }
1648 ); 1763 );
1649 1764
1650 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1765 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1651 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1766 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1767 c_colspan => 2,
1652 text => $CFG->{logview_max_par}, 1768 text => $CFG->{logview_max_par},
1653 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1769 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1654 . "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 "
1655 . "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.",
1656 on_changed => sub { 1772 on_changed => sub {
… …
1658 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1774 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1659 0 1775 0
1660 }, 1776 },
1661 ); 1777 );
1662 1778
1779 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1780 $table->add_at (1, $row, new DC::UI::CheckBox
1781 state => $CFG->{config_autosave},
1782 tooltip => "Normally, configuration settings and the user interface layout "
1783 . "are saved on client exit. You can disable this behaviour by "
1784 . "unchecking this checkbox.",
1785 on_changed => sub {
1786 my ($self, $value) = @_;
1787 $CFG->{config_autosave} = $value;
1788 0
1789 }
1790 );
1791 $table->add_at (2, $row++, new DC::UI::Button
1792 text => "Save Now",
1793 tooltip => "Use this to manually save configuration and UI layout when "
1794 . "autosave is disabled.",
1795 on_activate => sub {
1796 DC::write_cfg;
1797 0
1798 }
1799 );
1800
1663 $table 1801 $table
1664} 1802}
1665 1803
1666sub autopickup_setup { 1804sub autopickup_setup {
1667 my $r = new DC::UI::ScrolledWindow ( 1805 my $r = new DC::UI::ScrolledWindow (
… …
1673 col_expand => [0, 1, 0, 1], 1811 col_expand => [0, 1, 0, 1],
1674 ); 1812 );
1675 1813
1676 for ( 1814 for (
1677 ["General", 0, 0, 1815 ["General", 0, 0,
1678 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1679 ["Inhibit autopickup" => PICKUP_INHIBIT], 1816# ["Inhibit autopickup" => PICKUP_INHIBIT],
1680 ["Stop before pickup" => PICKUP_STOP], 1817 ["Stop before pickup" => PICKUP_STOP],
1681 ["Debug autopickup" => PICKUP_DEBUG], 1818 ["Debug autopickup" => PICKUP_DEBUG],
1682 ], 1819 ],
1683 ["Weapons", 0, 6, 1820 ["Weapons", 0, 6,
1684 ["All weapons" => PICKUP_ALLWEAPON], 1821 ["All weapons" => PICKUP_ALLWEAPON],
… …
1710 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1847 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1711 ["Ignore cursed" => PICKUP_NOT_CURSED], 1848 ["Ignore cursed" => PICKUP_NOT_CURSED],
1712 ["Jewelery" => PICKUP_JEWELS], 1849 ["Jewelery" => PICKUP_JEWELS],
1713 ["Flesh" => PICKUP_FLESH], 1850 ["Flesh" => PICKUP_FLESH],
1714 ], 1851 ],
1715 ["Weight/Value ratio", 2, 17] 1852 ["Value/Weight ratio", 2, 17]
1716 ) 1853 )
1717 { 1854 {
1718 my ($title, $x, $y, @bits) = @$_; 1855 my ($title, $x, $y, @bits) = @$_;
1719 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1856 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1720 1857
… …
1732 $::CFG->{pickup} |= $mask; 1869 $::CFG->{pickup} |= $mask;
1733 } else { 1870 } else {
1734 $::CFG->{pickup} &= ~$mask; 1871 $::CFG->{pickup} &= ~$mask;
1735 } 1872 }
1736 1873
1737 $::CONN->send_command ("pickup $::CFG->{pickup}") 1874 $::CONN->send_pickup ($::CFG->{pickup})
1738 if defined $::CONN; 1875 if defined $::CONN;
1739 1876
1740 0 1877 0
1741 }); 1878 });
1742 1879
… …
1745 } 1882 }
1746 1883
1747 $table->add_at (2, 18, new DC::UI::ValSlider 1884 $table->add_at (2, 18, new DC::UI::ValSlider
1748 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1885 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1749 template => ">= 99", 1886 template => ">= 99",
1887 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1750 to_value => sub { ">= " . 5 * $_[0] }, 1888 to_value => sub { ">= " . 5 * $_[0] },
1751 on_changed => sub { 1889 on_changed => sub {
1752 my ($slider, $value) = @_; 1890 my ($slider, $value) = @_;
1753 1891
1754 $::CFG->{pickup} &= ~0xF; 1892 $::CFG->{pickup} &= ~0xF;
… …
1758 }); 1896 });
1759 1897
1760 $table->add_at (3, 18, new DC::UI::Button 1898 $table->add_at (3, 18, new DC::UI::Button
1761 text => "set", 1899 text => "set",
1762 on_activate => sub { 1900 on_activate => sub {
1763 $::CONN->send_command ("pickup $::CFG->{pickup}") 1901 $::CONN->send_pickup ($::CFG->{pickup})
1764 if defined $::CONN; 1902 if defined $::CONN;
1765 0 1903 0
1766 }); 1904 });
1767 1905
1768 $r 1906 $r
… …
1810 $::CFG->{inv_sort} = $_[1]; 1948 $::CFG->{inv_sort} = $_[1];
1811 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1949 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1812 }, 1950 },
1813 ); 1951 );
1814 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1952 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1815 #TODO# update to weigh/maxweight 1953 #TODO# update to weight/maxweight
1816 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1954 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1817 1955
1818 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1956 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1819 $sw1->add ($INV = new DC::UI::Inventory); 1957 $sw1->add ($INV = new DC::UI::Inventory);
1820 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1958 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1881 $PL_NOTEBOOK->set_current_page ($widget); 2019 $PL_NOTEBOOK->set_current_page ($widget);
1882 $PL_WINDOW->show; 2020 $PL_WINDOW->show;
1883 } 2021 }
1884} 2022}
1885 2023
1886sub player_window { 2024sub make_playerbook {
1887 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2025 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1888 x => "center", 2026 x => "center",
1889 y => "center", 2027 y => "center",
1890 force_w => $WIDTH * 9/10, 2028 force_w => $WIDTH * 9/10,
1891 force_h => $HEIGHT * 9/10, 2029 force_h => $HEIGHT * 9/10,
… …
1925 "License, Author and Source info for media sent by the server."); 2063 "License, Author and Source info for media sent by the server.");
1926 2064
1927 $ntb->set_current_page ($INVENTORY_PAGE); 2065 $ntb->set_current_page ($INVENTORY_PAGE);
1928 2066
1929 $plwin->add ($ntb); 2067 $plwin->add ($ntb);
1930 $plwin
1931} 2068}
1932 2069
1933sub keyboard_setup { 2070sub keyboard_setup {
1934 DC::Macro::keyboard_setup 2071 DC::Macro::keyboard_setup
1935} 2072}
1936 2073
1937sub help_window { 2074sub make_help_window {
1938 my $win = new DC::UI::Toplevel 2075 my $win = new DC::UI::Toplevel
1939 x => 'center', 2076 x => 'center',
1940 y => 'center', 2077 y => 'center',
1941 z => 4, 2078 z => 4,
1942 name => 'doc_browser', 2079 name => 'doc_browser',
… …
2031 2168
2032 $load_node->((DC::Pod::find @path)[0]); 2169 $load_node->((DC::Pod::find @path)[0]);
2033 $win->show; 2170 $win->show;
2034 }; 2171 };
2035 2172
2036 $win 2173 $HELP_WINDOW = $win;
2037}
2038
2039sub open_string_query {
2040 my ($title, $cb, $txt, $tooltip) = @_;
2041 my $dialog = new DC::UI::Toplevel
2042 x => "center",
2043 y => "center",
2044 z => 50,
2045 force_w => $WIDTH * 4/5,
2046 title => $title;
2047
2048 $dialog->add (
2049 my $e = new DC::UI::Entry
2050 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2051 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2052 tooltip => $tooltip
2053 );
2054
2055 $e->grab_focus;
2056 $e->set_text ($txt) if $txt;
2057 $dialog->show;
2058} 2174}
2059 2175
2060sub open_quit_dialog { 2176sub open_quit_dialog {
2061 unless ($QUIT_DIALOG) { 2177 unless ($QUIT_DIALOG) {
2062 $QUIT_DIALOG = new DC::UI::Toplevel 2178 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2084 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2200 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2085 ); 2201 );
2086 $hb->add (new DC::UI::Button 2202 $hb->add (new DC::UI::Button
2087 text => "Quit anyway", 2203 text => "Quit anyway",
2088 expand => 1, 2204 expand => 1,
2089 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2205 on_activate => sub {
2206 crash "Quit anyway";
2207 EV::unloop EV::UNLOOP_ALL;
2208 },
2090 ); 2209 );
2091 } 2210 }
2092 2211
2093 $QUIT_DIALOG->show; 2212 $QUIT_DIALOG->show;
2094 $QUIT_DIALOG->grab_focus; 2213 $QUIT_DIALOG->grab_focus;
2214}
2215
2216sub make_menubar {
2217 $MENUFRAME = new DC::UI::Toplevel
2218 border => 0,
2219 force_x => 0,
2220 force_y => 0,
2221 force_w => $::WIDTH,
2222 child => ($MENUBAR = new DC::UI::HBox),
2223 ;
2224
2225 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2226
2227 # 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
2228 make_gauge_window->show;
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_playerbook;
2234
2235 $MENUPOPUP = DC::UI::Menu->new (items => [
2236 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2237 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2238 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2239 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2240 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2241 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2242 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2243 ["Quit…" , sub {
2244 if ($CONN) {
2245 open_quit_dialog;
2246 } else {
2247 EV::unloop EV::UNLOOP_ALL;
2248 }
2249 }],
2250 ]);
2251
2252 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2253 tooltip => "Shows the main menu",
2254 on_button_down => sub {
2255 my ($self, $ev) = @_;
2256 local $ev->{x} = 0;
2257 local $ev->{y} = 0;
2258 $MENUPOPUP->popup ($ev);
2259 },
2260 );
2261
2262 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2263 padding_x => 6,
2264 padding_y => 3,
2265 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2266 template => " Exp: 888,888,888,888 (lvl 188) ",
2267 );
2268
2269 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2270 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2271 . "will automatically pick up items as defined by your item pickup settings "
2272 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2273 . "disable autopickup by disabling this checkbox.",
2274 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2275 on_changed => sub {
2276 my ($self, $value) = @_;
2277 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2278 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2279 $CONN->send_pickup ($CFG->{pickup})
2280 if $CONN;
2281 },
2282 );
2283
2284 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2285 c_rescale => 1,
2286 padding_x => 6,
2287 padding_y => 3,
2288 force_w => $::WIDTH * 0.2,
2289 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2290 template => "two handed weapons 99%",
2291 );
2292
2293 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2294 expand => 1,
2295 align => 1, can_hover => 1, can_events => 1,
2296 text => "Range and Combat Slots",
2297 tooltip => "#stat_ranged",
2298 );
2299
2300 $MENUFRAME->show;
2301}
2302
2303sub open_string_query {
2304 my ($title, $cb, $txt, $tooltip) = @_;
2305 my $dialog = new DC::UI::Toplevel
2306 x => "center",
2307 y => "center",
2308 z => 50,
2309 force_w => $WIDTH * 4/5,
2310 title => $title;
2311
2312 $dialog->add (
2313 my $e = new DC::UI::Entry
2314 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2315 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2316 tooltip => $tooltip
2317 );
2318
2319 $e->grab_focus;
2320 $e->set_text ($txt) if $txt;
2321 $dialog->show;
2095} 2322}
2096 2323
2097sub show_tip_of_the_day { 2324sub show_tip_of_the_day {
2098 # find all tips 2325 # find all tips
2099 my @tod = DC::Pod::find tip_of_the_day => "*"; 2326 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2147 $dialog->show; 2374 $dialog->show;
2148 }; 2375 };
2149} 2376}
2150 2377
2151sub sdl_init { 2378sub sdl_init {
2152 DC::SDL_Init 2379 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2153 and die "SDL::Init failed!\n"; 2380 and die "SDL::Init failed!\n";
2154} 2381}
2155 2382
2156sub video_init { 2383sub video_init {
2384 DC::set_theme $CFG->{uitheme};
2385
2386 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2387 $SDL_REINIT = 0;
2388
2389 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2390 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2391 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2392 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2393
2394 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2395
2157 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2396 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2397 $CFG->{sdl_mode} = 0; # lowest resolution by default
2398
2399 # now choose biggest mode <= 1024x768
2400 for (0 .. $#SDL_MODES) {
2401 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2402 $CFG->{sdl_mode} = $_;
2403 }
2404 }
2405 }
2158 2406
2159 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2407 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2160 2408
2161 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2409 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2162 $FULLSCREEN = $CFG->{fullscreen}; 2410 $FULLSCREEN = $CFG->{fullscreen};
2163 $FAST = $CFG->{fast}; 2411 $FAST = $CFG->{fast};
2164 2412
2413 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2165 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2414 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2415 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2166 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2416 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2167 2417
2168 $SDL_ACTIVE = 1; 2418 $SDL_ACTIVE = 1;
2169 $LAST_REFRESH = time - 0.01; 2419 $LAST_REFRESH = time - 0.01;
2170 2420
… …
2217 2467
2218 (new DC::UI::Frame 2468 (new DC::UI::Frame
2219 bg => [0, 0, 0, 0.4], 2469 bg => [0, 0, 0, 0.4],
2220 force_x => 0, 2470 force_x => 0,
2221 force_y => "max", 2471 force_y => "max",
2222 child => (my $LR = new DC::UI::VBox), 2472 child => (my $LL = new DC::UI::VBox),
2223 )->show; 2473 )->show;
2224 2474
2225 $LR->add ($STATUSBOX); 2475 $LL->add ($STATUSBOX);
2226 $LR->add ($MODBOX); 2476 $LL->add ($MODBOX);
2227 $LR->add (new DC::UI::Label 2477 $LL->add (new DC::UI::Label
2228 align => 0, 2478 align => 0,
2229 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2479 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2230 fontsize => 0.5, 2480 fontsize => 0.5,
2231 fg => [1, 1, 0, 0.7], 2481 fg => [1, 1, 0, 0.7],
2232 ); 2482 );
2233 2483
2234 DC::UI::Toplevel->new ( 2484 DC::UI::Toplevel->new (
2235 title => "Minimap", 2485 title => "Minimap",
2236 name => "mapmap", 2486 name => "mapmap",
2237 x => 0, 2487 x => 0,
2238 y => $FONTSIZE + 8, 2488 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2239 border_bg => [1, 1, 1, 192/255], 2489 border_bg => [1, 1, 1, 192/255],
2240 bg => [1, 1, 1, 0], 2490 bg => [1, 1, 1, 0],
2241 child => ($MAPMAP = new DC::MapWidget::MapMap 2491 child => ($MAPMAP = new DC::MapWidget::MapMap
2242 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2492 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2243 ), 2493 ),
2244 )->show; 2494 )->show;
2245 2495
2246 $MAPWIDGET = new DC::MapWidget; 2496 $MAPWIDGET = new DC::MapWidget;
2247 $MAPWIDGET->connect (activate_console => sub { 2497 $MAPWIDGET->connect (activate_console => sub {
… …
2272 $METASERVER = metaserver_dialog; 2522 $METASERVER = metaserver_dialog;
2273 # the name is changed to not conflict with the older name as users could have hidden it 2523 # the name is changed to not conflict with the older name as users could have hidden it
2274 $MESSAGE_WINDOW = new DC::UI::Dockbar 2524 $MESSAGE_WINDOW = new DC::UI::Dockbar
2275 name => "message_window2", 2525 name => "message_window2",
2276 title => 'Messages', 2526 title => 'Messages',
2527 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2277 force_w => $::WIDTH * 0.6, 2528 force_w => $::WIDTH * 0.6,
2278 force_h => $::HEIGHT * 0.25, 2529 force_h => $::HEIGHT * 0.25,
2279 ; 2530 ;
2280 2531
2281 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2532 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2301 . "After pressing the combo the binding will be saved automatically and the " 2552 . "After pressing the combo the binding will be saved automatically and the "
2302 . "binding editor closes"); 2553 . "binding editor closes");
2303 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2554 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2304 "Some debuggin' options. Do not ask."); 2555 "Some debuggin' options. Do not ask.");
2305 2556
2306 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2557 make_help_window;
2558 make_menubar;
2307 2559
2308 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2309 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2310
2311# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2312# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2313
2314 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
2315
2316 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2317 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2318
2319 $BUTTONBAR->add (new DC::UI::Button
2320 text => "Save Config",
2321 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2322 on_activate => sub {
2323 $::CFG->{layout} = DC::UI::get_layout;
2324 DC::write_cfg;
2325 status "Configuration Saved";
2326 0
2327 },
2328 );
2329
2330 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2331 tooltip => "View Documentation");
2332
2333 $BUTTONBAR->add (new DC::UI::Button
2334 text => "Quit",
2335 tooltip => "Terminates the program",
2336 on_activate => sub {
2337 if ($CONN) {
2338 open_quit_dialog;
2339 } else {
2340 EV::unloop EV::UNLOOP_ALL;
2341 }
2342 0
2343 },
2344 );
2345
2346 $BUTTONBAR->show;
2347 $SETUP_DIALOG->show; 2560 $SETUP_DIALOG->show;
2348 $MESSAGE_WINDOW->show; 2561 $MESSAGE_WINDOW->show;
2349 } 2562 }
2350 2563
2564 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2565 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2566
2567 $CAVEAT_LABEL->set_text ("None :)");
2568 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2569 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2570
2351 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2571 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2352} 2572}
2353 2573
2354sub video_shutdown { 2574sub video_shutdown {
2355 DC::OpenGL::shutdown; 2575 DC::OpenGL::shutdown;
2576 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2356 2577
2357 undef $SDL_ACTIVE; 2578 undef $SDL_ACTIVE;
2358} 2579}
2359 2580
2360my %animate_object; 2581my %animate_object;
… …
2379my $want_refresh = EV::prepare_ns \&force_refresh; 2600my $want_refresh = EV::prepare_ns \&force_refresh;
2380 2601
2381my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2602my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2382 $NOW = EV::now; 2603 $NOW = EV::now;
2383 2604
2384 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2605 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2385 for DC::poll_events; 2606 for DC::poll_events;
2386 2607
2387 if (%animate_object) { 2608 if (%animate_object) {
2388 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2609 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2389 $WANT_REFRESH = 1; 2610 $WANT_REFRESH = 1;
… …
2401sub animation_stop { 2622sub animation_stop {
2402 my ($widget) = @_; 2623 my ($widget) = @_;
2403 delete $animate_object{$widget}; 2624 delete $animate_object{$widget};
2404} 2625}
2405 2626
2406%SDL_CB = (
2407 DC::SDL_QUIT => sub { 2627$SDL_CB[DC::SDL_QUIT] = sub {
2628 crash "SDL_QUIT";
2408 EV::unloop EV::UNLOOP_ALL; 2629 EV::unloop EV::UNLOOP_ALL;
2409 }, 2630};
2410 DC::SDL_VIDEORESIZE => sub { 2631$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2411 },
2412 DC::SDL_VIDEOEXPOSE => sub { 2632$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2413 DC::UI::full_refresh; 2633 DC::UI::full_refresh;
2414 }, 2634};
2415 DC::SDL_ACTIVEEVENT => sub { 2635$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2416# not useful, as APPACTIVE includes only iconified state, not unmapped 2636# not useful, as APPACTIVE includes only iconified state, not unmapped
2417# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2637# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2418# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2638# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2419# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2639# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2420# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2640# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2421# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2641# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2422 }, 2642};
2423 DC::SDL_KEYDOWN => sub { 2643$SDL_CB[DC::SDL_KEYDOWN] = sub {
2424 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2644 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2425 # alt-enter 2645 # alt-enter
2646 video_shutdown;
2426 $FULLSCREEN_ENABLE->toggle; 2647 $FULLSCREEN_ENABLE->toggle;
2427 video_shutdown;
2428 video_init; 2648 video_init;
2429 } else { 2649 } else {
2430 &DC::UI::feed_sdl_key_down_event; 2650 &DC::UI::feed_sdl_key_down_event;
2431 } 2651 }
2432 update_modbox; 2652 update_modbox;
2433 }, 2653};
2434 DC::SDL_KEYUP => sub { 2654$SDL_CB[DC::SDL_KEYUP] = sub {
2435 &DC::UI::feed_sdl_key_up_event; 2655 &DC::UI::feed_sdl_key_up_event;
2436 update_modbox; 2656 update_modbox;
2437 }, 2657};
2438 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2658$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2439 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2659$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2440 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2660$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2441 DC::SDL_USEREVENT => sub { 2661$SDL_CB[DC::SDL_USEREVENT] = sub {
2442 if ($_[0]{code} == 1) { 2662 if ($_[0]{code} == 1) {
2443 audio_channel_finished $_[0]{data1}; 2663 audio_channel_finished $_[0]{data1};
2444 } elsif ($_[0]{code} == 0) { 2664 } elsif ($_[0]{code} == 0) {
2445 audio_music_finished; 2665 audio_music_finished;
2446 }
2447 }, 2666 }
2448); 2667};
2449 2668
2450############################################################################# 2669#############################################################################
2451 2670
2452$SIG{INT} = $SIG{TERM} = sub { 2671$SIG{INT} = $SIG{TERM} = sub {
2453 EV::unloop; 2672 EV::unloop;
2454 #d# TODO calling exit here hangs the process in some futex 2673 #d# TODO calling exit here hangs the process in some futex
2455}; 2674};
2456 2675
2457{ 2676# due to mac os x + sdl combined braindamage, we need this contortion
2677sub main {
2678 {
2458 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2679 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2459 2680
2460 if (-e "$Deliantra::VARDIR/client.cf") { 2681 if (-e "$Deliantra::VARDIR/client.cf") {
2461 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2682 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2462 } else { 2683 } else {
2463 #TODO: compatibility cruft 2684 #TODO: compatibility cruft
2464 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2685 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2465 print STDERR "INFO: used old configuration file\n"; 2686 print STDERR "INFO: used old configuration file\n";
2466 } 2687 }
2467 2688
2468 DC::DB::Server::run; 2689 DC::DB::Server::run;
2469 2690
2470 if ($CFG->{db_schema} < 1) { 2691 if ($CFG->{db_schema} < 1) {
2471 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2692 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2472 DC::DB::nuke_db; 2693 DC::DB::nuke_db;
2473 $CFG->{db_schema} = 1; 2694 $CFG->{db_schema} = 1;
2474 DC::write_cfg; 2695 DC::write_cfg;
2475 } 2696 }
2476 2697
2477 DC::DB::open_db; 2698 DC::DB::open_db;
2478 2699
2479 DC::UI::set_layout ($::CFG->{layout}); 2700 DC::UI::set_layout ($::CFG->{layout});
2480 2701
2481 my %DEF_CFG = ( 2702 my %DEF_CFG = (
2703 config_autosave => 1,
2482 sdl_mode => 0, 2704 sdl_mode => undef,
2483 fullscreen => 1, 2705 fullscreen => 1,
2484 fast => 0, 2706 fast => 0,
2485 force_opengl11 => undef, 2707 force_opengl11 => undef,
2708 disable_alpha => 0,
2709 smooth_movement => 1,
2486 texture_compression => 1, 2710 texture_compression => 1,
2487 map_scale => 1, 2711 map_scale => 1,
2488 fow_enable => 1, 2712 fow_enable => 1,
2489 fow_intensity => 0, 2713 fow_intensity => 0,
2490 map_smoothing => 1, 2714 map_smoothing => 1,
2491 gui_fontsize => 1, 2715 gui_fontsize => 1,
2492 log_fontsize => 0.7, 2716 log_fontsize => 0.7,
2493 gauge_fontsize => 1, 2717 gauge_fontsize => 1,
2494 gauge_size => 0.35, 2718 gauge_size => 0.35,
2495 stat_fontsize => 0.7, 2719 stat_fontsize => 0.7,
2496 mapsize => 100, 2720 mapsize => 100,
2497 audio_enable => 1, 2721 audio_enable => 1,
2498 audio_hw_channels => 0, 2722 audio_hw_channels => 0,
2499 audio_hw_frequency => 0, 2723 audio_hw_frequency => 0,
2500 audio_hw_chunksize => 0, 2724 audio_hw_chunksize => 0,
2501 audio_mix_channels => 8, 2725 audio_mix_channels => 8,
2502 effects_enable => 1, 2726 effects_enable => 1,
2503 effects_volume => 1, 2727 effects_volume => 1,
2504 bgm_enable => 1, 2728 bgm_enable => 1,
2505 bgm_volume => 0.5, 2729 bgm_volume => 0.5,
2506 output_rate => "", 2730 output_rate => "",
2507 pickup => 0, 2731 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2508 inv_sort => "mtime", 2732 inv_sort => "mtime",
2509 default => "profile", # default profile 2733 default => "profile", # default profile
2510 show_tips => 1, 2734 show_tips => 1,
2511 logview_max_par => 1000, 2735 logview_max_par => 1000,
2512 shift_fire_stop => 0, 2736 shift_fire_stop => 0,
2737 uitheme => "wood",
2738 map_shift_x => -24, # arbitrary
2739 map_shift_y => +24, # arbitrary
2513 ); 2740 );
2514 2741
2515 while (my ($k, $v) = each %DEF_CFG) { 2742 while (my ($k, $v) = each %DEF_CFG) {
2516 $CFG->{$k} = $v unless exists $CFG->{$k}; 2743 $CFG->{$k} = $v unless exists $CFG->{$k};
2517 } 2744 }
2518 2745
2519 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2746 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2520 $PROFILE = $CFG->{profile}{default}; 2747 $PROFILE = $CFG->{profile}{default};
2521 2748
2522 # convert old bindings (only default profile matters) 2749 # convert old bindings (only default profile matters)
2523 if (my $bindings = delete $PROFILE->{bindings}) { 2750 if (my $bindings = delete $PROFILE->{bindings}) {
2524 while (my ($mod, $syms) = each %$bindings) { 2751 while (my ($mod, $syms) = each %$bindings) {
2525 while (my ($sym, $cmds) = each %$syms) { 2752 while (my ($sym, $cmds) = each %$syms) {
2526 push @{ $PROFILE->{macro} }, { 2753 push @{ $PROFILE->{macro} }, {
2527 accelkey => [$mod*1, $sym*1], 2754 accelkey => [$mod*1, $sym*1],
2528 action => $cmds, 2755 action => $cmds,
2756 };
2529 }; 2757 }
2530 } 2758 }
2531 } 2759 }
2532 }
2533 2760
2534 sdl_init; 2761 sdl_init;
2535 2762
2536 @SDL_MODES = DC::SDL_ListModes 8, 8; 2763 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2537 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2764 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2538 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2539 2765
2540 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2766 {
2541
2542 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2543
2544 {
2545 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2767 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2546 DejaVuSans.ttf 2768 DejaVuSans.ttf
2547 DejaVuSansMono.ttf 2769 DejaVuSansMono.ttf
2548 DejaVuSans-Bold.ttf 2770 DejaVuSans-Bold.ttf
2549 DejaVuSansMono-Bold.ttf 2771 DejaVuSansMono-Bold.ttf
2550 DejaVuSans-Oblique.ttf 2772 DejaVuSans-Oblique.ttf
2551 DejaVuSansMono-Oblique.ttf 2773 DejaVuSansMono-Oblique.ttf
2552 DejaVuSans-BoldOblique.ttf 2774 DejaVuSans-BoldOblique.ttf
2553 DejaVuSansMono-BoldOblique.ttf 2775 DejaVuSansMono-BoldOblique.ttf
2776 mona.ttf
2554 ); 2777 );
2555 2778
2556 DC::add_font $_ for @fonts; 2779 DC::add_font $_ for @fonts;
2557 2780
2558 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2781 $FONT_PROP = new_from_file DC::Font $fonts[0];
2559 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2782 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2560 2783
2561 $FONT_PROP->make_default; 2784 $FONT_PROP->make_default;
2562 2785
2563 DC::pango_init; 2786 DC::pango_init;
2564 } 2787 }
2565 2788
2566# compare mono (ft) vs. rgba (cairo) 2789# compare mono (ft) vs. rgba (cairo)
2567# ft - 1.8s, cairo 3s, even in alpha-only mode 2790# ft - 1.8s, cairo 3s, even in alpha-only mode
2568# for my $rgba (0..1) { 2791# for my $rgba (0..1) {
2569# my $t1 = Time::HiRes::time; 2792# my $t1 = Time::HiRes::time;
… …
2574# } 2797# }
2575# my $t2 = Time::HiRes::time; 2798# my $t2 = Time::HiRes::time;
2576# warn $t2-$t1; 2799# warn $t2-$t1;
2577# } 2800# }
2578 2801
2579 video_init; 2802 video_init;
2580 audio_init; 2803 audio_init;
2581} 2804 }
2582 2805
2583show_tip_of_the_day if $CFG->{show_tips}; 2806 show_tip_of_the_day if $CFG->{show_tips};
2584 2807
2585our $STARTUP_CANCEL = EV::idle sub { 2808 our $STARTUP_CANCEL = EV::idle sub {
2586 undef $::STARTUP_CANCEL; 2809 undef $::STARTUP_CANCEL;
2587 $startup_done->(); 2810 $startup_done->();
2588}; 2811 };
2589 2812
2590delete $SIG{__DIE__}; 2813 delete $SIG{__DIE__};
2591EV::loop; 2814 EV::loop;
2592 2815
2816 DC::write_cfg if $CFG->{config_autosave};
2817
2593#video_shutdown; 2818 #video_shutdown;
2594#audio_shutdown; 2819 #audio_shutdown;
2820
2595DC::OpenGL::quit; 2821 DC::OpenGL::quit;
2596DC::SDL_Quit; 2822 DC::SDL_Quit;
2597DC::DB::Server::stop; 2823 DC::DB::Server::stop;
2824}
2825
2826DC::SDL_braino; # see sub above
2598 2827
2599=head1 NAME 2828=head1 NAME
2600 2829
2601deliantra - A Deliantra MORPG game client 2830deliantra - A Deliantra MORPG game client
2602 2831
… …
2619 4 show fps 2848 4 show fps
2620 8 suppress tooltips 2849 8 suppress tooltips
2621 2850
2622=head1 AUTHOR 2851=head1 AUTHOR
2623 2852
2624Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2853Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2625 2854
2626 2855
2627 2856

Diff Legend

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