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.79 by root, Fri Dec 19 22:06:53 2008 UTC vs.
Revision 1.109 by root, Thu Apr 8 19:11:21 2010 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 {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
… …
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # pango is relocatable on win32
54 } else { 58 } else {
55 # OS X 59 # OS X
56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
58 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
59 $ENV{DYLD_LIBRARY_PATH} = $root; 61 $ENV{DYLD_LIBRARY_PATH} = $root;
60 chdir $root; # for pango modules, maybe other things 62 chdir $root; # for pango modules, maybe other things
61 } 63 }
62 64
63 unshift @INC, $root; 65 unshift @INC, $root;
64 } 66 }
65} 67}
66 68
67# prepend private library directory 69# prepend private library directory and prepare env
68BEGIN { 70BEGIN {
69 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
70 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
71 if (-d $path) { 73 if (-d $path) {
72 unshift @INC, $path; 74 unshift @INC, $path;
… …
86 88
87use Deliantra; 89use Deliantra;
88use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
89 91
90use AnyEvent::Util (); 92use AnyEvent::Util ();
91use AnyEvent::DNS;
92use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
93 95
94use Compress::LZF; 96use Compress::LZF;
95use JSON::XS; 97use JSON::XS;
96 98
97use DC; 99use DC;
… …
125 127
126$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
127$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
128 130
129$EV::DIED = sub { 131$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 1; 132 crash "CRASH/EV::DIED: $@" => 0;
131 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
132}; 134};
133 135
134my $MAX_FPS = 60; 136my $MAX_FPS = 60;
137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
135 139
136our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
137 141
138our $LAST_REFRESH; 142our $LAST_REFRESH;
139our $NOW; 143our $NOW;
… …
161 165
162our $MAP; 166our $MAP;
163our $MAPMAP; 167our $MAPMAP;
164our $MAPWIDGET; 168our $MAPWIDGET;
165our $COMPLETER; 169our $COMPLETER;
166our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
167our $METASERVER; 174our $METASERVER;
168our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
169our $QUIT_DIALOG; 176our $QUIT_DIALOG;
170our $HOST_ENTRY; 177our $HOST_ENTRY;
171our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
… …
197our $FLOORBOX; 204our $FLOORBOX;
198our $GAUGES; 205our $GAUGES;
199our $STATWIDS; 206our $STATWIDS;
200 207
201our $SDL_ACTIVE; 208our $SDL_ACTIVE;
202our %SDL_CB; 209our @SDL_CB;
203 210
204our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
205our $STATUSBOX; 212our $STATUSBOX;
206our $MODBOX; 213our $MODBOX;
207our $DEBUG_STATUS; 214our $DEBUG_STATUS;
… …
215# write a crash message blockingly to the socket, if possible 222# write a crash message blockingly to the socket, if possible
216# this is a bit too complicated for my tastes, but it was easy. 223# this is a bit too complicated for my tastes, but it was easy.
217*crash = sub($;$) { 224*crash = sub($;$) {
218 my ($msg, $backtrace) = @_; 225 my ($msg, $backtrace) = @_;
219 226
227 warn $msg;
228
220 return unless $CONN; 229 return unless $CONN;
221 230
222 my $fh = $CONN->{fh} 231 my $fh = $CONN->{fh}
223 or return; 232 or return;
224 233
… …
234 243
235 # backtrace as second step, in case it crashes, too 244 # backtrace as second step, in case it crashes, too
236 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 245 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
237 if $backtrace; 246 if $backtrace;
238}; 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}
239 259
240############################################################################# 260#############################################################################
241 261
242sub status { 262sub status {
243 $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]);
… …
325 or return; 345 or return;
326 346
327 $meta->{data} 347 $meta->{data}
328 or return; 348 or return;
329 349
330 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
331 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
332 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
333 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
334 &audio_music_push ($face); 354 &audio_music_push ($face);
335 } 355 }
336 } else { 356 } else {
337 # fetch from database 357 # fetch from database
338 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
339 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
340 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
341 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;
342 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
343 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
344 364
345 audio_sound_push ($face); 365 audio_sound_push ($face);
346 }; 366 };
… …
393 413
394 audio_music_update_volume; 414 audio_music_update_volume;
395 415
396 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
397 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
398 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
399 ? 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
400 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
401 424
402 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
403 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
404 427
405 my $NOW = time; 428 my $NOW = time;
406 429
407 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
408 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
517 sub audio_tab_update; 540 sub audio_tab_update;
518 audio_tab_update; 541 audio_tab_update;
519} 542}
520 543
521sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
522 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
523 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
524 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
525 553
526 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
… …
766} 794}
767 795
768sub dc_connect { 796sub dc_connect {
769 my ($host, $port) = @_; 797 my ($host, $port) = @_;
770 798
771 my $mapw = List::Util::min 48, 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;
772 my $maph = List::Util::min 48, List::Util::max 11, int $HEIGHT * $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;
773 801
774 $CONN = 802 $CONN =
775 new DC::Protocol 803 new DC::Protocol
776 host => $host, 804 host => $host,
777 port => $port, 805 port => $port,
778 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
779 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
780 mapw => $mapw, 808 mapw => $mapw,
781 maph => $maph, 809 maph => $maph,
782 810
811 c_version => {
812 client => "deliantra",
783 client => "$DC::VERSION $] $^O", 813 clientver => $DC::VERSION,
814 gl_vendor => DC::OpenGL::gl_vendor,
815 gl_version => DC::OpenGL::gl_version,
816 },
784 817
785 map_widget => $MAPWIDGET, 818 map_widget => $MAPWIDGET,
786 statusbox => $STATUSBOX, 819 statusbox => $STATUSBOX,
787 map => $MAP, 820 map => $MAP,
788 mapmap => $MAPMAP, 821 mapmap => $MAPMAP,
… …
794 827
795 on_connect => sub { 828 on_connect => sub {
796 if ($_[0]) { 829 if ($_[0]) {
797 DC::lowdelay fileno $CONN->{fh}; 830 DC::lowdelay fileno $CONN->{fh};
798 831
799 status "login successful"; 832 status "successfully connected to the server";
800 } else { 833 } else {
801 undef $CONN; 834 undef $CONN;
802 status "unable to connect: $!"; 835 status "unable to connect: $!";
803 stop_game(); 836 stop_game();
804 } 837 }
… …
806 ; 839 ;
807} 840}
808 841
809sub start_game { 842sub start_game {
810 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.";
811 848
812 $LOGIN_BUTTON->set_text ("Logout"); 849 $LOGIN_BUTTON->set_text ("Logout");
813 $SETUP_DIALOG->hide; 850 $SETUP_DIALOG->hide;
814
815 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
816 851
817 $MAP = new DC::Map; 852 $MAP = new DC::Map;
818 853
819 # hack to make SURE we find the IP address all right 854 # hack to make SURE we find the IP address all right
820 # can be removed once AnyEvent::DNS is proven stable. 855 # can be removed once AnyEvent::DNS is proven stable.
821 if ($host eq "gameserver.deliantra.net") { 856 if ($host eq "gameserver.deliantra.net") {
822 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 857 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
823 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) {
824 status "dns failure, using hardcoded address"; 862 status "dns failure, using hardcoded address";
825 $host = "129.13.162.95"; 863 $host = "129.13.162.95";
864 }
826 } 865 }
827 866
828 dc_connect $host, $port; 867 dc_connect $host, $port;
829 }; 868 };
830 } else { 869 } else {
… …
897 936
898 $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");
899 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 938 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
900 939
901 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 940 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
941 c_rescale => 1,
902 force_w => $WIDTH * 0.1, expand => 1, 942 force_w => $WIDTH * 0.1, expand => 1,
903 range => [ ($CFG->{sdl_mode}) x 3 ], 943 range => [ ($CFG->{sdl_mode}) x 3 ],
904 tooltip => $vidmode_tooltip); 944 tooltip => $vidmode_tooltip);
905 $hbox->add (my $mode_label = new DC::UI::Label 945 $hbox->add (my $mode_label = new DC::UI::Label
906 height => 0.8, template => "9999x9999@9+9", 946 height => 0.8, template => "9999x9999@9+9",
… …
934 ); 974 );
935 975
936 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha"); 976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
937 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
938 state => $CFG->{disable_alpha}, 978 state => $CFG->{disable_alpha},
939 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse " 979 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
940 . "by disabling a number of textures and transparency effects. Normally, these " 980 . "by disabling a number of textures and transparency effects. Normally, these "
941 . "effects do not cost a lot of resources, but some graphics cards might fall " 981 . "effects do not cost a lot of resources, but some graphics cards might fall "
942 . "back to extremely slow rendering if this is enabled. If disabling this option " 982 . "back to extremely slow rendering if this is enabled. If disabling this option "
943 . "noticably improves the framerate of the client please report this! " 983 . "noticably improves the framerate of the client please report this! "
944 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>", 984 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
… …
998 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1038 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
999 . "then disable this option. Changes take effect immdiately.", 1039 . "then disable this option. Changes take effect immdiately.",
1000 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1040 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1001 ); 1041 );
1002 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
1003 $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");
1004 $table->add_at (1, $row++, new DC::UI::Slider 1054 $table->add_at (1, $row++, new DC::UI::Slider
1005 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1055 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1006 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1056 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1007 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 }
… …
1019 $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");
1020 $table->add_at (1, $row++, new DC::UI::CheckBox 1070 $table->add_at (1, $row++, new DC::UI::CheckBox
1021 state => $CFG->{fow_enable}, 1071 state => $CFG->{fow_enable},
1022 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.",
1023 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1073 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1074 );
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 }
1024 ); 1089 );
1025 1090
1026 $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");
1027 $table->add_at (1, $row++, new DC::UI::Slider 1092 $table->add_at (1, $row++, new DC::UI::Slider
1028 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1093 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
1080 1145
1081 my $text = !$freq 1146 my $text = !$freq
1082 ? "audio is off" 1147 ? "audio is off"
1083 : "audio is enabled\n" 1148 : "audio is enabled\n"
1084 . "frequency (Hz): $freq\n" 1149 . "frequency (Hz): $freq\n"
1085 . "channels: $chans"; 1150 . "channels: $chans\n"
1151 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1152 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1086 1153
1087 $AUDIO_INFO->set_text ($text); 1154 $AUDIO_INFO->set_text ($text);
1088} 1155}
1089 1156
1090sub audio_setup { 1157sub audio_setup {
… …
1230} 1297}
1231 1298
1232sub make_gauge_window { 1299sub make_gauge_window {
1233 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1300 my $gh = int $HEIGHT * $CFG->{gauge_size};
1234 1301
1235 my $win = new DC::UI::Frame ( 1302 $GAUGES->{win} = my $win = new DC::UI::Frame (
1236 force_x => 0, 1303 force_x => 0,
1237 force_y => "max", 1304 force_y => "max",
1238 force_w => $WIDTH, 1305 force_w => $WIDTH,
1239 force_h => $gh, 1306 force_h => $gh,
1240 ); 1307 );
… …
1256 (new DC::UI::Empty expand => 1), 1323 (new DC::UI::Empty expand => 1),
1257 (my $hb = new DC::UI::HBox), 1324 (my $hb = new DC::UI::HBox),
1258 ], 1325 ],
1259 ); 1326 );
1260 1327
1261 $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");
1262 $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");
1263 $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");
1264 $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");
1265
1266 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1267 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1268 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1269 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1270
1271 $GAUGES = {
1272 exp => $exp, prg => $prg, sklprg => $sklprg,
1273 win => $win, range => $rng,
1274 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1275 };
1276 1332
1277 &set_gauge_window_fontsize; 1333 &set_gauge_window_fontsize;
1278 1334
1279 $win 1335 $win
1280} 1336}
… …
1621 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]),
1622 ); 1678 );
1623 1679
1624 $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");
1625 $table->add_at (1, 4, new DC::UI::Entry 1681 $table->add_at (1, 4, new DC::UI::Entry
1626 text => $CFG->{profile}{default}{user}, 1682 text => $PROFILE->{user},
1627 tooltip => "The name of your character on the server.", 1683 tooltip => "The name of your character on the server. The name is case-sensitive!",
1628 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1684 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1629 ); 1685 );
1630 1686
1631 $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");
1632 $table->add_at (1, 5, new DC::UI::Entry 1688 $table->add_at (1, 5, new DC::UI::Entry
1633 text => $CFG->{profile}{default}{password}, 1689 text => $PROFILE->{password},
1634 hidden => 1, 1690 hidden => 1,
1635 tooltip => "The password for your character.", 1691 tooltip => "The password for your character.",
1636 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1692 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1637 ); 1693 );
1638 1694
1639 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1695 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1640 expand => 1, 1696 expand => 1,
1641 text => "Login / Register", 1697 text => "Login / Register",
… …
1677 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1733 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1678 1734
1679 $vbox->add ( 1735 $vbox->add (
1680 $HOST_ENTRY = new DC::UI::Entry 1736 $HOST_ENTRY = new DC::UI::Entry
1681 expand => 1, 1737 expand => 1,
1682 text => $CFG->{profile}{default}{host}, 1738 text => $PROFILE->{host},
1683 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>)",
1684 on_changed => sub { 1740 on_changed => sub {
1685 my ($self, $value) = @_; 1741 my ($self, $value) = @_;
1686 $CFG->{profile}{default}{host} = $value; 1742 $PROFILE->{host} = $value;
1687 1 1743 1
1688 } 1744 }
1689 ); 1745 );
1690 1746
1691 if (0) { #d# disabled 1747 if (0) { #d# disabled
… …
1734 1790
1735 my $row = 0; 1791 my $row = 0;
1736 1792
1737 $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");
1738 $table->add_at (1, $row++, new DC::UI::CheckBox 1794 $table->add_at (1, $row++, new DC::UI::CheckBox
1795 c_colspan => 2,
1739 state => $CFG->{show_tips}, 1796 state => $CFG->{show_tips},
1740 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?",
1741 on_changed => sub { 1798 on_changed => sub {
1742 my ($self, $value) = @_; 1799 my ($self, $value) = @_;
1743 $CFG->{show_tips} = $value; 1800 $CFG->{show_tips} = $value;
… …
1745 } 1802 }
1746 ); 1803 );
1747 1804
1748 $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");
1749 $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,
1750 text => $CFG->{logview_max_par}, 1808 text => $CFG->{logview_max_par},
1751 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 "
1752 . "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 "
1753 . "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.",
1754 on_changed => sub { 1812 on_changed => sub {
… …
1756 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1814 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1757 0 1815 0
1758 }, 1816 },
1759 ); 1817 );
1760 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
1761 $table 1841 $table
1762} 1842}
1763 1843
1764sub autopickup_setup { 1844sub autopickup_setup {
1765 my $r = new DC::UI::ScrolledWindow ( 1845 my $r = new DC::UI::ScrolledWindow (
… …
1771 col_expand => [0, 1, 0, 1], 1851 col_expand => [0, 1, 0, 1],
1772 ); 1852 );
1773 1853
1774 for ( 1854 for (
1775 ["General", 0, 0, 1855 ["General", 0, 0,
1776 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1777 ["Inhibit autopickup" => PICKUP_INHIBIT], 1856# ["Inhibit autopickup" => PICKUP_INHIBIT],
1778 ["Stop before pickup" => PICKUP_STOP], 1857 ["Stop before pickup" => PICKUP_STOP],
1779 ["Debug autopickup" => PICKUP_DEBUG], 1858 ["Debug autopickup" => PICKUP_DEBUG],
1780 ], 1859 ],
1781 ["Weapons", 0, 6, 1860 ["Weapons", 0, 6,
1782 ["All weapons" => PICKUP_ALLWEAPON], 1861 ["All weapons" => PICKUP_ALLWEAPON],
… …
1830 $::CFG->{pickup} |= $mask; 1909 $::CFG->{pickup} |= $mask;
1831 } else { 1910 } else {
1832 $::CFG->{pickup} &= ~$mask; 1911 $::CFG->{pickup} &= ~$mask;
1833 } 1912 }
1834 1913
1835 $::CONN->send_command ("pickup $::CFG->{pickup}") 1914 $::CONN->send_pickup ($::CFG->{pickup})
1836 if defined $::CONN; 1915 if defined $::CONN;
1837 1916
1838 0 1917 0
1839 }); 1918 });
1840 1919
… …
1857 }); 1936 });
1858 1937
1859 $table->add_at (3, 18, new DC::UI::Button 1938 $table->add_at (3, 18, new DC::UI::Button
1860 text => "set", 1939 text => "set",
1861 on_activate => sub { 1940 on_activate => sub {
1862 $::CONN->send_command ("pickup $::CFG->{pickup}") 1941 $::CONN->send_pickup ($::CFG->{pickup})
1863 if defined $::CONN; 1942 if defined $::CONN;
1864 0 1943 0
1865 }); 1944 });
1866 1945
1867 $r 1946 $r
1868} 1947}
1869 1948
1870my %SORT_ORDER = ( 1949my %SORT_ORDER = (
1871 type => sub { 1950 type => sub {
1951 use sort 'stable';
1872 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1952 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1873 }, 1953 },
1874 mtime => sub { 1954 mtime => sub {
1955 use sort 'stable';
1875 my $NOW = time; 1956 my $NOW = time;
1876 sort { 1957 sort {
1877 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;
1878 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;
1879 1960
1880 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1961 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1881 or $btime <=> $atime 1962 or $btime <=> $atime
1882 or $a->{type} <=> $b->{type} 1963 or $a->{type} <=> $b->{type}
1883 } @_ 1964 } @_
1884 }, 1965 },
1885 weight => sub { sort { 1966 weight => sub {
1967 use sort 'stable';
1968 sort {
1886 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1969 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1887 or $a->{type} <=> $b->{type} 1970 or $a->{type} <=> $b->{type}
1888 } @_ }, 1971 } @_
1972 },
1889); 1973);
1890 1974
1891sub inventory_widget { 1975sub inventory_widget {
1892 my $hb = new DC::UI::HBox homogeneous => 1; 1976 my $hb = new DC::UI::HBox homogeneous => 1;
1893 1977
… …
1980 $PL_NOTEBOOK->set_current_page ($widget); 2064 $PL_NOTEBOOK->set_current_page ($widget);
1981 $PL_WINDOW->show; 2065 $PL_WINDOW->show;
1982 } 2066 }
1983} 2067}
1984 2068
1985sub player_window { 2069sub make_playerbook {
1986 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2070 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1987 x => "center", 2071 x => "center",
1988 y => "center", 2072 y => "center",
1989 force_w => $WIDTH * 9/10, 2073 force_w => $WIDTH * 9/10,
1990 force_h => $HEIGHT * 9/10, 2074 force_h => $HEIGHT * 9/10,
… …
2024 "License, Author and Source info for media sent by the server."); 2108 "License, Author and Source info for media sent by the server.");
2025 2109
2026 $ntb->set_current_page ($INVENTORY_PAGE); 2110 $ntb->set_current_page ($INVENTORY_PAGE);
2027 2111
2028 $plwin->add ($ntb); 2112 $plwin->add ($ntb);
2029 $plwin
2030} 2113}
2031 2114
2032sub keyboard_setup { 2115sub keyboard_setup {
2033 DC::Macro::keyboard_setup 2116 DC::Macro::keyboard_setup
2034} 2117}
2035 2118
2036sub help_window { 2119sub make_help_window {
2037 my $win = new DC::UI::Toplevel 2120 my $win = new DC::UI::Toplevel
2038 x => 'center', 2121 x => 'center',
2039 y => 'center', 2122 y => 'center',
2040 z => 4, 2123 z => 4,
2041 name => 'doc_browser', 2124 name => 'doc_browser',
… …
2130 2213
2131 $load_node->((DC::Pod::find @path)[0]); 2214 $load_node->((DC::Pod::find @path)[0]);
2132 $win->show; 2215 $win->show;
2133 }; 2216 };
2134 2217
2135 $win 2218 $HELP_WINDOW = $win;
2136}
2137
2138sub open_string_query {
2139 my ($title, $cb, $txt, $tooltip) = @_;
2140 my $dialog = new DC::UI::Toplevel
2141 x => "center",
2142 y => "center",
2143 z => 50,
2144 force_w => $WIDTH * 4/5,
2145 title => $title;
2146
2147 $dialog->add (
2148 my $e = new DC::UI::Entry
2149 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2150 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2151 tooltip => $tooltip
2152 );
2153
2154 $e->grab_focus;
2155 $e->set_text ($txt) if $txt;
2156 $dialog->show;
2157} 2219}
2158 2220
2159sub open_quit_dialog { 2221sub open_quit_dialog {
2160 unless ($QUIT_DIALOG) { 2222 unless ($QUIT_DIALOG) {
2161 $QUIT_DIALOG = new DC::UI::Toplevel 2223 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2194 2256
2195 $QUIT_DIALOG->show; 2257 $QUIT_DIALOG->show;
2196 $QUIT_DIALOG->grab_focus; 2258 $QUIT_DIALOG->grab_focus;
2197} 2259}
2198 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;
2367}
2368
2199sub show_tip_of_the_day { 2369sub show_tip_of_the_day {
2200 # find all tips 2370 # find all tips
2201 my @tod = DC::Pod::find tip_of_the_day => "*"; 2371 my @tod = DC::Pod::find tip_of_the_day => "*";
2202 2372
2203 DC::DB::get state => "tip_of_the_day", sub { 2373 DC::DB::get state => "tip_of_the_day", sub {
… …
2342 2512
2343 (new DC::UI::Frame 2513 (new DC::UI::Frame
2344 bg => [0, 0, 0, 0.4], 2514 bg => [0, 0, 0, 0.4],
2345 force_x => 0, 2515 force_x => 0,
2346 force_y => "max", 2516 force_y => "max",
2347 child => (my $LR = new DC::UI::VBox), 2517 child => (my $LL = new DC::UI::VBox),
2348 )->show; 2518 )->show;
2349 2519
2350 $LR->add ($STATUSBOX); 2520 $LL->add ($STATUSBOX);
2351 $LR->add ($MODBOX); 2521 $LL->add ($MODBOX);
2352 $LR->add (new DC::UI::Label 2522 $LL->add (new DC::UI::Label
2353 align => 0, 2523 align => 0,
2354 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2524 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2355 fontsize => 0.5, 2525 fontsize => 0.5,
2356 fg => [1, 1, 0, 0.7], 2526 fg => [1, 1, 0, 0.7],
2357 ); 2527 );
2358 2528
2359 DC::UI::Toplevel->new ( 2529 DC::UI::Toplevel->new (
2360 title => "Minimap", 2530 title => "Minimap",
2361 name => "mapmap", 2531 name => "mapmap",
2362 x => 0, 2532 x => 0,
2363 y => $FONTSIZE + 8, 2533 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2364 border_bg => [1, 1, 1, 192/255], 2534 border_bg => [1, 1, 1, 192/255],
2365 bg => [1, 1, 1, 0], 2535 bg => [1, 1, 1, 0],
2366 child => ($MAPMAP = new DC::MapWidget::MapMap 2536 child => ($MAPMAP = new DC::MapWidget::MapMap
2367 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2537 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2368 ), 2538 ),
… …
2397 $METASERVER = metaserver_dialog; 2567 $METASERVER = metaserver_dialog;
2398 # 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
2399 $MESSAGE_WINDOW = new DC::UI::Dockbar 2569 $MESSAGE_WINDOW = new DC::UI::Dockbar
2400 name => "message_window2", 2570 name => "message_window2",
2401 title => 'Messages', 2571 title => 'Messages',
2572 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2402 force_w => $::WIDTH * 0.6, 2573 force_w => $::WIDTH * 0.6,
2403 force_h => $::HEIGHT * 0.25, 2574 force_h => $::HEIGHT * 0.25,
2404 ; 2575 ;
2405 2576
2406 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2577 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2426 . "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 "
2427 . "binding editor closes"); 2598 . "binding editor closes");
2428 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2599 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2429 "Some debuggin' options. Do not ask."); 2600 "Some debuggin' options. Do not ask.");
2430 2601
2431 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2602 make_help_window;
2603 make_menubar;
2432 2604
2433 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2434 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2435
2436# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2437# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2438
2439 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
2440
2441 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2442 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2443
2444 $BUTTONBAR->add (new DC::UI::Button
2445 text => "Save Config",
2446 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2447 on_activate => sub {
2448 $::CFG->{layout} = DC::UI::get_layout;
2449 DC::write_cfg;
2450 status "Configuration Saved";
2451 0
2452 },
2453 );
2454
2455 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2456 tooltip => "View Documentation");
2457
2458 $BUTTONBAR->add (new DC::UI::Button
2459 text => "Quit",
2460 tooltip => "Terminates the program",
2461 on_activate => sub {
2462 if ($CONN) {
2463 open_quit_dialog;
2464 } else {
2465 EV::unloop EV::UNLOOP_ALL;
2466 }
2467 0
2468 },
2469 );
2470
2471 $BUTTONBAR->show;
2472 $SETUP_DIALOG->show; 2605 $SETUP_DIALOG->show;
2473 $MESSAGE_WINDOW->show; 2606 $MESSAGE_WINDOW->show;
2474 } 2607 }
2475 2608
2476 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2609 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2477 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2610 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2478 2611
2479 $CAVEAT_LABEL->set_text ("None :)"); 2612 $CAVEAT_LABEL->set_text ("None :)");
2613 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2614 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2480 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2615 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2481 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2616 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2482 2617
2483 $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]);
2484} 2619}
… …
2512my $want_refresh = EV::prepare_ns \&force_refresh; 2647my $want_refresh = EV::prepare_ns \&force_refresh;
2513 2648
2514my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2649my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2515 $NOW = EV::now; 2650 $NOW = EV::now;
2516 2651
2517 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2652 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2518 for DC::poll_events; 2653 for DC::poll_events;
2519 2654
2520 if (%animate_object) { 2655 if (%animate_object) {
2521 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2656 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2522 $WANT_REFRESH = 1; 2657 $WANT_REFRESH = 1;
… …
2534sub animation_stop { 2669sub animation_stop {
2535 my ($widget) = @_; 2670 my ($widget) = @_;
2536 delete $animate_object{$widget}; 2671 delete $animate_object{$widget};
2537} 2672}
2538 2673
2539%SDL_CB = (
2540 DC::SDL_QUIT => sub { 2674$SDL_CB[DC::SDL_QUIT] = sub {
2541 crash "SDL_QUIT"; 2675 crash "SDL_QUIT";
2542 EV::unloop EV::UNLOOP_ALL; 2676 EV::unloop EV::UNLOOP_ALL;
2543 }, 2677};
2544 DC::SDL_VIDEORESIZE => sub { 2678$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2545 },
2546 DC::SDL_VIDEOEXPOSE => sub { 2679$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2547 DC::UI::full_refresh; 2680 DC::UI::full_refresh;
2548 }, 2681};
2549 DC::SDL_ACTIVEEVENT => sub { 2682$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2550# not useful, as APPACTIVE includes only iconified state, not unmapped 2683# not useful, as APPACTIVE includes only iconified state, not unmapped
2551# 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#
2552# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2685# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2553# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2686# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2554# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2687# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2555# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2688# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2556 }, 2689};
2557 DC::SDL_KEYDOWN => sub { 2690$SDL_CB[DC::SDL_KEYDOWN] = sub {
2558 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2691 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2559 # alt-enter 2692 # alt-enter
2560 video_shutdown; 2693 video_shutdown;
2561 $FULLSCREEN_ENABLE->toggle; 2694 $FULLSCREEN_ENABLE->toggle;
2562 video_init; 2695 video_init;
2563 } else { 2696 } else {
2564 &DC::UI::feed_sdl_key_down_event; 2697 &DC::UI::feed_sdl_key_down_event;
2565 } 2698 }
2566 update_modbox; 2699 update_modbox;
2567 }, 2700};
2568 DC::SDL_KEYUP => sub { 2701$SDL_CB[DC::SDL_KEYUP] = sub {
2569 &DC::UI::feed_sdl_key_up_event; 2702 &DC::UI::feed_sdl_key_up_event;
2570 update_modbox; 2703 update_modbox;
2571 }, 2704};
2572 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2705$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2573 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2706$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2574 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2707$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2575 DC::SDL_USEREVENT => sub { 2708$SDL_CB[DC::SDL_USEREVENT] = sub {
2576 if ($_[0]{code} == 1) { 2709 if ($_[0]{code} == 1) {
2577 audio_channel_finished $_[0]{data1}; 2710 audio_channel_finished $_[0]{data1};
2578 } elsif ($_[0]{code} == 0) { 2711 } elsif ($_[0]{code} == 0) {
2579 audio_music_finished; 2712 audio_music_finished;
2580 }
2581 }, 2713 }
2582); 2714};
2583 2715
2584############################################################################# 2716#############################################################################
2585 2717
2586$SIG{INT} = $SIG{TERM} = sub { 2718$SIG{INT} = $SIG{TERM} = sub {
2587 EV::unloop; 2719 EV::unloop;
2588 #d# TODO calling exit here hangs the process in some futex 2720 #d# TODO calling exit here hangs the process in some futex
2589}; 2721};
2590 2722
2591# due to mac os x + sdl combined briandamage, we need this contortion 2723# due to mac os x + sdl combined braindamage, we need this contortion
2592sub main { 2724sub main {
2593 { 2725 {
2594 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2726 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2595 2727
2596 if (-e "$Deliantra::VARDIR/client.cf") { 2728 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2613 DC::DB::open_db; 2745 DC::DB::open_db;
2614 2746
2615 DC::UI::set_layout ($::CFG->{layout}); 2747 DC::UI::set_layout ($::CFG->{layout});
2616 2748
2617 my %DEF_CFG = ( 2749 my %DEF_CFG = (
2750 config_autosave => 1,
2618 sdl_mode => undef, 2751 sdl_mode => undef,
2619 fullscreen => 1, 2752 fullscreen => 1,
2620 fast => 0, 2753 fast => 0,
2621 force_opengl11 => undef, 2754 force_opengl11 => undef,
2622 disable_alpha => 0, 2755 disable_alpha => 0,
2623 smooth_movement => 1, 2756 smooth_movement => 1,
2757 smooth_transitions => 1,
2624 texture_compression => 1, 2758 texture_compression => 1,
2625 map_scale => 1, 2759 map_scale => 1,
2626 fow_enable => 1, 2760 fow_enable => 1,
2627 fow_intensity => 0, 2761 fow_intensity => 0,
2762 fow_texture => 0,
2628 map_smoothing => 1, 2763 map_smoothing => 1,
2629 gui_fontsize => 1, 2764 gui_fontsize => 1,
2630 log_fontsize => 0.7, 2765 log_fontsize => 0.7,
2631 gauge_fontsize => 1, 2766 gauge_fontsize => 1,
2632 gauge_size => 0.35, 2767 gauge_size => 0.35,
… …
2640 effects_enable => 1, 2775 effects_enable => 1,
2641 effects_volume => 1, 2776 effects_volume => 1,
2642 bgm_enable => 1, 2777 bgm_enable => 1,
2643 bgm_volume => 0.5, 2778 bgm_volume => 0.5,
2644 output_rate => "", 2779 output_rate => "",
2645 pickup => 0, 2780 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2646 inv_sort => "mtime", 2781 inv_sort => "mtime",
2647 default => "profile", # default profile 2782 default => "profile", # default profile
2648 show_tips => 1, 2783 show_tips => 1,
2649 logview_max_par => 1000, 2784 logview_max_par => 1000,
2650 shift_fire_stop => 0, 2785 shift_fire_stop => 0,
2651 uitheme => "wood", 2786 uitheme => "wood",
2652 ); 2787 map_shift_x => -24, # arbitrary
2788 map_shift_y => +24, # arbitrary
2653 2789 );
2790
2654 while (my ($k, $v) = each %DEF_CFG) { 2791 while (my ($k, $v) = each %DEF_CFG) {
2655 $CFG->{$k} = $v unless exists $CFG->{$k}; 2792 $CFG->{$k} = $v unless exists $CFG->{$k};
2656 } 2793 }
2657 2794
2658 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2795 my @args = @ARGV;
2796
2797 my $profile = 'default';
2798
2799 for (my $i = 0; $i < @args; $i++) {
2800 if ($args[$i] =~ /^--?profile$/) {
2801 $profile = $args[$i + 1];
2802 splice @args, $i, 2, ();
2803 $i = 0;
2804 } elsif ($args[$i] =~ /^--?h/) {
2805 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2806 exit 0;
2807 }
2808 }
2809
2810 $CFG->{profile}{$profile} ||= {};
2659 $PROFILE = $CFG->{profile}{default}; 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;
2660 2817
2661 # convert old bindings (only default profile matters) 2818 # convert old bindings (only default profile matters)
2662 if (my $bindings = delete $PROFILE->{bindings}) { 2819 if (my $bindings = delete $PROFILE->{bindings}) {
2663 while (my ($mod, $syms) = each %$bindings) { 2820 while (my ($mod, $syms) = each %$bindings) {
2664 while (my ($sym, $cmds) = each %$syms) { 2821 while (my ($sym, $cmds) = each %$syms) {
… …
2670 } 2827 }
2671 } 2828 }
2672 2829
2673 sdl_init; 2830 sdl_init;
2674 2831
2832 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2833 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2834
2675 { 2835 {
2676 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2836 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2677 DejaVuSans.ttf 2837 DejaVuSans.ttf
2678 DejaVuSansMono.ttf 2838 DejaVuSansMono.ttf
2679 DejaVuSans-Bold.ttf 2839 DejaVuSans-Bold.ttf
2680 DejaVuSansMono-Bold.ttf 2840 DejaVuSansMono-Bold.ttf
2681 DejaVuSans-Oblique.ttf 2841 DejaVuSans-Oblique.ttf
2682 DejaVuSansMono-Oblique.ttf 2842 DejaVuSansMono-Oblique.ttf
2683 DejaVuSans-BoldOblique.ttf 2843 DejaVuSans-BoldOblique.ttf
2684 DejaVuSansMono-BoldOblique.ttf 2844 DejaVuSansMono-BoldOblique.ttf
2845 mona.ttf
2685 ); 2846 );
2686 2847
2687 DC::add_font $_ for @fonts; 2848 DC::add_font $_ for @fonts;
2688 2849
2689 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2850 $FONT_PROP = new_from_file DC::Font $fonts[0];
2690 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2851 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2691 2852
2692 $FONT_PROP->make_default; 2853 $FONT_PROP->make_default;
2693 2854
… …
2719 }; 2880 };
2720 2881
2721 delete $SIG{__DIE__}; 2882 delete $SIG{__DIE__};
2722 EV::loop; 2883 EV::loop;
2723 2884
2885 DC::write_cfg if $CFG->{config_autosave};
2886
2724#video_shutdown; 2887 #video_shutdown;
2725#audio_shutdown; 2888 #audio_shutdown;
2889
2726 DC::OpenGL::quit; 2890 DC::OpenGL::quit;
2727 DC::SDL_Quit; 2891 DC::SDL_Quit;
2728 DC::DB::Server::stop; 2892 DC::DB::Server::stop;
2729} 2893}
2730 2894
… …
2734 2898
2735deliantra - A Deliantra MORPG game client 2899deliantra - A Deliantra MORPG game client
2736 2900
2737=head1 SYNOPSIS 2901=head1 SYNOPSIS
2738 2902
2739Just run it - no commandline arguments are supported. 2903 deliantra [--profile name] [host [user [password]]]
2904 deliantra --help
2740 2905
2741=head1 USAGE 2906=head1 USAGE
2742 2907
2743deliantra 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
2744be used in fullscreen mode and interactively. 2909is supposed to be used in fullscreen mode and interactively.
2745 2910
2746=head1 DEBUGGING 2911=head1 DEBUGGING
2747
2748 2912
2749CFPLUS_DEBUG - environment variable 2913CFPLUS_DEBUG - environment variable
2750 2914
2751 1 draw borders around widgets 2915 1 draw borders around widgets
2752 2 add low-level widget info to tooltips 2916 2 add low-level widget info to tooltips

Diff Legend

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