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.47 by root, Mon Jul 7 05:02:03 2008 UTC vs.
Revision 1.108 by root, Thu Apr 8 04:49:32 2010 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3{
4package Deliantra::Client; # work around CPAN breakage
5}
6 2
7if ($ENV{DELIANTRA_CORO_DEBUG}) { 3if ($ENV{DELIANTRA_CORO_DEBUG}) {
8 eval ' 4 eval '
9 use Coro; 5 use Coro;
10 use Coro::EV; 6 use Coro::EV;
21 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
22 } 18 }
23 19
24 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
25 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
26 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
27 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
28 ); 29 );
29 30
30 $startup_done = sub { 31 $startup_done = sub {
31 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
32 }; 33 };
33 } 34 }
34} 35}
35 36
36use strict; 37use common::sense;
37use utf8;
38 38
39use Carp 'verbose'; 39use Carp 'verbose';
40 40
41# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
42BEGIN { 42BEGIN {
54 } 54 }
55 55
56 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
57 # pango is relocatable on win32 57 # pango is relocatable on win32
58 } else { 58 } else {
59 open my $fh, "<:perlio", "$root/pangoversion" 59 # OS X
60 or die "pangoversion: $!";
61 my $PANGO = <$fh>;
62 # unix, need to patch pango rc file
63 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
64 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
65 local $/;
66 my $rc = <$fh>;
67 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
68
69 mkdir "$root/pango-modules";
70 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
71 or die "$root/pango-modules/pango.modules: $!";
72 print $fh $rc;
73
74 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
75 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 61 $ENV{DYLD_LIBRARY_PATH} = $root;
76 or die "$ENV{PANGO_RC_FILE}: $!"; 62 chdir $root; # for pango modules, maybe other things
77 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
78 } 63 }
79 64
80 unshift @INC, $root; 65 unshift @INC, $root;
81 } 66 }
82} 67}
83 68
84# prepend private library directory 69# prepend private library directory and prepare env
85BEGIN { 70BEGIN {
86 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
87 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
88 if (-d $path) { 73 if (-d $path) {
89 unshift @INC, $path; 74 unshift @INC, $path;
94 79
95# need to do it again because that pile of garbage called PAR nukes it before main 80# need to do it again because that pile of garbage called PAR nukes it before main
96unshift @INC, $ENV{PAR_TEMP} 81unshift @INC, $ENV{PAR_TEMP}
97 if %PAR::LibCache; 82 if %PAR::LibCache;
98 83
99use Time::HiRes 'time';
100use EV; 84use EV;
85BEGIN { *time = \&EV::time }
86
101use List::Util qw(max min); 87use List::Util qw(max min);
102 88
103use Deliantra; 89use Deliantra;
104use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
105 91
92use AnyEvent::Util ();
93use AnyEvent::Socket ();
106use AnyEvent::DNS; 94use AnyEvent::DNS ();
107 95
108use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
109 98
110use DC; 99use DC;
111BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 100
101sub crash($;$) {
102 # nop during compiletime
103}
104
105BEGIN {
106 $SIG{__DIE__} = sub {
107 return if $^S;
108 crash "CRASH/DIE: $_[0]" => 1;
109 DC::fatal Carp::longmess "$_[0]";
110 }
111}
112
112use DC::OpenGL (); 113use DC::OpenGL ();
113use DC::Protocol; 114use DC::Protocol;
114use DC::DB; 115use DC::DB;
115use DC::UI; 116use DC::UI;
116use DC::UI::Canvas; 117use DC::UI::Canvas;
117use DC::UI::Inventory; 118use DC::UI::Inventory;
118use DC::UI::SpellList; 119use DC::UI::SpellList;
119use DC::UI::Dockable; 120use DC::UI::Dockable;
120use DC::UI::Dockbar; 121use DC::UI::Dockbar;
121use DC::UI::MessageWindow;
122use DC::UI::ChatView; 122use DC::UI::ChatView;
123use DC::MessageDistributor; 123use DC::MessageDistributor;
124use DC::Pod; 124use DC::Pod;
125use DC::MapWidget; 125use DC::MapWidget;
126use DC::Macro; 126use DC::Macro;
127 127
128$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
129$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
130 130
131$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
132 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
133}; 134};
134 135
135my $MAX_FPS = 60; 136my $MAX_FPS = 60;
136 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
137our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
138 141
139our $LAST_REFRESH; 142our $LAST_REFRESH;
140our $NOW; 143our $NOW;
141 144
142our $CFG; 145our $CFG;
143our $CONN;
144our $PROFILE; # current profile 146our $PROFILE; # current profile
145our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
146 148
147our $WANT_REFRESH; 149our $WANT_REFRESH;
148 150
151our $MODE_SLIDER;
152our $CAVEAT_LABEL;
153
149our @SDL_MODES; 154our @SDL_MODES;
155our $SDL_REINIT = 1;
150our $WIDTH; 156our $WIDTH;
151our $HEIGHT; 157our $HEIGHT;
152our $FULLSCREEN; 158our $FULLSCREEN;
153our $FONTSIZE; 159our $FONTSIZE;
154 160
155our $FONT_PROP; 161our $FONT_PROP;
156our $FONT_FIXED; 162our $FONT_FIXED;
157 163
164our $CONN;
165
158our $MAP; 166our $MAP;
159our $MAPMAP; 167our $MAPMAP;
160our $MAPWIDGET; 168our $MAPWIDGET;
161our $COMPLETER; 169our $COMPLETER;
162our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
163our $METASERVER; 174our $METASERVER;
164our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
165our $QUIT_DIALOG; 176our $QUIT_DIALOG;
166our $HOST_ENTRY; 177our $HOST_ENTRY;
167our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
193our $FLOORBOX; 204our $FLOORBOX;
194our $GAUGES; 205our $GAUGES;
195our $STATWIDS; 206our $STATWIDS;
196 207
197our $SDL_ACTIVE; 208our $SDL_ACTIVE;
198our %SDL_CB; 209our @SDL_CB;
199 210
200our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
201our $STATUSBOX; 212our $STATUSBOX;
202our $MODBOX; 213our $MODBOX;
203our $DEBUG_STATUS; 214our $DEBUG_STATUS;
204 215
205our $INV; 216our $INV;
206our $INVR; 217our $INVR;
207our $INVR_HB; 218our $INVR_HB;
219
220#############################################################################
221
222# write a crash message blockingly to the socket, if possible
223# this is a bit too complicated for my tastes, but it was easy.
224*crash = sub($;$) {
225 my ($msg, $backtrace) = @_;
226
227 warn $msg;
228
229 return unless $CONN;
230
231 my $fh = $CONN->{fh}
232 or return;
233
234 my $buf = delete $CONN->{wbuf};
235
236 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
237
238 AnyEvent::Util::fh_nonblocking $fh, 0;
239 syswrite $fh, $buf;
240 AnyEvent::Util::fh_nonblocking $fh, 1;
241
242 $msg =~ s/\s+$//;
243
244 # backtrace as second step, in case it crashes, too
245 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
246 if $backtrace;
247};
248
249sub clienterror($;$) {
250 my ($msg, $backtrace) = @_;
251
252 warn $msg;
253
254 return unless $CONN;
255
256 $CONN->send_exti_msg (clientlog => $msg);
257 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
258}
208 259
209############################################################################# 260#############################################################################
210 261
211sub status { 262sub status {
212 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
294 or return; 345 or return;
295 346
296 $meta->{data} 347 $meta->{data}
297 or return; 348 or return;
298 349
299 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
300 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
301 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 352 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
302 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
303 &audio_music_push ($face); 354 &audio_music_push ($face);
304 } 355 }
305 } else { 356 } else {
306 # fetch from database 357 # fetch from database
307 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
308 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
309 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
310 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 361 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
311 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
312 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
313 364
314 audio_sound_push ($face); 365 audio_sound_push ($face);
315 }; 366 };
362 413
363 audio_music_update_volume; 414 audio_music_update_volume;
364 415
365 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
366 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
367 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
368 ? new_from_file DC::RW $meta->{path} 422 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
369 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
370 424
371 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
372 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
373 427
374 my $NOW = time; 428 my $NOW = time;
375 429
376 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
377 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
486 sub audio_tab_update; 540 sub audio_tab_update;
487 audio_tab_update; 541 audio_tab_update;
488} 542}
489 543
490sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
491 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
492 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
493 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
494 553
495 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
735} 794}
736 795
737sub dc_connect { 796sub dc_connect {
738 my ($host, $port) = @_; 797 my ($host, $port) = @_;
739 798
740 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 799 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
800 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
741 801
742 $CONN = 802 $CONN =
743 new DC::Protocol 803 new DC::Protocol
744 host => $host, 804 host => $host,
745 port => $port || 13327, 805 port => $port,
746 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
747 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
748 mapw => $mapsize, 808 mapw => $mapw,
749 maph => $mapsize, 809 maph => $maph,
750 810
811 version => {
812 client => "deliantra",
751 client => "$DC::VERSION $] $^O", 813 clientver => $DC::VERSION,
814 gl_vendor => DC::OpenGL::gl_vendor,
815 gl_version => DC::OpenGL::gl_version,
816 },
752 817
753 map_widget => $MAPWIDGET, 818 map_widget => $MAPWIDGET,
754 statusbox => $STATUSBOX, 819 statusbox => $STATUSBOX,
755 map => $MAP, 820 map => $MAP,
756 mapmap => $MAPMAP, 821 mapmap => $MAPMAP,
762 827
763 on_connect => sub { 828 on_connect => sub {
764 if ($_[0]) { 829 if ($_[0]) {
765 DC::lowdelay fileno $CONN->{fh}; 830 DC::lowdelay fileno $CONN->{fh};
766 831
767 status "login successful"; 832 status "successfully connected to the server";
768 } else { 833 } else {
769 undef $CONN; 834 undef $CONN;
770 status "unable to connect: $!"; 835 status "unable to connect: $!";
771 stop_game(); 836 stop_game();
772 } 837 }
774 ; 839 ;
775} 840}
776 841
777sub start_game { 842sub start_game {
778 status "logging in..."; 843 status "logging in...";
844
845 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
846 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
847 or return status "$server: unable to parse server address, try an empty field.";
779 848
780 $LOGIN_BUTTON->set_text ("Logout"); 849 $LOGIN_BUTTON->set_text ("Logout");
781 $SETUP_DIALOG->hide; 850 $SETUP_DIALOG->hide;
782
783 my ($host, $port) = split /:/, $PROFILE->{host};
784 851
785 $MAP = new DC::Map; 852 $MAP = new DC::Map;
786 853
787 # hack to make SURE we find the IP address all right 854 # hack to make SURE we find the IP address all right
788 # can be removed once AnyEvent::DNS is proven stable. 855 # can be removed once AnyEvent::DNS is proven stable.
789 if ($host eq "gameserver.deliantra.net") { 856 if ($host eq "gameserver.deliantra.net") {
790 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 857 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
791 if ($_[0] ne "80.101.114.108") { # Perl 858 if ($_[0] ne "80.101.114.108") { # Perl
859 status "dns failure, trying differently";
860 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
861 unless (defined $host) {
792 status "dns failure, using hardcoded address"; 862 status "dns failure, using hardcoded address";
793 $host = "129.13.162.95"; 863 $host = "129.13.162.95";
864 }
794 } 865 }
795 866
796 dc_connect $host, $port; 867 dc_connect $host, $port;
797 }; 868 };
798 } else { 869 } else {
799 dc_connect $host, $port; 870 dc_connect $host, $port;
800 } 871 }
801} 872}
802 873
803sub stop_game { 874sub stop_game {
875 crash "stop_game";
876
804 $LOGIN_BUTTON->set_text ("Login / Register"); 877 $LOGIN_BUTTON->set_text ("Login / Register");
805 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 878 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
806 $SETUP_DIALOG->show; 879 $SETUP_DIALOG->show;
807 $PL_WINDOW->hide; 880 $PL_WINDOW->hide;
808 $SPELL_LIST->clear_spells; 881 $SPELL_LIST->clear_spells;
822} 895}
823 896
824sub graphics_setup { 897sub graphics_setup {
825 my $vbox = new DC::UI::VBox; 898 my $vbox = new DC::UI::VBox;
826 899
900 {
901 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
902
827 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 903 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
828 904
829 my $row = 0; 905 my $row = 0;
830 906
831 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
832 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 908 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
833 can_events => 1, 909 can_events => 1,
834 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 910 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
835 911
912 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
913 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
914 can_events => 1,
915 tooltip => "This field shows any known issues with your config or driver, such as "
916 . "a non-accelerated display format. You can try to work around these issues "
917 . "by selecting a different video mode, changing the settings below or "
918 . "by installing the right driver for your graphics card.");
919
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
921 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
922 value => $CFG->{uitheme},
923 options => [
924 [wood => "Wood (the default)"],
925 [plain => "Plain (very)"],
926 [blue => "Blue (dark)"],
927 [metal => "Metal (light)"],
928 ],
929 tooltip => "Choose the User Interface theme that you like most :)",
930 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
931 );
932
836 my $vidmode_tooltip = 933 my $vidmode_tooltip =
837 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 934 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
838 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 935 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
839 936
840 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
841 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 938 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
842 939
843 $hbox->add (my $mode_slider = new DC::UI::Slider 940 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
844 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 941 c_rescale => 1,
942 force_w => $WIDTH * 0.1, expand => 1,
943 range => [ ($CFG->{sdl_mode}) x 3 ],
845 tooltip => $vidmode_tooltip); 944 tooltip => $vidmode_tooltip);
846 $hbox->add (my $mode_label = new DC::UI::Label 945 $hbox->add (my $mode_label = new DC::UI::Label
847 height => 0.8, template => "9999x9999@9+9", 946 height => 0.8, template => "9999x9999@9+9",
848 can_events => 1, tooltip => $vidmode_tooltip); 947 can_events => 1, tooltip => $vidmode_tooltip);
849 948
850 $mode_slider->connect (changed => sub { 949 $MODE_SLIDER->connect (changed => sub {
851 my ($self, $value) = @_; 950 my ($self, $value) = @_;
852 951
853 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 952 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
854 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 953 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
855 }); 954 });
856 $mode_slider->emit (changed => $mode_slider->{range}[0]); 955 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
857 956
858 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
859 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 958 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
860 state => $CFG->{fullscreen}, 959 state => $CFG->{fullscreen},
861 tooltip => "Bring the client into fullscreen mode.", 960 tooltip => "Bring the client into fullscreen mode.",
862 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 961 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
863 ); 962 );
864 963
865 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 964 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
866 $table->add_at (1, $row++, new DC::UI::CheckBox 965 $table->add_at (1, $row++, new DC::UI::CheckBox
867 state => $CFG->{force_opengl11}, 966 state => $CFG->{force_opengl11},
868 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 967 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
869 . "higher memory usage and slower performance. It will, however, help tremendously on " 968 . "higher memory usage and slower performance. It will, however, help tremendously on "
870 . "cards that claim to support a feature but fall back to software rendering. " 969 . "cards that claim to support a feature but fall back to software rendering. "
871 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 970 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
872 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 971 . "but cards and drivers from other vendors (ATI) are often just as bad. "
873 . "experience extremely low framerates and your card should do better, try this option.</b>", 972 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
874 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 973 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
875 ); 974 );
876 975
976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
977 $table->add_at (1, $row++, new DC::UI::CheckBox
978 state => $CFG->{disable_alpha},
979 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
980 . "by disabling a number of textures and transparency effects. Normally, these "
981 . "effects do not cost a lot of resources, but some graphics cards might fall "
982 . "back to extremely slow rendering if this is enabled. If disabling this option "
983 . "noticably improves the framerate of the client please report this! "
984 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
985 on_changed => sub {
986 my ($self, $value) = @_;
987 $CFG->{disable_alpha} = $value;
988 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
989 0
990 }
991 );
992
877 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
878 $table->add_at (1, $row++, new DC::UI::CheckBox 994 $table->add_at (1, $row++, new DC::UI::CheckBox
879 state => $CFG->{texture_compression}, 995 state => $CFG->{texture_compression},
880 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 996 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
881 . "will save a lot of memory and increase performance. The compression algorithm " 997 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
882 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 998 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
883 . "forced OpenGL 1.1 mode.", 999 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
884 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
885 ); 1001 );
886 1002
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
888 $table->add_at (1, $row++, new DC::UI::CheckBox 1004 $table->add_at (1, $row++, new DC::UI::CheckBox
889 state => $CFG->{fast}, 1005 state => $CFG->{fast},
890 tooltip => "Lower the visual quality considerably to speed up rendering.", 1006 tooltip => "Lower the visual quality considerably to speed up rendering.",
891 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
892 ); 1008 );
893 1009
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1010 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
895 $table->add_at (1, $row++, new DC::UI::Slider 1011 $table->add_at (1, $row++, new DC::UI::Slider
896 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1012 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
897 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1013 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
898 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1014 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
899 ); 1015 );
900 1016
901 $table->add_at (1, $row++, new DC::UI::Button 1017 $table->add_at (1, $row++, new DC::UI::Button
902 expand => 1, text => "Apply", 1018 expand => 1, text => "Apply",
903 tooltip => "Apply the video settings above.", 1019 tooltip => "Apply the video settings above.",
904 on_activate => sub { 1020 on_activate => sub {
905 video_shutdown (); 1021 video_shutdown ();
906 video_init (); 1022 video_init ();
1023 0
907 0 1024 }
908 } 1025 );
1026 }
1027
1028 {
1029 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1030
1031 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1032
1033 my $row = 0;
1034 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1035 $table->add_at (1, $row++, new DC::UI::CheckBox
1036 state => $CFG->{smooth_movement},
1037 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1038 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1039 . "then disable this option. Changes take effect immdiately.",
1040 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
909 ); 1041 );
910 1042
1043 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1044 $table->add_at (1, $row++, new DC::UI::CheckBox
1045 state => $CFG->{smooth_transitions},
1046 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1047 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1048 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1049 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1050 );
1051
1052
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
912 $table->add_at (1, $row++, new DC::UI::Slider 1054 $table->add_at (1, $row++, new DC::UI::Slider
913 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1055 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
914 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1056 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
915 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1057 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
916 ); 1058 );
917 1059
918 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
919 $table->add_at (1, $row++, new DC::UI::CheckBox 1061 $table->add_at (1, $row++, new DC::UI::CheckBox
920 state => $CFG->{map_smoothing}, 1062 state => $CFG->{map_smoothing},
921 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1063 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
922 . "This increases load on the graphics subsystem and works only with TRT servers. " 1064 . "This increases load on the graphics subsystem and works only with TRT servers. "
923 . "Changes take effect at next login only.", 1065 . "Changes take effect at next login only.",
924 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
925 ); 1067 );
926 1068
927 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
928 $table->add_at (1, $row++, new DC::UI::CheckBox 1070 $table->add_at (1, $row++, new DC::UI::CheckBox
929 state => $CFG->{fow_enable}, 1071 state => $CFG->{fow_enable},
930 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1072 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
931 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1073 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
932 ); 1074 );
933 1075
1076 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1077 $table->add_at (1, $row++, new DC::UI::ImageButton
1078 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1079 bg => [0.3, 0.3, 0.2],
1080 force_w => 64,
1081 force_h => 64,
1082 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1083 on_activate => sub {
1084 my ($self) = @_;
1085 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1086 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1087 $MAPWIDGET->update;
1088 }
1089 );
1090
934 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1091 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
935 $table->add_at (1, $row++, new DC::UI::Slider 1092 $table->add_at (1, $row++, new DC::UI::Slider
936 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1093 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
937 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1094 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
938 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1095 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
939 ); 1096 );
940 1097
941 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1098 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
942 $table->add_at (1, $row++, new DC::UI::Slider 1099 $table->add_at (1, $row++, new DC::UI::Slider
943 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1100 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
944 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1101 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
945 . "but you still need to press apply to correctly re-layout the widget.", 1102 . "but you still need to press apply to correctly re-layout the widget.",
946 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1103 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
947 ); 1104 );
948 1105
949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1106 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
950 $table->add_at (1, $row++, new DC::UI::Slider 1107 $table->add_at (1, $row++, new DC::UI::Slider
951 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1108 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
952 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1109 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
953 on_changed => sub { 1110 on_changed => sub {
954 $CFG->{gauge_fontsize} = $_[1]; 1111 $CFG->{gauge_fontsize} = $_[1];
955 &set_gauge_window_fontsize; 1112 &set_gauge_window_fontsize;
1113 0
956 0 1114 }
957 } 1115 );
958 );
959 1116
960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1117 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
961 $table->add_at (1, $row++, new DC::UI::Slider 1118 $table->add_at (1, $row++, new DC::UI::Slider
962 range => [$CFG->{gauge_size}, 0.2, 0.8], 1119 range => [$CFG->{gauge_size}, 0.2, 0.8],
963 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1120 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
964 on_changed => sub { 1121 on_changed => sub {
965 $CFG->{gauge_size} = $_[1]; 1122 $CFG->{gauge_size} = $_[1];
966 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1123 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1124 0
967 0 1125 }
968 } 1126 );
969 ); 1127 }
970 1128
971 $vbox 1129 $vbox
972} 1130}
973 1131
974our $AUDIO_HW_CHUNKSIZE; 1132our $AUDIO_HW_CHUNKSIZE;
987 1145
988 my $text = !$freq 1146 my $text = !$freq
989 ? "audio is off" 1147 ? "audio is off"
990 : "audio is enabled\n" 1148 : "audio is enabled\n"
991 . "frequency (Hz): $freq\n" 1149 . "frequency (Hz): $freq\n"
992 . "channels: $chans"; 1150 . "channels: $chans\n"
1151 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1152 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
993 1153
994 $AUDIO_INFO->set_text ($text); 1154 $AUDIO_INFO->set_text ($text);
995} 1155}
996 1156
997sub audio_setup { 1157sub audio_setup {
1137} 1297}
1138 1298
1139sub make_gauge_window { 1299sub make_gauge_window {
1140 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1300 my $gh = int $HEIGHT * $CFG->{gauge_size};
1141 1301
1142 my $win = new DC::UI::Frame ( 1302 $GAUGES->{win} = my $win = new DC::UI::Frame (
1143 force_x => 0, 1303 force_x => 0,
1144 force_y => "max", 1304 force_y => "max",
1145 force_w => $WIDTH, 1305 force_w => $WIDTH,
1146 force_h => $gh, 1306 force_h => $gh,
1147 ); 1307 );
1163 (new DC::UI::Empty expand => 1), 1323 (new DC::UI::Empty expand => 1),
1164 (my $hb = new DC::UI::HBox), 1324 (my $hb = new DC::UI::HBox),
1165 ], 1325 ],
1166 ); 1326 );
1167 1327
1168 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1328 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1169 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1329 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1170 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1330 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1171 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1331 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1172
1173 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1174 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1175 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1176 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1177
1178 $GAUGES = {
1179 exp => $exp, prg => $prg, sklprg => $sklprg,
1180 win => $win, range => $rng,
1181 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1182 };
1183 1332
1184 &set_gauge_window_fontsize; 1333 &set_gauge_window_fontsize;
1185 1334
1186 $win 1335 $win
1187} 1336}
1528 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1677 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1529 ); 1678 );
1530 1679
1531 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1680 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1532 $table->add_at (1, 4, new DC::UI::Entry 1681 $table->add_at (1, 4, new DC::UI::Entry
1533 text => $CFG->{profile}{default}{user}, 1682 text => $PROFILE->{user},
1534 tooltip => "The name of your character on the server.", 1683 tooltip => "The name of your character on the server. The name is case-sensitive!",
1535 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1684 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1536 ); 1685 );
1537 1686
1538 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1687 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1539 $table->add_at (1, 5, new DC::UI::Entry 1688 $table->add_at (1, 5, new DC::UI::Entry
1540 text => $CFG->{profile}{default}{password}, 1689 text => $PROFILE->{password},
1541 hidden => 1, 1690 hidden => 1,
1542 tooltip => "The password for your character.", 1691 tooltip => "The password for your character.",
1543 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1692 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1544 ); 1693 );
1545 1694
1546 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1695 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1547 expand => 1, 1696 expand => 1,
1548 text => "Login / Register", 1697 text => "Login / Register",
1553 1 1702 1
1554 }, 1703 },
1555 ); 1704 );
1556 1705
1557 $vbox->add (new DC::UI::FancyFrame 1706 $vbox->add (new DC::UI::FancyFrame
1558 label => "Registering", 1707 label => "How to Play",
1559 min_h => 200, 1708 min_h => 240,
1560 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1709 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1561 markup => 1710 markup =>
1711 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1712 . "Then register a new account (or use an existing one if you have one). "
1562 "To register a new account, choose a username that hasn't been taken yet and " 1713 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1563 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1714 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1564 ), 1715 ),
1565 ); 1716 );
1566 1717
1567 $vbox 1718 $vbox
1582 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1733 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1583 1734
1584 $vbox->add ( 1735 $vbox->add (
1585 $HOST_ENTRY = new DC::UI::Entry 1736 $HOST_ENTRY = new DC::UI::Entry
1586 expand => 1, 1737 expand => 1,
1587 text => $CFG->{profile}{default}{host}, 1738 text => $PROFILE->{host},
1588 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1739 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1589 on_changed => sub { 1740 on_changed => sub {
1590 my ($self, $value) = @_; 1741 my ($self, $value) = @_;
1591 $CFG->{profile}{default}{host} = $value; 1742 $PROFILE->{host} = $value;
1592 1 1743 1
1593 } 1744 }
1594 ); 1745 );
1595 1746
1596 if (0) { #d# disabled 1747 if (0) { #d# disabled
1639 1790
1640 my $row = 0; 1791 my $row = 0;
1641 1792
1642 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1793 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1643 $table->add_at (1, $row++, new DC::UI::CheckBox 1794 $table->add_at (1, $row++, new DC::UI::CheckBox
1795 c_colspan => 2,
1644 state => $CFG->{show_tips}, 1796 state => $CFG->{show_tips},
1645 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1797 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1646 on_changed => sub { 1798 on_changed => sub {
1647 my ($self, $value) = @_; 1799 my ($self, $value) = @_;
1648 $CFG->{show_tips} = $value; 1800 $CFG->{show_tips} = $value;
1650 } 1802 }
1651 ); 1803 );
1652 1804
1653 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1805 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1654 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1806 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1807 c_colspan => 2,
1655 text => $CFG->{logview_max_par}, 1808 text => $CFG->{logview_max_par},
1656 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1809 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1657 . "sends more messages than this number, older messages get removed to save memory and " 1810 . "sends more messages than this number, older messages get removed to save memory and "
1658 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1811 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1659 on_changed => sub { 1812 on_changed => sub {
1661 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1814 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1662 0 1815 0
1663 }, 1816 },
1664 ); 1817 );
1665 1818
1819 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1820 $table->add_at (1, $row, new DC::UI::CheckBox
1821 state => $CFG->{config_autosave},
1822 tooltip => "Normally, configuration settings and the user interface layout "
1823 . "are saved on client exit. You can disable this behaviour by "
1824 . "unchecking this checkbox.",
1825 on_changed => sub {
1826 my ($self, $value) = @_;
1827 $CFG->{config_autosave} = $value;
1828 0
1829 }
1830 );
1831 $table->add_at (2, $row++, new DC::UI::Button
1832 text => "Save Now",
1833 tooltip => "Use this to manually save configuration and UI layout when "
1834 . "autosave is disabled.",
1835 on_activate => sub {
1836 DC::write_cfg;
1837 0
1838 }
1839 );
1840
1666 $table 1841 $table
1667} 1842}
1668 1843
1669sub autopickup_setup { 1844sub autopickup_setup {
1670 my $r = new DC::UI::ScrolledWindow ( 1845 my $r = new DC::UI::ScrolledWindow (
1676 col_expand => [0, 1, 0, 1], 1851 col_expand => [0, 1, 0, 1],
1677 ); 1852 );
1678 1853
1679 for ( 1854 for (
1680 ["General", 0, 0, 1855 ["General", 0, 0,
1681 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1682 ["Inhibit autopickup" => PICKUP_INHIBIT], 1856# ["Inhibit autopickup" => PICKUP_INHIBIT],
1683 ["Stop before pickup" => PICKUP_STOP], 1857 ["Stop before pickup" => PICKUP_STOP],
1684 ["Debug autopickup" => PICKUP_DEBUG], 1858 ["Debug autopickup" => PICKUP_DEBUG],
1685 ], 1859 ],
1686 ["Weapons", 0, 6, 1860 ["Weapons", 0, 6,
1687 ["All weapons" => PICKUP_ALLWEAPON], 1861 ["All weapons" => PICKUP_ALLWEAPON],
1713 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1887 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1714 ["Ignore cursed" => PICKUP_NOT_CURSED], 1888 ["Ignore cursed" => PICKUP_NOT_CURSED],
1715 ["Jewelery" => PICKUP_JEWELS], 1889 ["Jewelery" => PICKUP_JEWELS],
1716 ["Flesh" => PICKUP_FLESH], 1890 ["Flesh" => PICKUP_FLESH],
1717 ], 1891 ],
1718 ["Weight/Value ratio", 2, 17] 1892 ["Value/Weight ratio", 2, 17]
1719 ) 1893 )
1720 { 1894 {
1721 my ($title, $x, $y, @bits) = @$_; 1895 my ($title, $x, $y, @bits) = @$_;
1722 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1896 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1723 1897
1735 $::CFG->{pickup} |= $mask; 1909 $::CFG->{pickup} |= $mask;
1736 } else { 1910 } else {
1737 $::CFG->{pickup} &= ~$mask; 1911 $::CFG->{pickup} &= ~$mask;
1738 } 1912 }
1739 1913
1740 $::CONN->send_command ("pickup $::CFG->{pickup}") 1914 $::CONN->send_pickup ($::CFG->{pickup})
1741 if defined $::CONN; 1915 if defined $::CONN;
1742 1916
1743 0 1917 0
1744 }); 1918 });
1745 1919
1748 } 1922 }
1749 1923
1750 $table->add_at (2, 18, new DC::UI::ValSlider 1924 $table->add_at (2, 18, new DC::UI::ValSlider
1751 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1925 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1752 template => ">= 99", 1926 template => ">= 99",
1927 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1753 to_value => sub { ">= " . 5 * $_[0] }, 1928 to_value => sub { ">= " . 5 * $_[0] },
1754 on_changed => sub { 1929 on_changed => sub {
1755 my ($slider, $value) = @_; 1930 my ($slider, $value) = @_;
1756 1931
1757 $::CFG->{pickup} &= ~0xF; 1932 $::CFG->{pickup} &= ~0xF;
1761 }); 1936 });
1762 1937
1763 $table->add_at (3, 18, new DC::UI::Button 1938 $table->add_at (3, 18, new DC::UI::Button
1764 text => "set", 1939 text => "set",
1765 on_activate => sub { 1940 on_activate => sub {
1766 $::CONN->send_command ("pickup $::CFG->{pickup}") 1941 $::CONN->send_pickup ($::CFG->{pickup})
1767 if defined $::CONN; 1942 if defined $::CONN;
1768 0 1943 0
1769 }); 1944 });
1770 1945
1771 $r 1946 $r
1772} 1947}
1773 1948
1774my %SORT_ORDER = ( 1949my %SORT_ORDER = (
1775 type => sub { 1950 type => sub {
1951 use sort 'stable';
1776 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1952 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1777 }, 1953 },
1778 mtime => sub { 1954 mtime => sub {
1955 use sort 'stable';
1779 my $NOW = time; 1956 my $NOW = time;
1780 sort { 1957 sort {
1781 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1958 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1782 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1959 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1783 1960
1784 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1961 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1785 or $btime <=> $atime 1962 or $btime <=> $atime
1786 or $a->{type} <=> $b->{type} 1963 or $a->{type} <=> $b->{type}
1787 } @_ 1964 } @_
1788 }, 1965 },
1789 weight => sub { sort { 1966 weight => sub {
1967 use sort 'stable';
1968 sort {
1790 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1969 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1791 or $a->{type} <=> $b->{type} 1970 or $a->{type} <=> $b->{type}
1792 } @_ }, 1971 } @_
1972 },
1793); 1973);
1794 1974
1795sub inventory_widget { 1975sub inventory_widget {
1796 my $hb = new DC::UI::HBox homogeneous => 1; 1976 my $hb = new DC::UI::HBox homogeneous => 1;
1797 1977
1813 $::CFG->{inv_sort} = $_[1]; 1993 $::CFG->{inv_sort} = $_[1];
1814 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1994 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1815 }, 1995 },
1816 ); 1996 );
1817 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1997 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1818 #TODO# update to weigh/maxweight 1998 #TODO# update to weight/maxweight
1819 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1999 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1820 2000
1821 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2001 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1822 $sw1->add ($INV = new DC::UI::Inventory); 2002 $sw1->add ($INV = new DC::UI::Inventory);
1823 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2003 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1884 $PL_NOTEBOOK->set_current_page ($widget); 2064 $PL_NOTEBOOK->set_current_page ($widget);
1885 $PL_WINDOW->show; 2065 $PL_WINDOW->show;
1886 } 2066 }
1887} 2067}
1888 2068
1889sub player_window { 2069sub make_playerbook {
1890 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2070 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1891 x => "center", 2071 x => "center",
1892 y => "center", 2072 y => "center",
1893 force_w => $WIDTH * 9/10, 2073 force_w => $WIDTH * 9/10,
1894 force_h => $HEIGHT * 9/10, 2074 force_h => $HEIGHT * 9/10,
1928 "License, Author and Source info for media sent by the server."); 2108 "License, Author and Source info for media sent by the server.");
1929 2109
1930 $ntb->set_current_page ($INVENTORY_PAGE); 2110 $ntb->set_current_page ($INVENTORY_PAGE);
1931 2111
1932 $plwin->add ($ntb); 2112 $plwin->add ($ntb);
1933 $plwin
1934} 2113}
1935 2114
1936sub keyboard_setup { 2115sub keyboard_setup {
1937 DC::Macro::keyboard_setup 2116 DC::Macro::keyboard_setup
1938} 2117}
1939 2118
1940sub help_window { 2119sub make_help_window {
1941 my $win = new DC::UI::Toplevel 2120 my $win = new DC::UI::Toplevel
1942 x => 'center', 2121 x => 'center',
1943 y => 'center', 2122 y => 'center',
1944 z => 4, 2123 z => 4,
1945 name => 'doc_browser', 2124 name => 'doc_browser',
2034 2213
2035 $load_node->((DC::Pod::find @path)[0]); 2214 $load_node->((DC::Pod::find @path)[0]);
2036 $win->show; 2215 $win->show;
2037 }; 2216 };
2038 2217
2039 $win 2218 $HELP_WINDOW = $win;
2040}
2041
2042sub open_string_query {
2043 my ($title, $cb, $txt, $tooltip) = @_;
2044 my $dialog = new DC::UI::Toplevel
2045 x => "center",
2046 y => "center",
2047 z => 50,
2048 force_w => $WIDTH * 4/5,
2049 title => $title;
2050
2051 $dialog->add (
2052 my $e = new DC::UI::Entry
2053 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2054 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2055 tooltip => $tooltip
2056 );
2057
2058 $e->grab_focus;
2059 $e->set_text ($txt) if $txt;
2060 $dialog->show;
2061} 2219}
2062 2220
2063sub open_quit_dialog { 2221sub open_quit_dialog {
2064 unless ($QUIT_DIALOG) { 2222 unless ($QUIT_DIALOG) {
2065 $QUIT_DIALOG = new DC::UI::Toplevel 2223 $QUIT_DIALOG = new DC::UI::Toplevel
2087 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2245 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2088 ); 2246 );
2089 $hb->add (new DC::UI::Button 2247 $hb->add (new DC::UI::Button
2090 text => "Quit anyway", 2248 text => "Quit anyway",
2091 expand => 1, 2249 expand => 1,
2092 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2250 on_activate => sub {
2251 crash "Quit anyway";
2252 EV::unloop EV::UNLOOP_ALL;
2253 },
2093 ); 2254 );
2094 } 2255 }
2095 2256
2096 $QUIT_DIALOG->show; 2257 $QUIT_DIALOG->show;
2097 $QUIT_DIALOG->grab_focus; 2258 $QUIT_DIALOG->grab_focus;
2259}
2260
2261sub make_menubar {
2262 $MENUFRAME = new DC::UI::Toplevel
2263 border => 0,
2264 force_x => 0,
2265 force_y => 0,
2266 force_w => $::WIDTH,
2267 child => ($MENUBAR = new DC::UI::HBox),
2268 ;
2269
2270 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2271
2272 # 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
2273 make_gauge_window->show;
2274
2275# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2276# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2277
2278 make_playerbook;
2279
2280 $MENUPOPUP = DC::UI::Menu->new (items => [
2281 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2282 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2283 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2284 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2285 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2286 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2287 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2288 ["Quit…" , sub {
2289 if ($CONN) {
2290 open_quit_dialog;
2291 } else {
2292 EV::unloop EV::UNLOOP_ALL;
2293 }
2294 }],
2295 ]);
2296
2297 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2298 tooltip => "Shows the main menu",
2299 on_button_down => sub {
2300 my ($self, $ev) = @_;
2301 local $ev->{x} = 0;
2302 local $ev->{y} = 0;
2303 $MENUPOPUP->popup ($ev);
2304 },
2305 );
2306
2307 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2308 padding_x => 6,
2309 padding_y => 3,
2310 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2311 template => " Exp: 888,888,888,888 (lvl 188) ",
2312 );
2313
2314 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2315 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2316 . "will automatically pick up items as defined by your item pickup settings "
2317 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2318 . "disable autopickup by disabling this checkbox.",
2319 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2320 on_changed => sub {
2321 my ($self, $value) = @_;
2322 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2323 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2324 $CONN->send_pickup ($CFG->{pickup})
2325 if $CONN;
2326 },
2327 );
2328
2329 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2330 c_rescale => 1,
2331 padding_x => 6,
2332 padding_y => 3,
2333 force_w => $::WIDTH * 0.2,
2334 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2335 template => "two handed weapons 99%",
2336 );
2337
2338 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2339 expand => 1,
2340 align => 1, can_hover => 1, can_events => 1,
2341 text => "Range and Combat Slots",
2342 tooltip => "#stat_ranged",
2343 );
2344
2345 $MENUFRAME->show;
2346}
2347
2348sub open_string_query {
2349 my ($title, $cb, $txt, $tooltip) = @_;
2350 my $dialog = new DC::UI::Toplevel
2351 x => "center",
2352 y => "center",
2353 z => 50,
2354 force_w => $WIDTH * 4/5,
2355 title => $title;
2356
2357 $dialog->add (
2358 my $e = new DC::UI::Entry
2359 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2360 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2361 tooltip => $tooltip
2362 );
2363
2364 $e->grab_focus;
2365 $e->set_text ($txt) if $txt;
2366 $dialog->show;
2098} 2367}
2099 2368
2100sub show_tip_of_the_day { 2369sub show_tip_of_the_day {
2101 # find all tips 2370 # find all tips
2102 my @tod = DC::Pod::find tip_of_the_day => "*"; 2371 my @tod = DC::Pod::find tip_of_the_day => "*";
2150 $dialog->show; 2419 $dialog->show;
2151 }; 2420 };
2152} 2421}
2153 2422
2154sub sdl_init { 2423sub sdl_init {
2155 DC::SDL_Init 2424 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2156 and die "SDL::Init failed!\n"; 2425 and die "SDL::Init failed!\n";
2157} 2426}
2158 2427
2159sub video_init { 2428sub video_init {
2429 DC::set_theme $CFG->{uitheme};
2430
2431 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2432 $SDL_REINIT = 0;
2433
2434 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2435 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2436 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2437 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2438
2439 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2440
2160 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2441 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2442 $CFG->{sdl_mode} = 0; # lowest resolution by default
2443
2444 # now choose biggest mode <= 1024x768
2445 for (0 .. $#SDL_MODES) {
2446 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2447 $CFG->{sdl_mode} = $_;
2448 }
2449 }
2450 }
2161 2451
2162 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2452 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2163 2453
2164 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2454 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2165 $FULLSCREEN = $CFG->{fullscreen}; 2455 $FULLSCREEN = $CFG->{fullscreen};
2166 $FAST = $CFG->{fast}; 2456 $FAST = $CFG->{fast};
2167 2457
2458 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2168 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2459 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2460 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2169 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2461 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2170 2462
2171 $SDL_ACTIVE = 1; 2463 $SDL_ACTIVE = 1;
2172 $LAST_REFRESH = time - 0.01; 2464 $LAST_REFRESH = time - 0.01;
2173 2465
2220 2512
2221 (new DC::UI::Frame 2513 (new DC::UI::Frame
2222 bg => [0, 0, 0, 0.4], 2514 bg => [0, 0, 0, 0.4],
2223 force_x => 0, 2515 force_x => 0,
2224 force_y => "max", 2516 force_y => "max",
2225 child => (my $LR = new DC::UI::VBox), 2517 child => (my $LL = new DC::UI::VBox),
2226 )->show; 2518 )->show;
2227 2519
2228 $LR->add ($STATUSBOX); 2520 $LL->add ($STATUSBOX);
2229 $LR->add ($MODBOX); 2521 $LL->add ($MODBOX);
2230 $LR->add (new DC::UI::Label 2522 $LL->add (new DC::UI::Label
2231 align => 0, 2523 align => 0,
2232 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2524 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2233 fontsize => 0.5, 2525 fontsize => 0.5,
2234 fg => [1, 1, 0, 0.7], 2526 fg => [1, 1, 0, 0.7],
2235 ); 2527 );
2236 2528
2237 DC::UI::Toplevel->new ( 2529 DC::UI::Toplevel->new (
2238 title => "Minimap", 2530 title => "Minimap",
2239 name => "mapmap", 2531 name => "mapmap",
2240 x => 0, 2532 x => 0,
2241 y => $FONTSIZE + 8, 2533 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2242 border_bg => [1, 1, 1, 192/255], 2534 border_bg => [1, 1, 1, 192/255],
2243 bg => [1, 1, 1, 0], 2535 bg => [1, 1, 1, 0],
2244 child => ($MAPMAP = new DC::MapWidget::MapMap 2536 child => ($MAPMAP = new DC::MapWidget::MapMap
2245 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2537 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2246 ), 2538 ),
2247 )->show; 2539 )->show;
2248 2540
2249 $MAPWIDGET = new DC::MapWidget; 2541 $MAPWIDGET = new DC::MapWidget;
2250 $MAPWIDGET->connect (activate_console => sub { 2542 $MAPWIDGET->connect (activate_console => sub {
2275 $METASERVER = metaserver_dialog; 2567 $METASERVER = metaserver_dialog;
2276 # the name is changed to not conflict with the older name as users could have hidden it 2568 # the name is changed to not conflict with the older name as users could have hidden it
2277 $MESSAGE_WINDOW = new DC::UI::Dockbar 2569 $MESSAGE_WINDOW = new DC::UI::Dockbar
2278 name => "message_window2", 2570 name => "message_window2",
2279 title => 'Messages', 2571 title => 'Messages',
2572 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2280 force_w => $::WIDTH * 0.6, 2573 force_w => $::WIDTH * 0.6,
2281 force_h => $::HEIGHT * 0.25, 2574 force_h => $::HEIGHT * 0.25,
2282 ; 2575 ;
2283 2576
2284 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2577 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2304 . "After pressing the combo the binding will be saved automatically and the " 2597 . "After pressing the combo the binding will be saved automatically and the "
2305 . "binding editor closes"); 2598 . "binding editor closes");
2306 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2599 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2307 "Some debuggin' options. Do not ask."); 2600 "Some debuggin' options. Do not ask.");
2308 2601
2309 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2602 make_help_window;
2603 make_menubar;
2310 2604
2311 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2312 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2313
2314# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2315# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2316
2317 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
2318
2319 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2320 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2321
2322 $BUTTONBAR->add (new DC::UI::Button
2323 text => "Save Config",
2324 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2325 on_activate => sub {
2326 $::CFG->{layout} = DC::UI::get_layout;
2327 DC::write_cfg;
2328 status "Configuration Saved";
2329 0
2330 },
2331 );
2332
2333 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2334 tooltip => "View Documentation");
2335
2336 $BUTTONBAR->add (new DC::UI::Button
2337 text => "Quit",
2338 tooltip => "Terminates the program",
2339 on_activate => sub {
2340 if ($CONN) {
2341 open_quit_dialog;
2342 } else {
2343 EV::unloop EV::UNLOOP_ALL;
2344 }
2345 0
2346 },
2347 );
2348
2349 $BUTTONBAR->show;
2350 $SETUP_DIALOG->show; 2605 $SETUP_DIALOG->show;
2351 $MESSAGE_WINDOW->show; 2606 $MESSAGE_WINDOW->show;
2352 } 2607 }
2353 2608
2609 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2610 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2611
2612 $CAVEAT_LABEL->set_text ("None :)");
2613 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2614 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2615 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2616 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2617
2354 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2618 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2355} 2619}
2356 2620
2357sub video_shutdown { 2621sub video_shutdown {
2358 DC::OpenGL::shutdown; 2622 DC::OpenGL::shutdown;
2623 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2359 2624
2360 undef $SDL_ACTIVE; 2625 undef $SDL_ACTIVE;
2361} 2626}
2362 2627
2363my %animate_object; 2628my %animate_object;
2382my $want_refresh = EV::prepare_ns \&force_refresh; 2647my $want_refresh = EV::prepare_ns \&force_refresh;
2383 2648
2384my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2649my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2385 $NOW = EV::now; 2650 $NOW = EV::now;
2386 2651
2387 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2652 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2388 for DC::poll_events; 2653 for DC::poll_events;
2389 2654
2390 if (%animate_object) { 2655 if (%animate_object) {
2391 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2656 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2392 $WANT_REFRESH = 1; 2657 $WANT_REFRESH = 1;
2404sub animation_stop { 2669sub animation_stop {
2405 my ($widget) = @_; 2670 my ($widget) = @_;
2406 delete $animate_object{$widget}; 2671 delete $animate_object{$widget};
2407} 2672}
2408 2673
2409%SDL_CB = (
2410 DC::SDL_QUIT => sub { 2674$SDL_CB[DC::SDL_QUIT] = sub {
2675 crash "SDL_QUIT";
2411 EV::unloop EV::UNLOOP_ALL; 2676 EV::unloop EV::UNLOOP_ALL;
2412 }, 2677};
2413 DC::SDL_VIDEORESIZE => sub { 2678$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2414 },
2415 DC::SDL_VIDEOEXPOSE => sub { 2679$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2416 DC::UI::full_refresh; 2680 DC::UI::full_refresh;
2417 }, 2681};
2418 DC::SDL_ACTIVEEVENT => sub { 2682$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2419# not useful, as APPACTIVE includes only iconified state, not unmapped 2683# not useful, as APPACTIVE includes only iconified state, not unmapped
2420# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2684# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2421# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2685# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2422# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2686# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2423# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2687# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2424# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2688# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2425 }, 2689};
2426 DC::SDL_KEYDOWN => sub { 2690$SDL_CB[DC::SDL_KEYDOWN] = sub {
2427 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2691 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2428 # alt-enter 2692 # alt-enter
2693 video_shutdown;
2429 $FULLSCREEN_ENABLE->toggle; 2694 $FULLSCREEN_ENABLE->toggle;
2430 video_shutdown;
2431 video_init; 2695 video_init;
2432 } else { 2696 } else {
2433 &DC::UI::feed_sdl_key_down_event; 2697 &DC::UI::feed_sdl_key_down_event;
2434 } 2698 }
2435 update_modbox; 2699 update_modbox;
2436 }, 2700};
2437 DC::SDL_KEYUP => sub { 2701$SDL_CB[DC::SDL_KEYUP] = sub {
2438 &DC::UI::feed_sdl_key_up_event; 2702 &DC::UI::feed_sdl_key_up_event;
2439 update_modbox; 2703 update_modbox;
2440 }, 2704};
2441 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2705$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2442 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2706$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2443 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2707$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2444 DC::SDL_USEREVENT => sub { 2708$SDL_CB[DC::SDL_USEREVENT] = sub {
2445 if ($_[0]{code} == 1) { 2709 if ($_[0]{code} == 1) {
2446 audio_channel_finished $_[0]{data1}; 2710 audio_channel_finished $_[0]{data1};
2447 } elsif ($_[0]{code} == 0) { 2711 } elsif ($_[0]{code} == 0) {
2448 audio_music_finished; 2712 audio_music_finished;
2449 }
2450 }, 2713 }
2451); 2714};
2452 2715
2453############################################################################# 2716#############################################################################
2454 2717
2455$SIG{INT} = $SIG{TERM} = sub { 2718$SIG{INT} = $SIG{TERM} = sub {
2456 EV::unloop; 2719 EV::unloop;
2457 #d# TODO calling exit here hangs the process in some futex 2720 #d# TODO calling exit here hangs the process in some futex
2458}; 2721};
2459 2722
2460{ 2723# due to mac os x + sdl combined braindamage, we need this contortion
2724sub main {
2725 {
2461 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2726 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2462 2727
2463 if (-e "$Deliantra::VARDIR/client.cf") { 2728 if (-e "$Deliantra::VARDIR/client.cf") {
2464 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2729 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2465 } else { 2730 } else {
2466 #TODO: compatibility cruft 2731 #TODO: compatibility cruft
2467 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2732 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2468 print STDERR "INFO: used old configuration file\n"; 2733 print STDERR "INFO: used old configuration file\n";
2469 } 2734 }
2470 2735
2471 DC::DB::Server::run; 2736 DC::DB::Server::run;
2472 2737
2473 if ($CFG->{db_schema} < 1) { 2738 if ($CFG->{db_schema} < 1) {
2474 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2739 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2475 DC::DB::nuke_db; 2740 DC::DB::nuke_db;
2476 $CFG->{db_schema} = 1; 2741 $CFG->{db_schema} = 1;
2477 DC::write_cfg; 2742 DC::write_cfg;
2478 } 2743 }
2479 2744
2480 DC::DB::open_db; 2745 DC::DB::open_db;
2481 2746
2482 DC::UI::set_layout ($::CFG->{layout}); 2747 DC::UI::set_layout ($::CFG->{layout});
2483 2748
2484 my %DEF_CFG = ( 2749 my %DEF_CFG = (
2750 config_autosave => 1,
2485 sdl_mode => 0, 2751 sdl_mode => undef,
2486 fullscreen => 1, 2752 fullscreen => 1,
2487 fast => 0, 2753 fast => 0,
2488 force_opengl11 => undef, 2754 force_opengl11 => undef,
2755 disable_alpha => 0,
2756 smooth_movement => 1,
2757 smooth_transitions => 1,
2489 texture_compression => 1, 2758 texture_compression => 1,
2490 map_scale => 1, 2759 map_scale => 1,
2491 fow_enable => 1, 2760 fow_enable => 1,
2492 fow_intensity => 0, 2761 fow_intensity => 0,
2762 fow_texture => 0,
2493 map_smoothing => 1, 2763 map_smoothing => 1,
2494 gui_fontsize => 1, 2764 gui_fontsize => 1,
2495 log_fontsize => 0.7, 2765 log_fontsize => 0.7,
2496 gauge_fontsize => 1, 2766 gauge_fontsize => 1,
2497 gauge_size => 0.35, 2767 gauge_size => 0.35,
2498 stat_fontsize => 0.7, 2768 stat_fontsize => 0.7,
2499 mapsize => 100, 2769 mapsize => 100,
2500 audio_enable => 1, 2770 audio_enable => 1,
2501 audio_hw_channels => 0, 2771 audio_hw_channels => 0,
2502 audio_hw_frequency => 0, 2772 audio_hw_frequency => 0,
2503 audio_hw_chunksize => 0, 2773 audio_hw_chunksize => 0,
2504 audio_mix_channels => 8, 2774 audio_mix_channels => 8,
2505 effects_enable => 1, 2775 effects_enable => 1,
2506 effects_volume => 1, 2776 effects_volume => 1,
2507 bgm_enable => 1, 2777 bgm_enable => 1,
2508 bgm_volume => 0.5, 2778 bgm_volume => 0.5,
2509 output_rate => "", 2779 output_rate => "",
2510 pickup => 0, 2780 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2511 inv_sort => "mtime", 2781 inv_sort => "mtime",
2512 default => "profile", # default profile 2782 default => "profile", # default profile
2513 show_tips => 1, 2783 show_tips => 1,
2514 logview_max_par => 1000, 2784 logview_max_par => 1000,
2515 shift_fire_stop => 0, 2785 shift_fire_stop => 0,
2786 uitheme => "wood",
2787 map_shift_x => -24, # arbitrary
2788 map_shift_y => +24, # arbitrary
2516 ); 2789 );
2517 2790
2518 while (my ($k, $v) = each %DEF_CFG) { 2791 while (my ($k, $v) = each %DEF_CFG) {
2519 $CFG->{$k} = $v unless exists $CFG->{$k}; 2792 $CFG->{$k} = $v unless exists $CFG->{$k};
2520 } 2793 }
2521 2794
2522 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2795 my @args = @ARGV;
2523 $PROFILE = $CFG->{profile}{default};
2524 2796
2525 # convert old bindings (only default profile matters) 2797 my $profile = 'default';
2526 if (my $bindings = delete $PROFILE->{bindings}) { 2798
2527 while (my ($mod, $syms) = each %$bindings) { 2799 for (my $i = 0; $i < @args; $i++) {
2528 while (my ($sym, $cmds) = each %$syms) { 2800 if ($args[$i] =~ /^--?profile$/) {
2529 push @{ $PROFILE->{macro} }, { 2801 $profile = $args[$i + 1];
2530 accelkey => [$mod*1, $sym*1], 2802 splice @args, $i, 2, ();
2531 action => $cmds,
2532 }; 2803 $i = 0;
2804 } elsif ($args[$i] =~ /^--?h/) {
2805 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2806 exit 0;
2533 } 2807 }
2534 } 2808 }
2535 }
2536 2809
2810 $CFG->{profile}{$profile} ||= {};
2811 $PROFILE = $CFG->{profile}{$profile};
2812 $PROFILE->{host} ||= "gameserver.deliantra.net";
2813
2814 $PROFILE->{host} = $args[0] if @args > 0;
2815 $PROFILE->{user} = $args[1] if @args > 1;
2816 $PROFILE->{password} = $args[2] if @args > 2;
2817
2818 # convert old bindings (only default profile matters)
2819 if (my $bindings = delete $PROFILE->{bindings}) {
2820 while (my ($mod, $syms) = each %$bindings) {
2821 while (my ($sym, $cmds) = each %$syms) {
2822 push @{ $PROFILE->{macro} }, {
2823 accelkey => [$mod*1, $sym*1],
2824 action => $cmds,
2825 };
2826 }
2827 }
2828 }
2829
2537 sdl_init; 2830 sdl_init;
2538 2831
2539 @SDL_MODES = DC::SDL_ListModes 8, 8; 2832 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2540 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2833 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2541 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2542 2834
2543 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2835 {
2544
2545 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2546
2547 {
2548 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2836 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2549 DejaVuSans.ttf 2837 DejaVuSans.ttf
2550 DejaVuSansMono.ttf 2838 DejaVuSansMono.ttf
2551 DejaVuSans-Bold.ttf 2839 DejaVuSans-Bold.ttf
2552 DejaVuSansMono-Bold.ttf 2840 DejaVuSansMono-Bold.ttf
2553 DejaVuSans-Oblique.ttf 2841 DejaVuSans-Oblique.ttf
2554 DejaVuSansMono-Oblique.ttf 2842 DejaVuSansMono-Oblique.ttf
2555 DejaVuSans-BoldOblique.ttf 2843 DejaVuSans-BoldOblique.ttf
2556 DejaVuSansMono-BoldOblique.ttf 2844 DejaVuSansMono-BoldOblique.ttf
2845 mona.ttf
2557 ); 2846 );
2558 2847
2559 DC::add_font $_ for @fonts; 2848 DC::add_font $_ for @fonts;
2560 2849
2561 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2850 $FONT_PROP = new_from_file DC::Font $fonts[0];
2562 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2851 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2563 2852
2564 $FONT_PROP->make_default; 2853 $FONT_PROP->make_default;
2565 2854
2566 DC::pango_init; 2855 DC::pango_init;
2567 } 2856 }
2568 2857
2569# compare mono (ft) vs. rgba (cairo) 2858# compare mono (ft) vs. rgba (cairo)
2570# ft - 1.8s, cairo 3s, even in alpha-only mode 2859# ft - 1.8s, cairo 3s, even in alpha-only mode
2571# for my $rgba (0..1) { 2860# for my $rgba (0..1) {
2572# my $t1 = Time::HiRes::time; 2861# my $t1 = Time::HiRes::time;
2577# } 2866# }
2578# my $t2 = Time::HiRes::time; 2867# my $t2 = Time::HiRes::time;
2579# warn $t2-$t1; 2868# warn $t2-$t1;
2580# } 2869# }
2581 2870
2582 video_init; 2871 video_init;
2583 audio_init; 2872 audio_init;
2584} 2873 }
2585 2874
2586show_tip_of_the_day if $CFG->{show_tips}; 2875 show_tip_of_the_day if $CFG->{show_tips};
2587 2876
2588our $STARTUP_CANCEL = EV::idle sub { 2877 our $STARTUP_CANCEL = EV::idle sub {
2589 undef $::STARTUP_CANCEL; 2878 undef $::STARTUP_CANCEL;
2590 $startup_done->(); 2879 $startup_done->();
2591}; 2880 };
2592 2881
2593delete $SIG{__DIE__}; 2882 delete $SIG{__DIE__};
2594EV::loop; 2883 EV::loop;
2595 2884
2885 DC::write_cfg if $CFG->{config_autosave};
2886
2596#video_shutdown; 2887 #video_shutdown;
2597#audio_shutdown; 2888 #audio_shutdown;
2889
2598DC::OpenGL::quit; 2890 DC::OpenGL::quit;
2599DC::SDL_Quit; 2891 DC::SDL_Quit;
2600DC::DB::Server::stop; 2892 DC::DB::Server::stop;
2893}
2894
2895DC::SDL_braino; # see sub above
2601 2896
2602=head1 NAME 2897=head1 NAME
2603 2898
2604deliantra - A Deliantra MORPG game client 2899deliantra - A Deliantra MORPG game client
2605 2900
2606=head1 SYNOPSIS 2901=head1 SYNOPSIS
2607 2902
2608Just run it - no commandline arguments are supported. 2903 deliantra [--profile name] [host [user [password]]]
2904 deliantra --help
2609 2905
2610=head1 USAGE 2906=head1 USAGE
2611 2907
2612deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2908The deliantra client utilises OpenGL for all UI elements and the game. It
2613be used in fullscreen mode and interactively. 2909is supposed to be used in fullscreen mode and interactively.
2614 2910
2615=head1 DEBUGGING 2911=head1 DEBUGGING
2616
2617 2912
2618CFPLUS_DEBUG - environment variable 2913CFPLUS_DEBUG - environment variable
2619 2914
2620 1 draw borders around widgets 2915 1 draw borders around widgets
2621 2 add low-level widget info to tooltips 2916 2 add low-level widget info to tooltips
2622 4 show fps 2917 4 show fps
2623 8 suppress tooltips 2918 8 suppress tooltips
2624 2919
2625=head1 AUTHOR 2920=head1 AUTHOR
2626 2921
2627Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2922Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2628 2923
2629 2924
2630 2925

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines