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.81 by root, Mon Dec 22 02:33:30 2008 UTC vs.
Revision 1.113 by root, Thu Apr 22 11:26:51 2010 UTC

21 21
22 Win32::GUI::SplashScreen::Show ( 22 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 24 );
25 25
26 # initialise the resolver now, as vista forces us back to the desktop
27 # when doing this later.
28 use AnyEvent::DNS ();
29 AnyEvent::DNS::resolver;
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;
140 144
141our $CFG; 145our $CFG;
142our $PROFILE; # current profile 146our $PROFILE; # current profile
143our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
148our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
144 149
145our $WANT_REFRESH; 150our $WANT_REFRESH;
146 151
147our $MODE_SLIDER; 152our $MODE_SLIDER;
148our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
161 166
162our $MAP; 167our $MAP;
163our $MAPMAP; 168our $MAPMAP;
164our $MAPWIDGET; 169our $MAPWIDGET;
165our $COMPLETER; 170our $COMPLETER;
166our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
167our $METASERVER; 175our $METASERVER;
168our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
169our $QUIT_DIALOG; 177our $QUIT_DIALOG;
170our $HOST_ENTRY; 178our $HOST_ENTRY;
171our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
197our $FLOORBOX; 205our $FLOORBOX;
198our $GAUGES; 206our $GAUGES;
199our $STATWIDS; 207our $STATWIDS;
200 208
201our $SDL_ACTIVE; 209our $SDL_ACTIVE;
202our %SDL_CB; 210our @SDL_CB;
203 211
204our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
205our $STATUSBOX; 213our $STATUSBOX;
206our $MODBOX; 214our $MODBOX;
207our $DEBUG_STATUS; 215our $DEBUG_STATUS;
215# write a crash message blockingly to the socket, if possible 223# write a crash message blockingly to the socket, if possible
216# this is a bit too complicated for my tastes, but it was easy. 224# this is a bit too complicated for my tastes, but it was easy.
217*crash = sub($;$) { 225*crash = sub($;$) {
218 my ($msg, $backtrace) = @_; 226 my ($msg, $backtrace) = @_;
219 227
228 warn $msg;
229
220 return unless $CONN; 230 return unless $CONN;
221 231
222 my $fh = $CONN->{fh} 232 my $fh = $CONN->{fh}
223 or return; 233 or return;
224 234
234 244
235 # backtrace as second step, in case it crashes, too 245 # backtrace as second step, in case it crashes, too
236 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
237 if $backtrace; 247 if $backtrace;
238}; 248};
249
250sub clienterror($;$) {
251 my ($msg, $backtrace) = @_;
252
253 warn $msg;
254
255 return unless $CONN;
256
257 $CONN->send_exti_msg (clientlog => $msg);
258 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
259}
239 260
240############################################################################# 261#############################################################################
241 262
242sub status { 263sub status {
243 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
325 or return; 346 or return;
326 347
327 $meta->{data} 348 $meta->{data}
328 or return; 349 or return;
329 350
330 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
331 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
332 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
333 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
334 &audio_music_push ($face); 355 &audio_music_push ($face);
335 } 356 }
336 } else { 357 } else {
337 # fetch from database 358 # fetch from database
338 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
339 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
340 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
341 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
342 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
343 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
344 365
345 audio_sound_push ($face); 366 audio_sound_push ($face);
346 }; 367 };
393 414
394 audio_music_update_volume; 415 audio_music_update_volume;
395 416
396 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
397 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
398 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
399 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
400 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
401 425
402 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
403 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
404 428
405 my $NOW = time; 429 my $NOW = time;
406 430
407 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
408 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
517 sub audio_tab_update; 541 sub audio_tab_update;
518 audio_tab_update; 542 audio_tab_update;
519} 543}
520 544
521sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
522 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
523 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
524 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
525 554
526 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
778 user => $PROFILE->{user}, 807 user => $PROFILE->{user},
779 pass => $PROFILE->{password}, 808 pass => $PROFILE->{password},
780 mapw => $mapw, 809 mapw => $mapw,
781 maph => $maph, 810 maph => $maph,
782 811
812 c_version => {
813 client => "deliantra",
783 client => "$DC::VERSION $] $^O", 814 clientver => $DC::VERSION,
815 gl_vendor => DC::OpenGL::gl_vendor,
816 gl_version => DC::OpenGL::gl_version,
817 },
784 818
785 map_widget => $MAPWIDGET, 819 map_widget => $MAPWIDGET,
786 statusbox => $STATUSBOX, 820 statusbox => $STATUSBOX,
787 map => $MAP, 821 map => $MAP,
788 mapmap => $MAPMAP, 822 mapmap => $MAPMAP,
794 828
795 on_connect => sub { 829 on_connect => sub {
796 if ($_[0]) { 830 if ($_[0]) {
797 DC::lowdelay fileno $CONN->{fh}; 831 DC::lowdelay fileno $CONN->{fh};
798 832
799 status "login successful"; 833 status "successfully connected to the server";
800 } else { 834 } else {
801 undef $CONN; 835 undef $CONN;
802 status "unable to connect: $!"; 836 status "unable to connect: $!";
803 stop_game(); 837 stop_game();
804 } 838 }
806 ; 840 ;
807} 841}
808 842
809sub start_game { 843sub start_game {
810 status "logging in..."; 844 status "logging in...";
845
846 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
847 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
848 or return status "$server: unable to parse server address, try an empty field.";
811 849
812 $LOGIN_BUTTON->set_text ("Logout"); 850 $LOGIN_BUTTON->set_text ("Logout");
813 $SETUP_DIALOG->hide; 851 $SETUP_DIALOG->hide;
814
815 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
816 852
817 $MAP = new DC::Map; 853 $MAP = new DC::Map;
818 854
819 # hack to make SURE we find the IP address all right 855 # hack to make SURE we find the IP address all right
820 # can be removed once AnyEvent::DNS is proven stable. 856 # can be removed once AnyEvent::DNS is proven stable.
821 if ($host eq "gameserver.deliantra.net") { 857 if ($host eq "gameserver.deliantra.net") {
822 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 858 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
823 if ($_[0] ne "80.101.114.108") { # Perl 859 if ($_[0] ne "80.101.114.108") { # P-e-r-l
860 status "dns failure, trying differently";
861 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
862 unless (defined $host) {
824 status "dns failure, using hardcoded address"; 863 status "dns failure, using hardcoded address";
825 $host = "129.13.162.95"; 864 $host = "194.126.175.154";
865 }
826 } 866 }
827 867
828 dc_connect $host, $port; 868 dc_connect $host, $port;
829 }; 869 };
830 } else { 870 } else {
897 937
898 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 938 $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); 939 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
900 940
901 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 941 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
942 c_rescale => 1,
902 force_w => $WIDTH * 0.1, expand => 1, 943 force_w => $WIDTH * 0.1, expand => 1,
903 range => [ ($CFG->{sdl_mode}) x 3 ], 944 range => [ ($CFG->{sdl_mode}) x 3 ],
904 tooltip => $vidmode_tooltip); 945 tooltip => $vidmode_tooltip);
905 $hbox->add (my $mode_label = new DC::UI::Label 946 $hbox->add (my $mode_label = new DC::UI::Label
906 height => 0.8, template => "9999x9999@9+9", 947 height => 0.8, template => "9999x9999@9+9",
998 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1039 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
999 . "then disable this option. Changes take effect immdiately.", 1040 . "then disable this option. Changes take effect immdiately.",
1000 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1001 ); 1042 );
1002 1043
1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1045 $table->add_at (1, $row++, new DC::UI::CheckBox
1046 state => $CFG->{smooth_transitions},
1047 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1048 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1049 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1050 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1051 );
1052
1053
1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1054 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1004 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
1005 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1056 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1006 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1057 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1007 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1058 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"); 1070 $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 1071 $table->add_at (1, $row++, new DC::UI::CheckBox
1021 state => $CFG->{fow_enable}, 1072 state => $CFG->{fow_enable},
1022 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1073 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 } 1074 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1075 );
1076
1077 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1078 $table->add_at (1, $row++, new DC::UI::ImageButton
1079 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1080 bg => [0.3, 0.3, 0.2],
1081 force_w => 64,
1082 force_h => 64,
1083 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.",
1084 on_activate => sub {
1085 my ($self) = @_;
1086 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1087 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1088 $MAPWIDGET->update;
1089 }
1024 ); 1090 );
1025 1091
1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1092 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1027 $table->add_at (1, $row++, new DC::UI::Slider 1093 $table->add_at (1, $row++, new DC::UI::Slider
1028 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1094 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1079 ]); 1145 ]);
1080 1146
1081 my $text = !$freq 1147 my $text = !$freq
1082 ? "audio is off" 1148 ? "audio is off"
1083 : "audio is enabled\n" 1149 : "audio is enabled\n"
1150 . "driver: " . DC::SDL_AudioDriverName . "\n"
1084 . "frequency (Hz): $freq\n" 1151 . "frequency (Hz): $freq\n"
1085 . "channels: $chans"; 1152 . "channels: $chans\n"
1153 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1154 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1086 1155
1087 $AUDIO_INFO->set_text ($text); 1156 $AUDIO_INFO->set_text ($text);
1088} 1157}
1089 1158
1090sub audio_setup { 1159sub audio_setup {
1119 ); 1188 );
1120 1189
1121 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1190 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1122 $table->add_at (1, $row, new DC::UI::CheckBox 1191 $table->add_at (1, $row, new DC::UI::CheckBox
1123 expand => 1, state => $CFG->{bgm_enable}, 1192 expand => 1, state => $CFG->{bgm_enable},
1124 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1193 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1125 on_changed => sub { 1194 on_changed => sub {
1126 $CFG->{bgm_enable} = $_[1]; 1195 $CFG->{bgm_enable} = $_[1];
1127 $CONN->update_fx_want if $CONN; 1196 $CONN->update_fx_want if $CONN;
1128 audio_music_push; 1197 audio_music_push;
1129 1 1198 1
1230} 1299}
1231 1300
1232sub make_gauge_window { 1301sub make_gauge_window {
1233 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1302 my $gh = int $HEIGHT * $CFG->{gauge_size};
1234 1303
1235 my $win = new DC::UI::Frame ( 1304 $GAUGES->{win} = my $win = new DC::UI::Frame (
1236 force_x => 0, 1305 force_x => 0,
1237 force_y => "max", 1306 force_y => "max",
1238 force_w => $WIDTH, 1307 force_w => $WIDTH,
1239 force_h => $gh, 1308 force_h => $gh,
1240 ); 1309 );
1256 (new DC::UI::Empty expand => 1), 1325 (new DC::UI::Empty expand => 1),
1257 (my $hb = new DC::UI::HBox), 1326 (my $hb = new DC::UI::HBox),
1258 ], 1327 ],
1259 ); 1328 );
1260 1329
1261 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1330 $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"); 1331 $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"); 1332 $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"); 1333 $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 1334
1277 &set_gauge_window_fontsize; 1335 &set_gauge_window_fontsize;
1278 1336
1279 $win 1337 $win
1338}
1339
1340our $BW_WATCHER;
1341
1342sub debug_toggle($) {
1343 $DELIANTRA_DEBUG ^= $_[0];
1344
1345 if ($DELIANTRA_DEBUG & 16) {
1346 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1347 return unless $CONN;
1348 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1349 $CONN->{octets_in} = 0;
1350 };
1351 } else {
1352 undef $BW_WATCHER;
1353 }
1354
1280} 1355}
1281 1356
1282sub debug_setup { 1357sub debug_setup {
1283 my $table = new DC::UI::Table; 1358 my $table = new DC::UI::Table;
1284 1359
1285 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1360 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1286 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1361 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1287 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1362 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1288 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1363 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1289 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1364 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1290 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1365 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1291 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1366 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1292 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1367 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1368 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1369 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1370
1293 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1371 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1294
1295 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1372 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1296 1373
1297 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1374 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1298 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1375 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1299 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1376 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1300 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1377 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1621 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1698 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1622 ); 1699 );
1623 1700
1624 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1701 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1625 $table->add_at (1, 4, new DC::UI::Entry 1702 $table->add_at (1, 4, new DC::UI::Entry
1626 text => $CFG->{profile}{default}{user}, 1703 text => $PROFILE->{user},
1627 tooltip => "The name of your character on the server.", 1704 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 } 1705 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1629 ); 1706 );
1630 1707
1631 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1708 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1632 $table->add_at (1, 5, new DC::UI::Entry 1709 $table->add_at (1, 5, new DC::UI::Entry
1633 text => $CFG->{profile}{default}{password}, 1710 text => $PROFILE->{password},
1634 hidden => 1, 1711 hidden => 1,
1635 tooltip => "The password for your character.", 1712 tooltip => "The password for your character.",
1636 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1713 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1637 ); 1714 );
1638 1715
1639 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1716 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1640 expand => 1, 1717 expand => 1,
1641 text => "Login / Register", 1718 text => "Login / Register",
1677 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1754 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1678 1755
1679 $vbox->add ( 1756 $vbox->add (
1680 $HOST_ENTRY = new DC::UI::Entry 1757 $HOST_ENTRY = new DC::UI::Entry
1681 expand => 1, 1758 expand => 1,
1682 text => $CFG->{profile}{default}{host}, 1759 text => $PROFILE->{host},
1683 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1760 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1684 on_changed => sub { 1761 on_changed => sub {
1685 my ($self, $value) = @_; 1762 my ($self, $value) = @_;
1686 $CFG->{profile}{default}{host} = $value; 1763 $PROFILE->{host} = $value;
1687 1 1764 1
1688 } 1765 }
1689 ); 1766 );
1690 1767
1691 if (0) { #d# disabled 1768 if (0) { #d# disabled
1734 1811
1735 my $row = 0; 1812 my $row = 0;
1736 1813
1737 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1814 $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 1815 $table->add_at (1, $row++, new DC::UI::CheckBox
1816 c_colspan => 2,
1739 state => $CFG->{show_tips}, 1817 state => $CFG->{show_tips},
1740 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1818 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1741 on_changed => sub { 1819 on_changed => sub {
1742 my ($self, $value) = @_; 1820 my ($self, $value) = @_;
1743 $CFG->{show_tips} = $value; 1821 $CFG->{show_tips} = $value;
1745 } 1823 }
1746 ); 1824 );
1747 1825
1748 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1826 $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 1827 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1828 c_colspan => 2,
1750 text => $CFG->{logview_max_par}, 1829 text => $CFG->{logview_max_par},
1751 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1830 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 " 1831 . "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.", 1832 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1754 on_changed => sub { 1833 on_changed => sub {
1756 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1835 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1757 0 1836 0
1758 }, 1837 },
1759 ); 1838 );
1760 1839
1840 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1841 $table->add_at (1, $row, new DC::UI::CheckBox
1842 state => $CFG->{config_autosave},
1843 tooltip => "Normally, configuration settings and the user interface layout "
1844 . "are saved on client exit. You can disable this behaviour by "
1845 . "unchecking this checkbox.",
1846 on_changed => sub {
1847 my ($self, $value) = @_;
1848 $CFG->{config_autosave} = $value;
1849 0
1850 }
1851 );
1852 $table->add_at (2, $row++, new DC::UI::Button
1853 text => "Save Now",
1854 tooltip => "Use this to manually save configuration and UI layout when "
1855 . "autosave is disabled.",
1856 on_activate => sub {
1857 DC::write_cfg;
1858 0
1859 }
1860 );
1861
1761 $table 1862 $table
1762} 1863}
1763 1864
1764sub autopickup_setup { 1865sub autopickup_setup {
1765 my $r = new DC::UI::ScrolledWindow ( 1866 my $r = new DC::UI::ScrolledWindow (
1771 col_expand => [0, 1, 0, 1], 1872 col_expand => [0, 1, 0, 1],
1772 ); 1873 );
1773 1874
1774 for ( 1875 for (
1775 ["General", 0, 0, 1876 ["General", 0, 0,
1776 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1777 ["Inhibit autopickup" => PICKUP_INHIBIT], 1877# ["Inhibit autopickup" => PICKUP_INHIBIT],
1778 ["Stop before pickup" => PICKUP_STOP], 1878 ["Stop before pickup" => PICKUP_STOP],
1779 ["Debug autopickup" => PICKUP_DEBUG], 1879 ["Debug autopickup" => PICKUP_DEBUG],
1780 ], 1880 ],
1781 ["Weapons", 0, 6, 1881 ["Weapons", 0, 6,
1782 ["All weapons" => PICKUP_ALLWEAPON], 1882 ["All weapons" => PICKUP_ALLWEAPON],
1830 $::CFG->{pickup} |= $mask; 1930 $::CFG->{pickup} |= $mask;
1831 } else { 1931 } else {
1832 $::CFG->{pickup} &= ~$mask; 1932 $::CFG->{pickup} &= ~$mask;
1833 } 1933 }
1834 1934
1835 $::CONN->send_command ("pickup $::CFG->{pickup}") 1935 $::CONN->send_pickup ($::CFG->{pickup})
1836 if defined $::CONN; 1936 if defined $::CONN;
1837 1937
1838 0 1938 0
1839 }); 1939 });
1840 1940
1857 }); 1957 });
1858 1958
1859 $table->add_at (3, 18, new DC::UI::Button 1959 $table->add_at (3, 18, new DC::UI::Button
1860 text => "set", 1960 text => "set",
1861 on_activate => sub { 1961 on_activate => sub {
1862 $::CONN->send_command ("pickup $::CFG->{pickup}") 1962 $::CONN->send_pickup ($::CFG->{pickup})
1863 if defined $::CONN; 1963 if defined $::CONN;
1864 0 1964 0
1865 }); 1965 });
1866 1966
1867 $r 1967 $r
1868} 1968}
1869 1969
1870my %SORT_ORDER = ( 1970my %SORT_ORDER = (
1871 type => sub { 1971 type => sub {
1972 use sort 'stable';
1872 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1973 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1873 }, 1974 },
1874 mtime => sub { 1975 mtime => sub {
1976 use sort 'stable';
1875 my $NOW = time; 1977 my $NOW = time;
1876 sort { 1978 sort {
1877 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1979 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; 1980 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1879 1981
1880 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1982 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1881 or $btime <=> $atime 1983 or $btime <=> $atime
1882 or $a->{type} <=> $b->{type} 1984 or $a->{type} <=> $b->{type}
1883 } @_ 1985 } @_
1884 }, 1986 },
1885 weight => sub { sort { 1987 weight => sub {
1988 use sort 'stable';
1989 sort {
1886 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1990 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1887 or $a->{type} <=> $b->{type} 1991 or $a->{type} <=> $b->{type}
1888 } @_ }, 1992 } @_
1993 },
1889); 1994);
1890 1995
1891sub inventory_widget { 1996sub inventory_widget {
1892 my $hb = new DC::UI::HBox homogeneous => 1; 1997 my $hb = new DC::UI::HBox homogeneous => 1;
1893 1998
1980 $PL_NOTEBOOK->set_current_page ($widget); 2085 $PL_NOTEBOOK->set_current_page ($widget);
1981 $PL_WINDOW->show; 2086 $PL_WINDOW->show;
1982 } 2087 }
1983} 2088}
1984 2089
1985sub player_window { 2090sub make_playerbook {
1986 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2091 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1987 x => "center", 2092 x => "center",
1988 y => "center", 2093 y => "center",
1989 force_w => $WIDTH * 9/10, 2094 force_w => $WIDTH * 9/10,
1990 force_h => $HEIGHT * 9/10, 2095 force_h => $HEIGHT * 9/10,
2024 "License, Author and Source info for media sent by the server."); 2129 "License, Author and Source info for media sent by the server.");
2025 2130
2026 $ntb->set_current_page ($INVENTORY_PAGE); 2131 $ntb->set_current_page ($INVENTORY_PAGE);
2027 2132
2028 $plwin->add ($ntb); 2133 $plwin->add ($ntb);
2029 $plwin
2030} 2134}
2031 2135
2032sub keyboard_setup { 2136sub keyboard_setup {
2033 DC::Macro::keyboard_setup 2137 DC::Macro::keyboard_setup
2034} 2138}
2035 2139
2036sub help_window { 2140sub make_help_window {
2037 my $win = new DC::UI::Toplevel 2141 my $win = new DC::UI::Toplevel
2038 x => 'center', 2142 x => 'center',
2039 y => 'center', 2143 y => 'center',
2040 z => 4, 2144 z => 4,
2041 name => 'doc_browser', 2145 name => 'doc_browser',
2130 2234
2131 $load_node->((DC::Pod::find @path)[0]); 2235 $load_node->((DC::Pod::find @path)[0]);
2132 $win->show; 2236 $win->show;
2133 }; 2237 };
2134 2238
2135 $win 2239 $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} 2240}
2158 2241
2159sub open_quit_dialog { 2242sub open_quit_dialog {
2160 unless ($QUIT_DIALOG) { 2243 unless ($QUIT_DIALOG) {
2161 $QUIT_DIALOG = new DC::UI::Toplevel 2244 $QUIT_DIALOG = new DC::UI::Toplevel
2194 2277
2195 $QUIT_DIALOG->show; 2278 $QUIT_DIALOG->show;
2196 $QUIT_DIALOG->grab_focus; 2279 $QUIT_DIALOG->grab_focus;
2197} 2280}
2198 2281
2282sub make_menubar {
2283 $MENUFRAME = new DC::UI::Toplevel
2284 border => 0,
2285 force_x => 0,
2286 force_y => 0,
2287 force_w => $::WIDTH,
2288 child => ($MENUBAR = new DC::UI::HBox),
2289 ;
2290
2291 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2292
2293 # 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
2294 make_gauge_window->show;
2295
2296# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2297# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2298
2299 make_playerbook;
2300
2301 $MENUPOPUP = DC::UI::Menu->new (items => [
2302 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2303 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2304 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2305 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2306 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2307 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2308 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2309 ["Quit…" , sub {
2310 if ($CONN) {
2311 open_quit_dialog;
2312 } else {
2313 EV::unloop EV::UNLOOP_ALL;
2314 }
2315 }],
2316 ]);
2317
2318 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2319 tooltip => "Shows the main menu",
2320 on_button_down => sub {
2321 my ($self, $ev) = @_;
2322 local $ev->{x} = 0;
2323 local $ev->{y} = 0;
2324 $MENUPOPUP->popup ($ev);
2325 },
2326 );
2327
2328 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2329 padding_x => 6,
2330 padding_y => 3,
2331 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2332 template => " Exp: 888,888,888,888 (lvl 188) ",
2333 );
2334
2335 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2336 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2337 . "will automatically pick up items as defined by your item pickup settings "
2338 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2339 . "disable autopickup by disabling this checkbox.",
2340 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2341 on_changed => sub {
2342 my ($self, $value) = @_;
2343 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2344 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2345 $CONN->send_pickup ($CFG->{pickup})
2346 if $CONN;
2347 },
2348 );
2349
2350 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2351 c_rescale => 1,
2352 padding_x => 6,
2353 padding_y => 3,
2354 force_w => $::WIDTH * 0.2,
2355 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2356 template => "two handed weapons 99%",
2357 );
2358
2359 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2360 expand => 1,
2361 align => 1, can_hover => 1, can_events => 1,
2362 text => "Range and Combat Slots",
2363 tooltip => "#stat_ranged",
2364 );
2365
2366 $MENUFRAME->show;
2367}
2368
2369sub open_string_query {
2370 my ($title, $cb, $txt, $tooltip) = @_;
2371 my $dialog = new DC::UI::Toplevel
2372 x => "center",
2373 y => "center",
2374 z => 50,
2375 force_w => $WIDTH * 4/5,
2376 title => $title;
2377
2378 $dialog->add (
2379 my $e = new DC::UI::Entry
2380 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2381 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2382 tooltip => $tooltip
2383 );
2384
2385 $e->grab_focus;
2386 $e->set_text ($txt) if $txt;
2387 $dialog->show;
2388}
2389
2199sub show_tip_of_the_day { 2390sub show_tip_of_the_day {
2200 # find all tips 2391 # find all tips
2201 my @tod = DC::Pod::find tip_of_the_day => "*"; 2392 my @tod = DC::Pod::find tip_of_the_day => "*";
2202 2393
2203 DC::DB::get state => "tip_of_the_day", sub { 2394 DC::DB::get state => "tip_of_the_day", sub {
2321 2512
2322 $DEBUG_STATUS = new DC::UI::Label 2513 $DEBUG_STATUS = new DC::UI::Label
2323 padding => 0, 2514 padding => 0,
2324 z => 100, 2515 z => 100,
2325 force_x => "max", 2516 force_x => "max",
2326 force_y => 0; 2517 force_y => 20;
2327 $DEBUG_STATUS->show; 2518 $DEBUG_STATUS->show;
2328 2519
2329 $STATUSBOX = new DC::UI::Statusbox; 2520 $STATUSBOX = new DC::UI::Statusbox;
2330 2521
2331 $MODBOX = new DC::UI::Label 2522 $MODBOX = new DC::UI::Label
2342 2533
2343 (new DC::UI::Frame 2534 (new DC::UI::Frame
2344 bg => [0, 0, 0, 0.4], 2535 bg => [0, 0, 0, 0.4],
2345 force_x => 0, 2536 force_x => 0,
2346 force_y => "max", 2537 force_y => "max",
2347 child => (my $LR = new DC::UI::VBox), 2538 child => (my $LL = new DC::UI::VBox),
2348 )->show; 2539 )->show;
2349 2540
2350 $LR->add ($STATUSBOX); 2541 $LL->add ($STATUSBOX);
2351 $LR->add ($MODBOX); 2542 $LL->add ($MODBOX);
2352 $LR->add (new DC::UI::Label 2543 $LL->add (new DC::UI::Label
2353 align => 0, 2544 align => 0,
2354 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2545 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2355 fontsize => 0.5, 2546 fontsize => 0.5,
2356 fg => [1, 1, 0, 0.7], 2547 fg => [1, 1, 0, 0.7],
2357 ); 2548 );
2358 2549
2359 DC::UI::Toplevel->new ( 2550 DC::UI::Toplevel->new (
2360 title => "Minimap", 2551 title => "Minimap",
2361 name => "mapmap", 2552 name => "mapmap",
2362 x => 0, 2553 x => 0,
2363 y => $FONTSIZE + 8, 2554 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2364 border_bg => [1, 1, 1, 192/255], 2555 border_bg => [1, 1, 1, 192/255],
2365 bg => [1, 1, 1, 0], 2556 bg => [1, 1, 1, 0],
2366 child => ($MAPMAP = new DC::MapWidget::MapMap 2557 child => ($MAPMAP = new DC::MapWidget::MapMap
2367 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2558 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2368 ), 2559 ),
2397 $METASERVER = metaserver_dialog; 2588 $METASERVER = metaserver_dialog;
2398 # the name is changed to not conflict with the older name as users could have hidden it 2589 # the name is changed to not conflict with the older name as users could have hidden it
2399 $MESSAGE_WINDOW = new DC::UI::Dockbar 2590 $MESSAGE_WINDOW = new DC::UI::Dockbar
2400 name => "message_window2", 2591 name => "message_window2",
2401 title => 'Messages', 2592 title => 'Messages',
2593 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2402 force_w => $::WIDTH * 0.6, 2594 force_w => $::WIDTH * 0.6,
2403 force_h => $::HEIGHT * 0.25, 2595 force_h => $::HEIGHT * 0.25,
2404 ; 2596 ;
2405 2597
2406 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2598 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2426 . "After pressing the combo the binding will be saved automatically and the " 2618 . "After pressing the combo the binding will be saved automatically and the "
2427 . "binding editor closes"); 2619 . "binding editor closes");
2428 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2620 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2429 "Some debuggin' options. Do not ask."); 2621 "Some debuggin' options. Do not ask.");
2430 2622
2431 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2623 make_help_window;
2624 make_menubar;
2432 2625
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; 2626 $SETUP_DIALOG->show;
2473 $MESSAGE_WINDOW->show; 2627 $MESSAGE_WINDOW->show;
2474 } 2628 }
2475 2629
2476 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2630 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2477 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2631 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2478 2632
2479 $CAVEAT_LABEL->set_text ("None :)"); 2633 $CAVEAT_LABEL->set_text ("None :)");
2634 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2635 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2480 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2636 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2481 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2637 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2482 2638
2483 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2639 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2484} 2640}
2494my $animate_timer; 2650my $animate_timer;
2495 2651
2496my $fps = 9; 2652my $fps = 9;
2497 2653
2498sub force_refresh { 2654sub force_refresh {
2499 if ($ENV{CFPLUS_DEBUG} & 4) { 2655 if ($DELIANTRA_DEBUG & 4) {
2500 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2656 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2501 debug sprintf "%3.2f", $fps; 2657 debug sprintf "%3.2f", $fps;
2502 } 2658 }
2503 2659
2504 undef $WANT_REFRESH; 2660 undef $WANT_REFRESH;
2512my $want_refresh = EV::prepare_ns \&force_refresh; 2668my $want_refresh = EV::prepare_ns \&force_refresh;
2513 2669
2514my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2670my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2515 $NOW = EV::now; 2671 $NOW = EV::now;
2516 2672
2517 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2673 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2518 for DC::poll_events; 2674 for DC::poll_events;
2519 2675
2520 if (%animate_object) { 2676 if (%animate_object) {
2521 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2677 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2522 $WANT_REFRESH = 1; 2678 $WANT_REFRESH = 1;
2534sub animation_stop { 2690sub animation_stop {
2535 my ($widget) = @_; 2691 my ($widget) = @_;
2536 delete $animate_object{$widget}; 2692 delete $animate_object{$widget};
2537} 2693}
2538 2694
2539%SDL_CB = (
2540 DC::SDL_QUIT => sub { 2695$SDL_CB[DC::SDL_QUIT] = sub {
2541 crash "SDL_QUIT"; 2696 crash "SDL_QUIT";
2542 EV::unloop EV::UNLOOP_ALL; 2697 EV::unloop EV::UNLOOP_ALL;
2543 }, 2698};
2544 DC::SDL_VIDEORESIZE => sub { 2699$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2545 },
2546 DC::SDL_VIDEOEXPOSE => sub { 2700$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2547 DC::UI::full_refresh; 2701 DC::UI::full_refresh;
2548 }, 2702};
2549 DC::SDL_ACTIVEEVENT => sub { 2703$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2550# not useful, as APPACTIVE includes only iconified state, not unmapped 2704# 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# 2705# 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# 2706# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2553# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2707# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2554# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2708# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2555# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2709# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2556 }, 2710};
2557 DC::SDL_KEYDOWN => sub { 2711$SDL_CB[DC::SDL_KEYDOWN] = sub {
2558 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2712 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2559 # alt-enter 2713 # alt-enter
2560 video_shutdown; 2714 video_shutdown;
2561 $FULLSCREEN_ENABLE->toggle; 2715 $FULLSCREEN_ENABLE->toggle;
2562 video_init; 2716 video_init;
2563 } else { 2717 } else {
2564 &DC::UI::feed_sdl_key_down_event; 2718 &DC::UI::feed_sdl_key_down_event;
2565 } 2719 }
2566 update_modbox; 2720 update_modbox;
2567 }, 2721};
2568 DC::SDL_KEYUP => sub { 2722$SDL_CB[DC::SDL_KEYUP] = sub {
2569 &DC::UI::feed_sdl_key_up_event; 2723 &DC::UI::feed_sdl_key_up_event;
2570 update_modbox; 2724 update_modbox;
2571 }, 2725};
2572 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2726$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2573 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2727$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2574 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2728$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2575 DC::SDL_USEREVENT => sub { 2729$SDL_CB[DC::SDL_USEREVENT] = sub {
2576 if ($_[0]{code} == 1) { 2730 if ($_[0]{code} == 1) {
2577 audio_channel_finished $_[0]{data1}; 2731 audio_channel_finished $_[0]{data1};
2578 } elsif ($_[0]{code} == 0) { 2732 } elsif ($_[0]{code} == 0) {
2579 audio_music_finished; 2733 audio_music_finished;
2580 }
2581 }, 2734 }
2582); 2735};
2583 2736
2584############################################################################# 2737#############################################################################
2585 2738
2586$SIG{INT} = $SIG{TERM} = sub { 2739$SIG{INT} = $SIG{TERM} = sub {
2587 EV::unloop; 2740 EV::unloop;
2588 #d# TODO calling exit here hangs the process in some futex 2741 #d# TODO calling exit here hangs the process in some futex
2589}; 2742};
2590 2743
2591# due to mac os x + sdl combined briandamage, we need this contortion 2744# due to mac os x + sdl combined braindamage, we need this contortion
2592sub main { 2745sub main {
2593 { 2746 {
2594 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2747 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2595 2748
2596 if (-e "$Deliantra::VARDIR/client.cf") { 2749 if (-e "$Deliantra::VARDIR/client.cf") {
2613 DC::DB::open_db; 2766 DC::DB::open_db;
2614 2767
2615 DC::UI::set_layout ($::CFG->{layout}); 2768 DC::UI::set_layout ($::CFG->{layout});
2616 2769
2617 my %DEF_CFG = ( 2770 my %DEF_CFG = (
2771 config_autosave => 1,
2618 sdl_mode => undef, 2772 sdl_mode => undef,
2619 fullscreen => 1, 2773 fullscreen => 1,
2620 fast => 0, 2774 fast => 0,
2621 force_opengl11 => undef, 2775 force_opengl11 => undef,
2622 disable_alpha => 0, 2776 disable_alpha => 0,
2623 smooth_movement => 1, 2777 smooth_movement => 1,
2778 smooth_transitions => 1,
2624 texture_compression => 1, 2779 texture_compression => 1,
2625 map_scale => 1, 2780 map_scale => 1,
2626 fow_enable => 1, 2781 fow_enable => 1,
2627 fow_intensity => 0, 2782 fow_intensity => 0,
2783 fow_texture => 0,
2628 map_smoothing => 1, 2784 map_smoothing => 1,
2629 gui_fontsize => 1, 2785 gui_fontsize => 1,
2630 log_fontsize => 0.7, 2786 log_fontsize => 0.7,
2631 gauge_fontsize => 1, 2787 gauge_fontsize => 1,
2632 gauge_size => 0.35, 2788 gauge_size => 0.35,
2640 effects_enable => 1, 2796 effects_enable => 1,
2641 effects_volume => 1, 2797 effects_volume => 1,
2642 bgm_enable => 1, 2798 bgm_enable => 1,
2643 bgm_volume => 0.5, 2799 bgm_volume => 0.5,
2644 output_rate => "", 2800 output_rate => "",
2645 pickup => 0, 2801 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2646 inv_sort => "mtime", 2802 inv_sort => "mtime",
2647 default => "profile", # default profile 2803 default => "profile", # default profile
2648 show_tips => 1, 2804 show_tips => 1,
2649 logview_max_par => 1000, 2805 logview_max_par => 1000,
2650 shift_fire_stop => 0, 2806 shift_fire_stop => 0,
2651 uitheme => "wood", 2807 uitheme => "wood",
2652 ); 2808 map_shift_x => -24, # arbitrary
2809 map_shift_y => +24, # arbitrary
2653 2810 );
2811
2654 while (my ($k, $v) = each %DEF_CFG) { 2812 while (my ($k, $v) = each %DEF_CFG) {
2655 $CFG->{$k} = $v unless exists $CFG->{$k}; 2813 $CFG->{$k} = $v unless exists $CFG->{$k};
2656 } 2814 }
2657 2815
2658 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2816 my @args = @ARGV;
2817
2818 my $profile = 'default';
2819
2820 for (my $i = 0; $i < @args; $i++) {
2821 if ($args[$i] =~ /^--?profile$/) {
2822 $profile = $args[$i + 1];
2823 splice @args, $i, 2, ();
2824 $i = 0;
2825 } elsif ($args[$i] =~ /^--?h/) {
2826 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2827 exit 0;
2828 }
2829 }
2830
2831 $CFG->{profile}{$profile} ||= {};
2659 $PROFILE = $CFG->{profile}{default}; 2832 $PROFILE = $CFG->{profile}{$profile};
2833 $PROFILE->{host} ||= "gameserver.deliantra.net";
2834
2835 $PROFILE->{host} = $args[0] if @args > 0;
2836 $PROFILE->{user} = $args[1] if @args > 1;
2837 $PROFILE->{password} = $args[2] if @args > 2;
2660 2838
2661 # convert old bindings (only default profile matters) 2839 # convert old bindings (only default profile matters)
2662 if (my $bindings = delete $PROFILE->{bindings}) { 2840 if (my $bindings = delete $PROFILE->{bindings}) {
2663 while (my ($mod, $syms) = each %$bindings) { 2841 while (my ($mod, $syms) = each %$bindings) {
2664 while (my ($sym, $cmds) = each %$syms) { 2842 while (my ($sym, $cmds) = each %$syms) {
2670 } 2848 }
2671 } 2849 }
2672 2850
2673 sdl_init; 2851 sdl_init;
2674 2852
2853 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2854 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2855
2675 { 2856 {
2676 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2857 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2677 DejaVuSans.ttf 2858 DejaVuSans.ttf
2678 DejaVuSansMono.ttf 2859 DejaVuSansMono.ttf
2679 DejaVuSans-Bold.ttf 2860 DejaVuSans-Bold.ttf
2680 DejaVuSansMono-Bold.ttf 2861 DejaVuSansMono-Bold.ttf
2681 DejaVuSans-Oblique.ttf 2862 DejaVuSans-Oblique.ttf
2682 DejaVuSansMono-Oblique.ttf 2863 DejaVuSansMono-Oblique.ttf
2683 DejaVuSans-BoldOblique.ttf 2864 DejaVuSans-BoldOblique.ttf
2684 DejaVuSansMono-BoldOblique.ttf 2865 DejaVuSansMono-BoldOblique.ttf
2866 mona.ttf
2685 ); 2867 );
2686 2868
2687 DC::add_font $_ for @fonts; 2869 DC::add_font $_ for @fonts;
2688 2870
2689 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2871 $FONT_PROP = new_from_file DC::Font $fonts[0];
2690 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2872 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2691 2873
2692 $FONT_PROP->make_default; 2874 $FONT_PROP->make_default;
2693 2875
2716 our $STARTUP_CANCEL = EV::idle sub { 2898 our $STARTUP_CANCEL = EV::idle sub {
2717 undef $::STARTUP_CANCEL; 2899 undef $::STARTUP_CANCEL;
2718 $startup_done->(); 2900 $startup_done->();
2719 }; 2901 };
2720 2902
2903 debug_toggle 0;
2904
2721 delete $SIG{__DIE__}; 2905 delete $SIG{__DIE__};
2722 EV::loop; 2906 EV::loop;
2723 2907
2908 DC::write_cfg if $CFG->{config_autosave};
2909
2724#video_shutdown; 2910 #video_shutdown;
2725#audio_shutdown; 2911 #audio_shutdown;
2912
2726 DC::OpenGL::quit; 2913 DC::OpenGL::quit;
2727 DC::SDL_Quit; 2914 DC::SDL_Quit;
2728 DC::DB::Server::stop; 2915 DC::DB::Server::stop;
2729} 2916}
2730 2917
2734 2921
2735deliantra - A Deliantra MORPG game client 2922deliantra - A Deliantra MORPG game client
2736 2923
2737=head1 SYNOPSIS 2924=head1 SYNOPSIS
2738 2925
2739Just run it - no commandline arguments are supported. 2926 deliantra [--profile name] [host [user [password]]]
2927 deliantra --help
2740 2928
2741=head1 USAGE 2929=head1 USAGE
2742 2930
2743deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2931The deliantra client utilises OpenGL for all UI elements and the game. It
2744be used in fullscreen mode and interactively. 2932is supposed to be used in fullscreen mode and interactively.
2745 2933
2746=head1 DEBUGGING 2934=head1 DEBUGGING
2747 2935
2748
2749CFPLUS_DEBUG - environment variable 2936DELIANTRA_DEBUG - environment variable
2750 2937
2751 1 draw borders around widgets 2938 1 draw borders around widgets
2752 2 add low-level widget info to tooltips 2939 2 add low-level widget info to tooltips
2753 4 show fps 2940 4 show fps
2754 8 suppress tooltips 2941 8 suppress tooltips
2942 16 show bandwidth downstream
2755 2943
2756=head1 AUTHOR 2944=head1 AUTHOR
2757 2945
2758Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2946Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2759 2947

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines