ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.110 by root, Sun Aug 13 18:48:57 2006 UTC vs.
Revision 1.195 by root, Tue Jul 31 01:03:52 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 54
21 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
22 } 67 }
23} 68}
24 69
25# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 72 if %PAR::LibCache;
28 73
29use Time::HiRes 'time'; 74use Time::HiRes 'time';
30use Event; 75use Event;
76use List::Util qw(max min);
31 77
32use Crossfire; 78use Crossfire;
33use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
34 80
35use Compress::LZF; 81use Compress::LZF;
36 82
37use CFPlus; 83use CFPlus;
38use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
39use CFPlus::Protocol; 85use CFPlus::Protocol;
86use CFPlus::DB;
40use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
41use CFPlus::Pod; 92use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 93use CFPlus::MapWidget;
94use CFPlus::Macro;
44 95
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 97$SIG{PIPE} = 'IGNORE';
47 98
48$Event::Eval = 0; 99$Event::Eval = 1;
49$Event::DIED = sub { 100$Event::DIED = sub {
50 # TODO: display dialog box or so 101 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 102};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 103
66my $MAX_FPS = 60; 104my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 105my $MIN_FPS = 5; # unused as of yet
68 106
69our $META_SERVER = "crossfire.real-time.com:13326"; 107our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 108
71our $LAST_REFRESH; 109our $LAST_REFRESH;
72our $NOW; 110our $NOW;
73 111
74our $CFG; 112our $CFG;
75our $CONN; 113our $CONN;
114our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 116
78our $WANT_REFRESH; 117our $WANT_REFRESH;
79our $CAN_REFRESH; 118our $CAN_REFRESH;
80 119
89 128
90our $MAP; 129our $MAP;
91our $MAPMAP; 130our $MAPMAP;
92our $MAPWIDGET; 131our $MAPWIDGET;
93our $BUTTONBAR; 132our $BUTTONBAR;
94our $LOGVIEW;
95our $CONSOLE;
96our $METASERVER; 133our $METASERVER;
97our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
98our $QUIT_DIALOG; 135our $QUIT_DIALOG;
99our $HOST_ENTRY; 136our $HOST_ENTRY;
100our $FULLSCREEN_ENABLE; 137our $FULLSCREEN_ENABLE;
111 148
112our $INVENTORY_PAGE; 149our $INVENTORY_PAGE;
113our $STATS_PAGE; 150our $STATS_PAGE;
114our $SKILL_PAGE; 151our $SKILL_PAGE;
115our $SPELL_PAGE; 152our $SPELL_PAGE;
153our $SPELL_LIST;
116 154
117our $HELP_WINDOW; 155our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 156our $MESSAGE_WINDOW;
119our $FLOORBOX; 157our $FLOORBOX;
120our $GAUGES; 158our $GAUGES;
122 160
123our $SDL_ACTIVE; 161our $SDL_ACTIVE;
124our %SDL_CB; 162our %SDL_CB;
125 163
126our $SDL_MIXER; 164our $SDL_MIXER;
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our @MUSIC_WANT;
167our $MUSIC_START;
168our $MUSIC_PLAYING_DATA;
169our $MUSIC_PLAYING_META;
170our $MUSIC_PLAYER;
171our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
127our @SOUNDS; # event => file mapping 172our @SOUNDS; # event => file mapping
128our %AUDIO_CHUNKS; # audio files 173our %AUDIO_CHUNK; # audio files
129 174
130our $ALT_ENTER_MESSAGE; 175our $ALT_ENTER_MESSAGE;
131our $STATUSBOX; 176our $STATUSBOX;
132our $DEBUG_STATUS; 177our $DEBUG_STATUS;
133 178
134our $INV; 179our $INV;
135our $INVR; 180our $INVR;
136our $INV_RIGHT_HB; 181our $INV_RIGHT_HB;
137 182
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 183our $PICKUP_CFG;
184
185#############################################################################
186#TODO: maybe move into own audio module...
187
188sub audio_channel_finished {
189 my ($channel) = @_;
190
191# warn "channel $channel finished\n";#d#
192}
193
194our %AUDIO_PLAY;
195our %AUDIO_CHUNK;
196
197sub audio_sound_push($) {
198 my ($face) = @_;
199
200 if (my $chunk = $AUDIO_CHUNK{$face}) {
201 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
202 my (undef, $dx, $dy, $vol) = @$_;
203
204 my $channel = CFPlus::Channel::find;
205 $channel->volume (128 + $vol);
206 $dx = $dx / 10 * 255;
207 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
208
209# my $angle = $dx ? : $dx < 0 ?
210# my $distance = -$vol;
211# $channel->set_position ($angle, $distance);
212
213 $chunk->play ($channel);
214 }
215 } else {
216 # sound_meta not set means data is in flight either way
217 my $meta = $CONN->{sound_meta}{$face}
218 or return;
219
220 # fetch from database
221 CFPlus::DB::get res_data => $meta->{name}, sub {
222 my $vol = $meta->{meta}{volume} || 1;
223 my $rwops = new CFPlus::RW $_[0];
224 my $chunk = new CFPlus::MixChunk $rwops;
225 $chunk->volume ($vol * 128);
226 $AUDIO_CHUNK{$face} = $chunk;
227
228 audio_sound_push ($face);
229 };
230 }
231}
232
233sub audio_sound_play {
234 my ($face, $dx, $dy, $vol) = @_;
235
236 $SDL_MIXER
237 or return;
238
239 my $queue = $AUDIO_PLAY{$face} ||= [];
240 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
241 audio_sound_push $face
242 unless @$queue > 1;
243}
244
245sub audio_music_update_volume {
246 return unless $MUSIC_PLAYING_META;
247 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
248 my $base = $CFG->{bgm_volume};
249 CFPlus::MixMusic::volume $base * $volume * 128;
250}
251
252sub audio_music_set_ambient {
253 my ($songs) = @_;
254
255 my @want =
256 grep $_,
257 map $CONN->{music_meta}{$_},
258 @$songs;
259
260 if (@want) {
261 @MUSIC_WANT = @want;
262 &audio_music_changed ();
263 }
264}
265
266sub audio_music_start {
267 my $meta = $MUSIC_PLAYING_META;
268
269 CFPlus::DB::get res_data => $meta->{name}, sub {
270 return unless $SDL_MIXER;
271
272 # music might have changed...
273 $meta eq $MUSIC_PLAYING_META
274 or return &audio_music_start ();
275
276 audio_music_update_volume;
277
278 $MUSIC_PLAYING_DATA = \$_[0];
279
280 my $rwops = $meta->{path}
281 ? new_from_file CFPlus::RW $meta->{path}
282 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
283
284 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
285 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
286
287 my $NOW = time;
288
289 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
290 my $pos = $MUSIC_PLAYING_META->{stop_pos};
291 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
292 $MUSIC_START = time - $pos;
293 } else {
294 $MUSIC_PLAYER->play (0);
295 $MUSIC_START = time;
296 }
297
298 delete $MUSIC_PLAYING_META->{stop_time};
299 delete $MUSIC_PLAYING_META->{stop_pos};
300 }
301}
302
303sub audio_music_changed {
304 return unless $CFG->{bgm_enable};
305 return unless $SDL_MIXER;
306
307 # default MUSIC_WANT == MUSIC_DEFAULT
308 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
309
310 # if the currently playing song is acceptable, let it continue
311 return if $MUSIC_PLAYING_META
312 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
313
314 my $NOW = time;
315
316 if ($MUSIC_PLAYING_META) {
317 $MUSIC_PLAYING_META->{stop_time} = $NOW;
318 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
319 CFPlus::MixMusic::fade_out 1000;
320 } else {
321 # sort by stop time, oldest first
322 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
323
324 # if the most recently-played piece played very recently,
325 # resume it, else choose the oldest piece for rotation.
326 $MUSIC_PLAYING_META =
327 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
328 ? $MUSIC_WANT[-1]
329 : $MUSIC_WANT[0];
330
331 audio_music_start;
332 }
333}
334
335sub audio_music_finished {
336 undef $MUSIC_PLAYER;
337 undef $MUSIC_PLAYING_META;
338 undef $MUSIC_PLAYING_DATA;
339
340 audio_music_changed;
341}
342
343#############################################################################
142 344
143sub status { 345sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 346 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 347}
146 348
147sub debug { 349sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 350 $DEBUG_STATUS->set_text ($_[0]);
351}
352
353sub message {
354 my ($para) = @_;
355 $MESSAGE_WINDOW->message ($para);
149} 356}
150 357
151sub destroy_query_dialog { 358sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 359 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 360 if $_[0]{query_dialog};
154} 361}
155 362
363# FIXME: a very ugly hack to wait for stat update look below! #d#
364our $QUERY_TIMER; #d#
365
156# server query dialog 366# server query dialog
157sub server_query { 367sub server_query {
158 my ($conn, $flags, $prompt) = @_; 368 my ($conn, $flags, $prompt) = @_;
159 369
370 # FIXME: a very ugly hack to wait for stat update #d#
371 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
372 unless ($QUERY_TIMER) {
373 $QUERY_TIMER =
374 Event->timer (
375 after => 1,
376 cb => sub {
377 server_query ($conn, $flags, $prompt, 1);
378 $QUERY_TIMER = undef
379 }
380 );
381 return;
382 }
383 }
384
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 385 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 386 x => "center",
162 y => "center", 387 y => "center",
163 title => "Server Query", 388 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 389 child => my $vbox = new CFPlus::UI::VBox,
165 ; 390 ;
166 391
167 my @dialog = my $label = new CFPlus::UI::Label 392 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 393 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 394 ellipsise => 0,
170 text => $prompt; 395 text => $prompt;
171 396
172 if ($flags & CS_QUERY_YESNO) { 397 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 398 push @dialog, my $hbox = new CFPlus::UI::HBox;
190 ); 415 );
191 416
192 $dialog->grab_focus; 417 $dialog->grab_focus;
193 418
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 419 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "#charcreation_focus";
196
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 420 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 421 $dialog->{tooltip} = "#charcreation_focus";
199 422
200 unshift @dialog, new CFPlus::UI::Label 423 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 424 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 425 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 426 markup => "\nOr use your keyboard and the text entry below:\n";
204 427
205 unshift @dialog, my $table = new CFPlus::UI::Table; 428 unshift @dialog, my $table = new CFPlus::UI::Table;
206 429
207 $table->add (0, 0, new CFPlus::UI::Button 430 $table->add_at (0, 0, new CFPlus::UI::Button
208 text => "Next Race", 431 text => "Next Race",
209 on_activate => sub { 432 on_activate => sub {
210 $conn->send ("reply n"); 433 $conn->send ("reply n");
211 destroy_query_dialog $conn; 434 destroy_query_dialog $conn;
212 0 435 0
213 }, 436 },
214 ); 437 );
215 $table->add (2, 0, new CFPlus::UI::Button 438 $table->add_at (2, 0, new CFPlus::UI::Button
216 text => "Accept", 439 text => "Accept",
217 on_activate => sub { 440 on_activate => sub {
218 $conn->send ("reply d"); 441 $conn->send ("reply d");
219 destroy_query_dialog $conn; 442 destroy_query_dialog $conn;
220 0 443 0
221 }, 444 },
222 ); 445 );
223 446
447 if ($conn->{chargen_race_description}) {
448 unshift @dialog, new CFPlus::UI::Label
449 max_w => $::WIDTH * 0.8,
450 ellipsise => 0,
451 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
452 ;
453 }
454
455 unshift @dialog, new CFPlus::UI::Face
456 face => $conn->{player}{face},
457 bg => [.2, .2, .2, 1],
458 min_w => 64,
459 min_h => 64,
460 ;
461
462 if ($conn->{chargen_race_title}) {
463 unshift @dialog, new CFPlus::UI::Label
464 allign => 1,
465 ellipsise => 0,
466 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
467 ;
468 }
469
224 unshift @dialog, new CFPlus::UI::Label 470 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 471 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 472 ellipsise => 0,
227 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 473 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 ; 474 ;
232 $conn->send ("reply $stat"); 478 $conn->send ("reply $stat");
233 destroy_query_dialog $conn; 479 destroy_query_dialog $conn;
234 return; 480 return;
235 } 481 }
236 482
237 $STATS_PAGE->show;
238 $MESSAGE_WINDOW->hide;
239
240 unshift @dialog, new CFPlus::UI::Label 483 unshift @dialog, new CFPlus::UI::Label
241 max_w => $::WIDTH * 0.4, 484 max_w => $::WIDTH * 0.4,
242 ellipsise => 0, 485 ellipsise => 0,
243 markup => "\nOr use your keyboard and the text entry below:\n"; 486 markup => "\nOr use your keyboard and the text entry below:\n";
244 487
245 unshift @dialog, my $table = new CFPlus::UI::Table; 488 unshift @dialog, my $table = new CFPlus::UI::Table;
246 489
247 # left: re-roll 490 # left: re-roll
248 $table->add (0, 0, new CFPlus::UI::Button 491 $table->add_at (0, 0, new CFPlus::UI::Button
249 text => "Roll Again", 492 text => "Roll Again",
250 on_activate => sub { 493 on_activate => sub {
251 $conn->send ("reply y"); 494 $conn->send ("reply y");
252 destroy_query_dialog $conn; 495 destroy_query_dialog $conn;
253 0 496 0
267 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 510 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
268 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 511 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
269 ], 512 ],
270 ), 1 .. 2; 513 ), 1 .. 2;
271 514
272 $table->add (2, 0, new CFPlus::UI::Button 515 $table->add_at (2, 0, new CFPlus::UI::Button
273 text => "Swap Stats", 516 text => "Swap Stats",
274 on_activate => sub { 517 on_activate => sub {
275 $conn->{stat_change_with} = $sw2->{value}; 518 $conn->{stat_change_with} = $sw2->{value};
276 $conn->send ("reply $sw1->{value}"); 519 $conn->send ("reply $sw1->{value}");
277 destroy_query_dialog $conn; 520 destroy_query_dialog $conn;
278 0 521 0
279 }, 522 },
280 ); 523 );
281 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 524 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
282 525
283 # right: accept 526 # right: accept
284 $table->add (4, 0, new CFPlus::UI::Button 527 $table->add_at (4, 0, new CFPlus::UI::Button
285 text => "Accept", 528 text => "Accept",
286 on_activate => sub { 529 on_activate => sub {
287 $conn->send ("reply n"); 530 $conn->send ("reply n");
288 $STATS_PAGE->hide; 531 $STATS_PAGE->hide;
289 destroy_query_dialog $conn; 532 destroy_query_dialog $conn;
354 $LOGIN_BUTTON->set_text ("Logout"); 597 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 598 $SETUP_DIALOG->hide;
356 599
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 600 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 601
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 602 my ($host, $port) = split /:/, $PROFILE->{host};
360 603
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 604 $MAP = new CFPlus::Map;
362 605
363 $CONN = eval { 606 $CONN = eval {
364 new CFPlus::Protocol 607 new CFPlus::Protocol
365 host => $host, 608 host => $host,
366 port => $port || 13327, 609 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 610 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 611 pass => $PROFILE->{password},
369 mapw => $mapsize, 612 mapw => $mapsize,
370 maph => $mapsize, 613 maph => $mapsize,
371 614
615 client => "cfplus $CFPlus::VERSION $] $^O",
616
372 map_widget => $MAPWIDGET, 617 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 618 statusbox => $STATUSBOX,
375 map => $MAP, 619 map => $MAP,
376 mapmap => $MAPMAP, 620 mapmap => $MAPMAP,
377 query => \&server_query, 621 query => \&server_query,
378 622
379 sound_play => sub { 623 setup_req => {
380 my ($x, $y, $soundnum, $type) = @_; 624 smoothing => $CFG->{map_smoothing}*1,
381
382 $SDL_MIXER
383 or return;
384
385 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
386 or return;
387
388 $chunk->play;
389 }, 625 },
390 }; 626 };
391 627
392 if ($CONN) { 628 if ($CONN) {
393 CFPlus::lowdelay fileno $CONN->{fh}; 629 CFPlus::lowdelay fileno $CONN->{fh};
402sub stop_game { 638sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 639 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 640 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 641 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 642 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 643 $SPELL_LIST->clear_spells;
644 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
645
646 &audio_music_set_ambient ([]);
408 647
409 return unless $CONN; 648 return unless $CONN;
410 649
411 status "connection closed"; 650 status "connection closed";
412 651
420sub graphics_setup { 659sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 660 my $vbox = new CFPlus::UI::VBox;
422 661
423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 662 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
424 663
664 my $row = 0;
665
666 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
667 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
668 can_events => 1,
669 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
670
671 my $vidmode_tooltip =
672 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
673 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
674
425 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 675 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 676 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 677
678 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
428 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 679 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
429 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 680 tooltip => $vidmode_tooltip);
681 $hbox->add (my $mode_label = new CFPlus::UI::Label
682 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
683 can_events => 1, tooltip => $vidmode_tooltip);
430 684
431 $mode_slider->connect (changed => sub { 685 $mode_slider->connect (changed => sub {
432 my ($self, $value) = @_; 686 my ($self, $value) = @_;
433 687
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 688 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 689 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
436 }); 690 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 691 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438 692
439 my $row = 1;
440
441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 693 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 694 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 695 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 696 tooltip => "Bring the client into fullscreen mode.",
445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 697 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
446 ); 698 );
447 699
448 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 700 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
449 $table->add (1, $row++, new CFPlus::UI::CheckBox 701 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
450 state => $CFG->{fast}, 702 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 703 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 704 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 705 );
454 706
707 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
708 $table->add_at (1, $row++, new CFPlus::UI::Slider
709 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
710 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
711 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
712 );
713
714 $table->add_at (1, $row++, new CFPlus::UI::Button
715 expand => 1, align => 0, text => "Apply",
716 tooltip => "Apply the video settings above.",
717 on_activate => sub {
718 video_shutdown ();
719 video_init ();
720 0
721 }
722 );
723
455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 724 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
456 $table->add (1, $row++, new CFPlus::UI::Slider 725 $table->add_at (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 726 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 727 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 728 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
460 ); 729 );
461 730
731 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
732 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
733 state => $CFG->{map_smoothing},
734 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
735 . "This increases load on the graphics subsystem and works only with 2.x servers. "
736 . "Changes take effect at next connection only.",
737 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
738 );
739
462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 740 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
463 $table->add (1, $row++, new CFPlus::UI::CheckBox 741 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 742 state => $CFG->{fow_enable},
465 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 743 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
466 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 744 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
467 ); 745 );
468 746
469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 747 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
470 $table->add (1, $row++, new CFPlus::UI::Slider 748 $table->add_at (1, $row++, new CFPlus::UI::Slider
471 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 749 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
472 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 750 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
473 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 751 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
474 ); 752 );
475 753
476 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
477 $table->add (1, $row++, new CFPlus::UI::CheckBox
478 state => $CFG->{fow_smooth},
479 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
480 on_changed => sub {
481 my ($self, $value) = @_;
482 $CFG->{fow_smooth} = $value;
483 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
484 0
485 }
486 );
487
488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
489 $table->add (1, $row++, new CFPlus::UI::Slider
490 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
491 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
492 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
493 );
494
495 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 754 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
496 $table->add (1, $row++, new CFPlus::UI::Slider 755 $table->add_at (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 756 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
498 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 757 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 758 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
500 ); 759 );
501 760
502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 761 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
503 $table->add (1, $row++, new CFPlus::UI::Slider 762 $table->add_at (1, $row++, new CFPlus::UI::Slider
504 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 763 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
505 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 764 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
506 on_changed => sub { 765 on_changed => sub {
507 $CFG->{gauge_fontsize} = $_[1]; 766 $CFG->{gauge_fontsize} = $_[1];
508 &set_gauge_window_fontsize; 767 &set_gauge_window_fontsize;
509 0 768 0
510 } 769 }
511 ); 770 );
512 771
513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 772 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
514 $table->add (1, $row++, new CFPlus::UI::Slider 773 $table->add_at (1, $row++, new CFPlus::UI::Slider
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 774 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 775 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
517 on_changed => sub { 776 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 777 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 778 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0 779 0
521 } 780 }
522 ); 781 );
523 782
524 $table->add (1, $row++, new CFPlus::UI::Button
525 expand => 1, align => 0, text => "Apply",
526 tooltip => "Apply the video settings",
527 on_activate => sub {
528 video_shutdown ();
529 video_init ();
530 0
531 }
532 );
533
534 $vbox 783 $vbox
535} 784}
536 785
537sub audio_setup { 786sub audio_setup {
538 my $vbox = new CFPlus::UI::VBox; 787 my $vbox = new CFPlus::UI::VBox;
539 788
540 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 789 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
541 790
542 my $row = 0; 791 my $row = 0;
543 792
544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 793 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
545 $table->add (1, $row++, new CFPlus::UI::CheckBox 794 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
546 state => $CFG->{audio_enable}, 795 state => $CFG->{audio_enable},
547 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 796 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
548 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 797 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
549 ); 798 );
550# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 799# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
551# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 800# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
552# $CFG->{effects_volume} = $_[1]; 801# $CFG->{effects_volume} = $_[1];
553# }); 802# });
554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 803 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
555 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 804 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
556 $hbox->add (new CFPlus::UI::CheckBox 805 $hbox->add (new CFPlus::UI::CheckBox
557 expand => 1, state => $CFG->{bgm_enable}, 806 expand => 1, state => $CFG->{bgm_enable},
558 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 807 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
559 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 808 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
560 ); 809 );
561 $hbox->add (new CFPlus::UI::Slider 810 $hbox->add (new CFPlus::UI::Slider
562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 811 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
563 tooltip => "The volume of the background music. Changes are instant.", 812 tooltip => "The volume of the background music. Changes are instant.",
564 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 813 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
565 ); 814 );
566 815
567 $table->add (1, $row++, new CFPlus::UI::Button 816 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply", 817 expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the audio settings", 818 tooltip => "Apply the audio settings",
570 on_activate => sub { 819 on_activate => sub {
571 audio_shutdown (); 820 audio_shutdown ();
572 audio_init (); 821 audio_init ();
631} 880}
632 881
633sub debug_setup { 882sub debug_setup {
634 my $table = new CFPlus::UI::Table; 883 my $table = new CFPlus::UI::Table;
635 884
636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 885 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
637 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 886 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
638 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 887 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 888 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 889 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 890 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 891 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 892 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
893 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644 894
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 895 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
646 896
647 for my $x (0..2) { 897 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
648 for my $y (0 .. 2) { 898 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
649 $table->add ($x + 3, $y, 899 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
650 new CFPlus::UI::Entry 900 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
651 text => $default_smooth[$x * 3 + $y], 901 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 902 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
653 ); 903
654 } 904 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
905
906 $c->add_items ({
907 type => "line_loop",
908 color => [0, 1, 0],
909 width => 9,
910 coord_mode => "abs",
911 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
655 } 912 });
656 913
914 $c->add_items ({
915 type => "lines",
916 color => [1, 1, 0],
917 width => 2,
918 coord_mode => "rel",
919 coord => [[0,0], [1,1], [1,0], [0,1]],
920 });
921
922 $c->add_items ({
923 type => "polygon",
924 color => [0, 0.43, 0],
925 width => 2,
926 coord_mode => "rel",
927 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
928 });
657 929
658 $table 930 $table
659} 931}
660 932
661sub stats_window { 933sub stats_window {
663 expand => 1, 935 expand => 1,
664 scroll_y => 1 936 scroll_y => 1
665 ); 937 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 938 $r->add (my $vb = new CFPlus::UI::VBox);
667 939
940 $vb->add (new CFPlus::UI::FancyFrame
941 label => "Player",
942 child => (my $pi = new CFPlus::UI::VBox),
943 );
944
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 945 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 946 can_hover => 1, can_events => 1,
670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 947 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
671 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 948 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 949 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 950 tooltip => "The map you are currently on (if supported by the server).");
674 951
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 952 $pi->add (my $hb0 = new CFPlus::UI::HBox);
676 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 953 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 954 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 955 tooltip => "The weight of the player including all inventory items.");
679 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 956 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
680 can_hover => 1, can_events => 1, 957 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 958 tooltip => "The weight limit: you cannot carry more than this.");
682 959
960 $vb->add (new CFPlus::UI::FancyFrame
961 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 962 child => (my $hb = new CFPlus::UI::HBox expand => 1),
963 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 964 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 965
686 my $color2 = [1, 1, 0]; 966 my $color2 = [1, 1, 0];
687 967
688 for ( 968 for (
701 [2, 4, st_spd => "Spd", 10.54], 981 [2, 4, st_spd => "Spd", 10.54],
702 [2, 5, st_wspd => "WSp", 10.54], 982 [2, 5, st_wspd => "WSp", 10.54],
703 ) { 983 ) {
704 my ($col, $row, $id, $label, $template) = @$_; 984 my ($col, $row, $id, $label, $template) = @$_;
705 985
706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 986 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
707 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 987 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
708 align => +1, template => $template, tooltip => "#stat_$label"); 988 align => +1, template => $template, tooltip => "#stat_$label");
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 989 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 990 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 991 align => -1, text => $label, tooltip => "#stat_$label");
712 } 992 }
713 993
994 $vb->add (new CFPlus::UI::FancyFrame
995 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 996 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
997 );
715 998
716 my $row = 0; 999 my $row = 0;
717 my $col = 0; 1000 my $col = 0;
718 1001
719 my %resist_names = ( 1002 my %resist_names = (
752 cold => ["Cold", 1035 cold => ["Cold",
753 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1036 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
754 ghit => ["Ghost hit", 1037 ghit => ["Ghost hit",
755 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1038 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
756 ); 1039 );
1040
757 for (qw/slow holyw conf fire depl magic 1041 for (qw/slow holyw conf fire depl magic
758 drain acid pois para deat phys 1042 drain acid pois para deat phys
759 blind fear tund elec cold ghit/) 1043 blind fear tund elec cold ghit/)
760 { 1044 {
761 $tbl2->add ($col, $row, 1045 $tbl2->add_at ($col, $row,
762 $STATWIDS->{"res_$_"} = 1046 $STATWIDS->{"res_$_"} =
763 new CFPlus::UI::Label 1047 new CFPlus::UI::Label
764 font => $FONT_FIXED, 1048 font => $FONT_FIXED,
765 template => "-100%", 1049 template => "-100%",
766 align => +1, 1050 align => +1,
767 valign => 0, 1051 valign => 0,
768 can_events => 1, 1052 can_events => 1,
769 can_hover => 1, 1053 can_hover => 1,
770 tooltip => $resist_names{$_}->[1], 1054 tooltip => $resist_names{$_}->[1],
771 ); 1055 );
772 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1056 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
773 font => $FONT_FIXED, 1057 font => $FONT_FIXED,
774 can_hover => 1, 1058 can_hover => 1,
775 can_events => 1, 1059 can_events => 1,
776 path => "ui/resist/resist_$_.png", 1060 path => "ui/resist/resist_$_.png",
777 tooltip => $resist_names{$_}->[1], 1061 tooltip => $resist_names{$_}->[1],
778 ); 1062 );
779 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1063 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
780 text => $resist_names{$_}->[0], 1064 text => $resist_names{$_}->[0],
781 font => $FONT_FIXED, 1065 font => $FONT_FIXED,
782 can_hover => 1, 1066 can_hover => 1,
783 can_events => 1, 1067 can_events => 1,
784 tooltip => $resist_names{$_}->[1], 1068 tooltip => $resist_names{$_}->[1],
817 return if $METASERVER_ATIME > time; 1101 return if $METASERVER_ATIME > time;
818 $METASERVER_ATIME = time + 60; 1102 $METASERVER_ATIME = time + 60;
819 1103
820 my $table = $METASERVER->{table}; 1104 my $table = $METASERVER->{table};
821 $table->clear; 1105 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1106 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 1107
824 my $buf; 1108 my $ok = 0;
825 1109
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1110 CFPlus::background {
1111 my $ua = CFPlus::lwp_useragent;
827 1112
828 unless ($fh) { 1113 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 1114 } sub {
830 return; 1115 my ($msg) = @_;
831 } 1116 if ($msg) {
832
833 Event->io (fd => $fh, poll => 'r', cb => sub {
834 my $res = sysread $fh, $buf, 8192, length $buf;
835
836 if (!defined $res) {
837 $_[0]->w->cancel;
838 $label->set_text ("error while retrieving server list: $!");
839 } elsif ($res == 0) {
840 $_[0]->w->cancel;
841 status "server list retrieved";
842
843 utf8::decode $buf if utf8::valid $buf;
844
845 $table->clear; 1117 $table->clear;
846 1118
847 my @tip = ( 1119 my @tip = (
848 "The current number of users logged in on the server.", 1120 "The current number of users logged in on the server.",
849 "The hostname of the server.", 1121 "The hostname of the server.",
850 "The time this server has been running without being restarted.", 1122 "The time this server has been running without being restarted.",
851 "The server software version - a '+' indicates a Crossfire+ server.", 1123 "The server software version - a '+' indicates a Crossfire+ server.",
852 "Short information about this server provided by its admins.", 1124 "Short information about this server provided by its admins.",
853 ); 1125 );
854 my @col = qw(#Users Host Uptime Version Description); 1126 my @col = qw(#Users Host Uptime Version Description);
855 $table->add ($_, 0, new CFPlus::UI::Label 1127 $table->add_at ($_, 0, new CFPlus::UI::Label
856 can_hover => 1, can_events => 1, 1128 can_hover => 1, can_events => 1,
857 align => 0, fg => [1, 1, 0], 1129 align => 0, fg => [1, 1, 0],
858 text => $col[$_], tooltip => $tip[$_]) 1130 text => $col[$_], tooltip => $tip[$_])
859 for 0 .. $#col; 1131 for 0 .. $#col;
860 1132
861 my @align = qw(1 0 1 1 -1); 1133 my @align = qw(1 0 1 1 -1);
862 1134
863 my $y = 0; 1135 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1136 for my $m (@{ $msg->{servers} }) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1137 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1138 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
866 1139
867 for ($desc) { 1140 for ($desc) {
868 s/<br>/\n/gi; 1141 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 1142 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 1143 s/<.*?>//sgi;
871 s/&/&amp;/g; 1144 s/&amp;/&/g;
872 s/</&lt;/g; 1145 s/&lt;/</g;
873 s/>/&gt;/g; 1146 s/&gt;/>/g;
874 } 1147 }
875 1148
876 $uptime = sprintf "%dd %02d:%02d:%02d", 1149 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 1150 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 1151 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 1152 (int $uptime / 60) % 60,
880 $m->[8] % 60; 1153 $uptime % 60;
881 1154
882 $m = [$users, $host, $uptime, $version, $desc]; 1155 $m = [$users, $host, $uptime, $version, $desc];
883 1156
884 $y++; 1157 $y++;
885 1158
886 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1159 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
887 (new CFPlus::UI::Button 1160 (new CFPlus::UI::Button
888 text => "Use", 1161 text => "Use",
889 tooltip => "Put this server into the <b>Host:Port</b> field", 1162 tooltip => "Put this server into the <b>Host:Port</b> field",
890 on_activate => sub { 1163 on_activate => sub {
891 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1164 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
894 }, 1167 },
895 ), 1168 ),
896 (new CFPlus::UI::Empty expand => 1), 1169 (new CFPlus::UI::Empty expand => 1),
897 ]); 1170 ]);
898 1171
899 $table->add ($_, $y, new CFPlus::UI::Label 1172 $table->add_at ($_, $y, new CFPlus::UI::Label
1173 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 1174 ellipsise => 0,
901 align => $align[$_], 1175 align => $align[$_],
902 text => $m->[$_], 1176 text => $m->[$_],
903 tooltip => $tip[$_], 1177 tooltip => $tip[$_],
1178 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 1179 can_hover => 1,
905 can_events => 1, 1180 can_events => 1,
906 fontsize => 0.8) 1181 fontsize => 0.8)
907 for 0 .. $#$m; 1182 for 0 .. $#$m;
908 } 1183 }
1184 } else {
1185 $ok or $label->set_text ("error while contacting metaserver");
909 } 1186 }
910 }); 1187 };
1188
911} 1189}
912 1190
913sub metaserver_dialog { 1191sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 1192 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 1193 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1194 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 1195
918 my $dialog = new CFPlus::UI::FancyFrame 1196 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 1197 title => "Server List",
920 name => 'metaserver_dialog', 1198 name => 'metaserver_dialog',
921 x => 'center', 1199 x => 'center',
922 y => 'center', 1200 y => 'center',
923 z => 3, 1201 z => 3,
1202 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 1203 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 1204 child => $vbox,
926 has_close_button => 1, 1205 has_close_button => 1,
927 table => $table, 1206 table => $table,
928 on_visibility_change => sub { 1207 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 1208 update_metaserver ($_[0]) if $_[1];
935} 1214}
936 1215
937sub server_setup { 1216sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 1217 my $vbox = new CFPlus::UI::VBox;
939 1218
1219 $vbox->add (new CFPlus::UI::FancyFrame
1220 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1221 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1222 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1223 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 1224
943 { 1225 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1226 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
945 1227
946 $vbox->add ( 1228 $vbox->add (
947 $HOST_ENTRY = new CFPlus::UI::Entry 1229 $HOST_ENTRY = new CFPlus::UI::Entry
948 expand => 1, 1230 expand => 1,
949 text => $CFG->{profile}{default}{host}, 1231 text => $CFG->{profile}{default}{host},
950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1232 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
951 on_changed => sub { 1233 on_changed => sub {
952 my ($self, $value) = @_; 1234 my ($self, $value) = @_;
953 $CFG->{profile}{default}{host} = $value; 1235 $CFG->{profile}{default}{host} = $value;
954 0 1236 1
955 } 1237 }
956 ); 1238 );
957 1239
958 $vbox->add (new CFPlus::UI::Button 1240 $vbox->add (new CFPlus::UI::Button
959 expand => 1, 1241 expand => 1,
960 text => "Server List", 1242 text => "Server List",
961 other => $METASERVER, 1243 other => $METASERVER,
962 tooltip => "Show a list of available crossfire servers", 1244 tooltip => "Show a list of available crossfire servers",
963 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1245 on_activate => sub { $METASERVER->toggle_visibility; 0 },
964 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1246 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
965 ); 1247 );
966 } 1248 }
967 1249
968 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1250 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
969 $table->add (1, 4, new CFPlus::UI::Entry 1251 $table->add_at (1, 4, new CFPlus::UI::Entry
970 text => $CFG->{profile}{default}{user}, 1252 text => $CFG->{profile}{default}{user},
971 tooltip => "The name of your character on the server", 1253 tooltip => "The name of your character on the server",
972 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1254 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
973 ); 1255 );
974 1256
975 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1257 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
976 $table->add (1, 5, new CFPlus::UI::Entry 1258 $table->add_at (1, 5, new CFPlus::UI::Entry
977 text => $CFG->{profile}{default}{password}, 1259 text => $CFG->{profile}{default}{password},
978 hidden => 1, 1260 hidden => 1,
979 tooltip => "The password for your character", 1261 tooltip => "The password for your character",
980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1262 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
981 ); 1263 );
982 1264
983 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1265 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
984 $table->add (1, 7, new CFPlus::UI::Slider 1266 $table->add_at (1, 7, new CFPlus::UI::Slider
985 force_w => 100, 1267 force_w => 100,
986 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1268 range => [$CFG->{mapsize}, 10, 100, 0, 1],
987 tooltip => "This is the size of the portion of the map update the server sends you. " 1269 tooltip => "This is the size of the portion of the map update the server sends you. "
988 . "If you set this to a high value you will be able to see further, " 1270 . "If you set this to a high value you will be able to see further, "
989 . "but you also increase bandwidth requirements and latency. " 1271 . "but you also increase bandwidth requirements and latency. "
990 . "This option is only used once at log-in.", 1272 . "This option is only used once at log-in.",
991 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1273 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
992 ); 1274 );
993 1275
994 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1276 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
995 $table->add (1, 8, new CFPlus::UI::CheckBox 1277 $table->add_at (1, 8, new CFPlus::UI::Entry
996 state => $CFG->{face_prefetch}, 1278 text => $CFG->{output_rate},
997 tooltip => "<b>Background Image Prefetch</b>\n\n" 1279 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
998 . "If enabled, the client automatically pre-fetches images from the server. " 1280 . "when sending data. When 0 or unset, the server "
999 . "This might increase or create lag, but increases the chances " 1281 . "default will be used, which is usually around 100kb/s. Most servers will "
1000 . "of faces being ready for display when you encounter them. " 1282 . "dynamically find an optimal rate, so adjust this only when necessary.",
1001 . "It also uses up server bandwidth on every connect, "
1002 . "so only set it if you really need to prefetch images. "
1003 . "This option can be set and unset any time.",
1004 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1283 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1005 ); 1284 );
1006 1285
1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1286 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1008 $table->add (1, 9, new CFPlus::UI::Entry 1287 $table->add_at (1, 9, new CFPlus::UI::Entry
1009 text => $CFG->{output_count}, 1288 text => $CFG->{output_count},
1010 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1289 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1011 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1290 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1012 ); 1291 );
1013 1292
1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1293 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1015 $table->add (1, 10, new CFPlus::UI::Entry 1294 $table->add_at (1, 10, new CFPlus::UI::Entry
1016 text => $CFG->{output_sync}, 1295 text => $CFG->{output_sync},
1017 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1296 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1018 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1297 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1019 ); 1298 );
1020 1299
1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1300 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1022 expand => 1, 1301 expand => 1,
1023 align => 0, 1302 align => 0,
1024 text => "Login", 1303 text => "Login",
1025 on_activate => sub { 1304 on_activate => sub {
1026 $CONN ? stop_game 1305 $CONN ? stop_game
1027 : start_game; 1306 : start_game;
1307 1
1308 },
1309 );
1310
1311 $vbox->add (new CFPlus::UI::FancyFrame
1312 label => "Server Info",
1313 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1314 );
1315
1316 $vbox
1317}
1318
1319sub client_setup {
1320 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1321
1322 my $row = 0;
1323
1324 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1325 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1326 state => $CFG->{show_tips},
1327 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1328 on_changed => sub {
1329 my ($self, $value) = @_;
1330 $CFG->{show_tips} = $value;
1331 0
1332 }
1333 );
1334
1335 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1336 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1337 text => $CFG->{logview_max_par},
1338 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1339 . "sends more messages than this number, older messages get removed to save memory and "
1340 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1341 on_changed => sub {
1342 my ($self, $value) = @_;
1343 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1028 0 1344 0
1029 }, 1345 },
1030 ); 1346 );
1031 1347
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1348 $table
1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command},
1035 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1036 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1037 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038 on_changed => sub {
1039 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value;
1041 0
1042 }
1043 );
1044
1045 $vbox->add (new CFPlus::UI::Label
1046 text => "Server Info",
1047 fontsize => 1.2,
1048 padding_y => 8,
1049 fg => [1, 1, 0, 1],
1050 );
1051
1052 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
1053
1054 $vbox
1055}
1056
1057sub message_window {
1058 my $window = new CFPlus::UI::FancyFrame
1059 name => "message_window",
1060 title => "Messages",
1061 border_bg => [1, 1, 1, 1],
1062 x => "max",
1063 y => 0,
1064 force_w => $::WIDTH * 0.4,
1065 force_h => $::HEIGHT * 0.5,
1066 child => (my $vbox = new CFPlus::UI::VBox),
1067 has_close_button => 1;
1068
1069 $vbox->add ($LOGVIEW);
1070
1071 $vbox->add (my $input = new CFPlus::UI::Entry
1072 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1073 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1074 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1075 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1076 on_focus_in => sub {
1077 my ($input, $prev_focus) = @_;
1078
1079 delete $input->{refocus_map};
1080
1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1082 $input->{refocus_map} = 1;
1083 }
1084 delete $input->{auto_activated};
1085
1086 0
1087 },
1088 on_activate => sub {
1089 my ($input, $text) = @_;
1090 $input->set_text ('');
1091
1092 if ($text =~ /^\/(.*)/) {
1093 $::CONN->user_send ($1);
1094 } else {
1095 my $say_cmd = $::CFG->{say_command} || 'say';
1096 $::CONN->user_send ("$say_cmd $text");
1097 }
1098 if ($input->{refocus_map}) {
1099 delete $input->{refocus_map};
1100 $MAPWIDGET->focus_in
1101 }
1102
1103 0
1104 },
1105 on_escape => sub {
1106 $MAPWIDGET->grab_focus;
1107
1108 0
1109 },
1110 );
1111
1112 $CONSOLE = {
1113 window => $window,
1114 input => $input,
1115 };
1116
1117 $window
1118}
1119
1120sub open_string_query {
1121 my $cb = $_[1];
1122 my $dialog = new CFPlus::UI::FancyFrame
1123 x => "center",
1124 y => "center",
1125 z => 50,
1126 force_w => $WIDTH * 4/5,
1127 title => $_[0];
1128
1129 $dialog->add (
1130 my $e = new CFPlus::UI::Entry
1131 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1132 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1133 );
1134
1135 $e->grab_focus;
1136 $dialog->show;
1137}
1138
1139sub open_quit_dialog {
1140 unless ($QUIT_DIALOG) {
1141 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1142 x => "center",
1143 y => "center",
1144 z => 50,
1145 title => "Really Quit?",
1146 on_key_down => sub {
1147 my ($dialog, $ev) = @_;
1148 $ev->{sym} == 27 and $dialog->hide;
1149 }
1150 ;
1151
1152 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1153
1154 $vb->add (new CFPlus::UI::Label
1155 text => "You should find a savebed and apply it first!",
1156 max_w => $WIDTH * 0.25,
1157 ellipsize => 0,
1158 );
1159 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1160 $hb->add (new CFPlus::UI::Button
1161 text => "Ok",
1162 expand => 1,
1163 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1164 );
1165 $hb->add (new CFPlus::UI::Button
1166 text => "Quit anyway",
1167 expand => 1,
1168 on_activate => sub { exit },
1169 );
1170 }
1171
1172 $QUIT_DIALOG->show;
1173 $QUIT_DIALOG->grab_focus;
1174} 1349}
1175 1350
1176sub autopickup_setup { 1351sub autopickup_setup {
1352 my $r = new CFPlus::UI::ScrolledWindow (
1353 expand => 1,
1354 scroll_y => 1
1355 );
1177 my $table = new CFPlus::UI::Table; 1356 $r->add (my $table = new CFPlus::UI::Table
1357 row_expand => [0],
1358 col_expand => [0, 1, 0, 1],
1359 );
1178 1360
1179 for ( 1361 for (
1180 ["General", 0, 0, 1362 ["General", 0, 0,
1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1363 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1182 ["Inhibit autopickup" => PICKUP_INHIBIT], 1364 ["Inhibit autopickup" => PICKUP_INHIBIT],
1196 ["Boots" => PICKUP_BOOTS], 1378 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1379 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1380 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1381 ],
1200 1382
1201 ["Readables", 2, 2, 1383 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1384 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1385 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1386 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1387 ],
1206 ["Misc", 2, 7, 1388 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1389 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1390 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1391 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1392 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1393 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1394 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1395 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1396 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1397 ["Jewelery" => PICKUP_JEWELS],
1398 ["Flesh" => PICKUP_FLESH],
1216 ], 1399 ],
1217 ["Weight/Value ratio", 2, 17] 1400 ["Weight/Value ratio", 2, 17]
1218 ) 1401 )
1219 { 1402 {
1220 my ($title, $x, $y, @bits) = @$_; 1403 my ($title, $x, $y, @bits) = @$_;
1221 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1404 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1222 1405
1223 for (@bits) { 1406 for (@bits) {
1224 ++$y; 1407 ++$y;
1225 1408
1226 my $mask = $_->[1]; 1409 my $mask = $_->[1];
1227 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1410 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1228 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1411 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1229 state => $::CFG->{pickup} & $mask, 1412 state => $::CFG->{pickup} & $mask,
1230 on_changed => sub { 1413 on_changed => sub {
1231 my ($box, $value) = @_; 1414 my ($box, $value) = @_;
1232 1415
1233 if ($value) { 1416 if ($value) {
1244 1427
1245 ${$_->[2]} = $checkbox if $_->[2]; 1428 ${$_->[2]} = $checkbox if $_->[2];
1246 } 1429 }
1247 } 1430 }
1248 1431
1249 $table->add (2, 18, new CFPlus::UI::ValSlider 1432 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1250 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1433 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1251 template => ">= 99", 1434 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1435 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1436 on_changed => sub {
1254 my ($slider, $value) = @_; 1437 my ($slider, $value) = @_;
1257 $::CFG->{pickup} |= int $value 1440 $::CFG->{pickup} |= int $value
1258 if $value; 1441 if $value;
1259 1; 1442 1;
1260 }); 1443 });
1261 1444
1262 $table->add (3, 18, new CFPlus::UI::Button 1445 $table->add_at (3, 18, new CFPlus::UI::Button
1263 text => "set", 1446 text => "set",
1264 on_activate => sub { 1447 on_activate => sub {
1265 $::CONN->send_command ("pickup $::CFG->{pickup}") 1448 $::CONN->send_command ("pickup $::CFG->{pickup}")
1266 if defined $::CONN; 1449 if defined $::CONN;
1267 0 1450 0
1268 }); 1451 });
1269 1452
1270 $table 1453 $r
1271} 1454}
1272 1455
1273my %SORT_ORDER = ( 1456my %SORT_ORDER = (
1274 type => undef, 1457 type => undef,
1275 mtime => sub { sort { 1458 mtime => sub {
1459 my $NOW = time;
1460 sort {
1461 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1462 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1463
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1464 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1465 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1466 or $a->{type} <=> $b->{type}
1467 } @_
1279 } @_ }, 1468 },
1280 weight => sub { sort { 1469 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1470 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1471 or $a->{type} <=> $b->{type}
1283 } @_ }, 1472 } @_ },
1284); 1473);
1309 #TODO# update to weigh/maxweight 1498 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1499 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1500
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1501 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1502 $sw1->add ($INV = new CFPlus::UI::Inventory);
1503 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1504
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1505 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1506
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1507 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1508
1335 $PL_WINDOW->show; 1525 $PL_WINDOW->show;
1336 } 1526 }
1337} 1527}
1338 1528
1339sub player_window { 1529sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1530 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1531 x => "center",
1342 y => "center", 1532 y => "center",
1343 force_w => $WIDTH * 9/10, 1533 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1534 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1535 title => "Player",
1347 has_close_button => 1 1537 has_close_button => 1
1348 ; 1538 ;
1349 1539
1350 my $ntb = 1540 my $ntb =
1351 $PL_NOTEBOOK = 1541 $PL_NOTEBOOK =
1352 new CFPlus::UI::Notebook expand => 1, debug => 1; 1542 new CFPlus::UI::Notebook expand => 1;
1353 1543
1354 $ntb->add ( 1544 $ntb->add_tab (
1355 "Statistics (F2)" => $STATS_PAGE = stats_window, 1545 "Statistics (F2)" => $STATS_PAGE = stats_window,
1356 "Shows statistics, where all your Stats and Resistances are shown." 1546 "Shows statistics, where all your Stats and Resistances are shown."
1357 ); 1547 );
1358 $ntb->add ( 1548 $ntb->add_tab (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1549 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1550 "Shows all your Skills."
1361 ); 1551 );
1362 1552
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1553 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1554 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1555 $ntb->add_tab (
1366 "Spellbook (F4)" => $spellsw, 1556 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1557 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1558 );
1369 $ntb->add ( 1559 $ntb->add_tab (
1370 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1560 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1371 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1561 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1372 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1562 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1373 ); 1563 );
1564 $ntb->add_tab (Pickup => autopickup_setup,
1565 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1374 1566
1375 $ntb->set_current_page ($INVENTORY_PAGE); 1567 $ntb->set_current_page ($INVENTORY_PAGE);
1376 1568
1377 $plwin->add ($ntb); 1569 $plwin->add ($ntb);
1378 $plwin 1570 $plwin
1379} 1571}
1380 1572
1381sub update_bindings {
1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1383}
1384
1385sub keyboard_setup { 1573sub keyboard_setup {
1386 my $binding_list = new CFPlus::UI::VBox; 1574 CFPlus::Macro::keyboard_setup
1387
1388 my $refresh;
1389 $refresh = $BIND_UPD_CB = sub {
1390 $binding_list->clear ();
1391
1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396
1397 my $lbl = join "; ", @$cmds;
1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1400 $hb->add (new CFPlus::UI::Button
1401 text => "delete",
1402 tooltip => "Deletes the binding",
1403 on_activate => sub {
1404 $binding_list->remove ($hb);
1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1406 0
1407 });
1408
1409 $hb->add (new CFPlus::UI::Button
1410 text => "edit",
1411 tooltip => "Edits the binding",
1412 on_activate => sub {
1413 $::BIND_EDITOR->set_binding (
1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1415 sub {
1416 my ($nmod, $nsym, $ncmds) = @_;
1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419 $refresh->();
1420 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1421 $SETUP_DIALOG->show;
1422 },
1423 sub {
1424 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1425 $SETUP_DIALOG->show;
1426 });
1427 $::BIND_EDITOR->show;
1428 $SETUP_DIALOG->hide;
1429 0
1430 });
1431
1432 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1433 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1434 }
1435 }
1436 };
1437
1438 my $vb = new CFPlus::UI::VBox;
1439 $vb->add (my $hb = new CFPlus::UI::HBox);
1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441 $hb->add (new CFPlus::UI::CheckBox
1442 expand => 1,
1443 state => $CFG->{shift_fire_stop},
1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1445 on_changed => sub {
1446 my ($cbox, $value) = @_;
1447 $CFG->{shift_fire_stop} = $value;
1448 0
1449 });
1450
1451 $vb->add ($binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1453
1454 $hb->add (new CFPlus::UI::Button
1455 text => "record new",
1456 expand => 1,
1457 tooltip => "This button opens the binding editor with an empty binding.",
1458 on_activate => sub {
1459 $::BIND_EDITOR->set_binding (undef, undef, [],
1460 sub {
1461 my ($mod, $sym, $cmds) = @_;
1462 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1463 $refresh->();
1464 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1465 $SETUP_DIALOG->show;
1466 },
1467 sub {
1468 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1469 $SETUP_DIALOG->show;
1470 },
1471 );
1472 $SETUP_DIALOG->hide;
1473 $::BIND_EDITOR->show;
1474 0
1475 },
1476 );
1477
1478 $hb->add (new CFPlus::UI::Button
1479 text => "close",
1480 tooltip => "Closes the binding window",
1481 expand => 1,
1482 on_activate => sub {
1483 $SETUP_DIALOG->hide;
1484 0
1485 }
1486 );
1487
1488 $refresh->();
1489
1490 $vb
1491} 1575}
1492 1576
1493sub help_window { 1577sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1578 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1579 x => 'center',
1496 y => 'center', 1580 y => 'center',
1497 z => 2, 1581 z => 4,
1498 name => 'doc_browser', 1582 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1583 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1584 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1585 title => "Help Browser",
1502 has_close_button => 1; 1586 has_close_button => 1;
1503 1587
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1588 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1589
1590 $vbox->add (new CFPlus::UI::FancyFrame
1591 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1592 child => (my $buttons = new CFPlus::UI::HBox),
1593 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1594 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1595 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1596
1510 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1597 my @history;
1511 $buttons->add (my $combo = new CFPlus::UI::Selector 1598 my @future;
1512 value => undef, 1599 my $curnode;
1513 options => [ 1600
1514 [intro => "Introduction"], 1601 my $load_node; $load_node = sub {
1515 [manual => "Main Manual"], 1602 my ($node, $para) = @_;
1516 [skill_help => "Skill Reference"], 1603
1517 [command_help => "Command Reference"], 1604 $buttons->clear;
1518 [dmcommand_help => "DM Commands"], 1605
1519 [COPYING => "License Terms"], 1606 $buttons->add (new CFPlus::UI::Button
1520 ], 1607 text => "⇤",
1608 tooltip => "back to the starting page",
1521 on_changed => sub { 1609 on_activate => sub {
1522 my ($self, $pod) = @_; 1610 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1523 1611 unshift @future, @history;
1524 $viewer->clear; 1612 @history = ();
1525 $viewer->add_paragraph (CFPlus::Pod::section_paragraphs pod => $pod); 1613 $load_node->(@{shift @future});
1526 $viewer->set_offset (0);
1527
1528 0 1614 },
1615 );
1616
1617 if (@history) {
1618 $buttons->add (new CFPlus::UI::Button
1619 text => "⋘",
1620 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1621 on_activate => sub {
1622 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1623 $load_node->(@{pop @history});
1624 },
1625 );
1529 }, 1626 }
1530 on_visibility_change => sub { 1627
1531 my ($self, $visible) = @_; 1628 if (@future) {
1532 return unless $visible; 1629 $buttons->add (new CFPlus::UI::Button
1533 return if $self->{value}; 1630 text => "â‹™",
1534 $self->set_value ("intro"); 1631 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1632 on_activate => sub {
1633 push @history, [$curnode, $viewer->current_paragraph];
1634 $load_node->(@{shift @future});
1635 },
1535 0 1636 );
1536 }, 1637 }
1638
1639 $buttons->add (new CFPlus::UI::Label text => " ");
1640
1641 my @path = CFPlus::Pod::full_path_of $node;
1642 pop @path; # drop current node
1643
1644 for my $node (@path) {
1645 $buttons->add (new CFPlus::UI::Button
1646 text => $node->{kw}[0],
1647 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1648 on_activate => sub {
1649 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1650 $load_node->($node);
1651 },
1652 );
1653 $buttons->add (new CFPlus::UI::Label text => "/");
1654 }
1655
1656 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1657
1658 $curnode = $node;
1659
1660 $viewer->clear;
1661 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1662 $viewer->scroll_to ($para);
1537 ); 1663 };
1664
1665 $load_node->(CFPlus::Pod::find pod => "mainpage");
1666
1667 $CFPlus::Pod::goto_document = sub {
1668 my (@path) = @_;
1669
1670 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1671
1672 $load_node->((CFPlus::Pod::find @path)[0]);
1673 $win->show;
1674 };
1538 1675
1539 $win 1676 $win
1677}
1678
1679sub open_string_query {
1680 my ($title, $cb, $txt, $tooltip) = @_;
1681 my $dialog = new CFPlus::UI::Toplevel
1682 x => "center",
1683 y => "center",
1684 z => 50,
1685 force_w => $WIDTH * 4/5,
1686 title => $title;
1687
1688 $dialog->add (
1689 my $e = new CFPlus::UI::Entry
1690 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1691 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1692 tooltip => $tooltip
1693 );
1694
1695 $e->grab_focus;
1696 $e->set_text ($txt) if $txt;
1697 $dialog->show;
1698}
1699
1700sub open_quit_dialog {
1701 unless ($QUIT_DIALOG) {
1702 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1703 x => "center",
1704 y => "center",
1705 z => 50,
1706 title => "Really Quit?",
1707 on_key_down => sub {
1708 my ($dialog, $ev) = @_;
1709 $ev->{sym} == 27 and $dialog->hide;
1710 }
1711 ;
1712
1713 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1714
1715 $vb->add (new CFPlus::UI::Label
1716 text => "You should find a savebed and apply it first!",
1717 max_w => $WIDTH * 0.25,
1718 ellipsize => 0,
1719 );
1720 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1721 $hb->add (new CFPlus::UI::Button
1722 text => "Ok",
1723 expand => 1,
1724 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1725 );
1726 $hb->add (new CFPlus::UI::Button
1727 text => "Quit anyway",
1728 expand => 1,
1729 on_activate => sub { exit },
1730 );
1731 }
1732
1733 $QUIT_DIALOG->show;
1734 $QUIT_DIALOG->grab_focus;
1735}
1736
1737sub show_tip_of_the_day {
1738 # find all tips
1739 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1740
1741 CFPlus::DB::get state => "tip_of_the_day", sub {
1742 my ($todindex) = @_;
1743 $todindex = 0 if $todindex >= @tod;
1744 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1745
1746 # create dialog
1747 my $dialog;
1748
1749 my $close = sub {
1750 $dialog->destroy;
1751 };
1752
1753 $dialog = new CFPlus::UI::Toplevel
1754 x => "center",
1755 y => "center",
1756 z => 3,
1757 name => 'tip_of_the_day',
1758 force_w => int $WIDTH * 4/9,
1759 force_h => int $WIDTH * 2/9,
1760 title => "Tip of the day #" . (1 + $todindex),
1761 child => my $vbox = new CFPlus::UI::VBox,
1762 has_close_button => 1,
1763 on_delete => $close,
1764 ;
1765
1766 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1767 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1768 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1769
1770 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1771
1772 $table->add_at (0, 0, new CFPlus::UI::Button
1773 text => "Close",
1774 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1775 on_activate => $close,
1776 );
1777
1778 $table->add_at (2, 0, new CFPlus::UI::Button
1779 text => "Next",
1780 tooltip => "Show the next <b>Tip of the day</b>.",
1781 on_activate => sub {
1782 $close->();
1783 &show_tip_of_the_day;
1784 },
1785 );
1786
1787 $dialog->show;
1788 };
1540} 1789}
1541 1790
1542sub sdl_init { 1791sub sdl_init {
1543 CFPlus::SDL_Init 1792 CFPlus::SDL_Init
1544 and die "SDL::Init failed!\n"; 1793 and die "SDL::Init failed!\n";
1545} 1794}
1546 1795
1547sub video_init { 1796sub video_init {
1548 sdl_init;
1549
1550 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1797 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1551 1798
1552 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1799 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1553 1800
1554 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1801 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1555 $FULLSCREEN = $CFG->{fullscreen}; 1802 $FULLSCREEN = $CFG->{fullscreen};
1556 $FAST = $CFG->{fast}; 1803 $FAST = $CFG->{fast};
1557 1804
1558 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1805 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1559 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1806 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1560 1807
1561 $SDL_ACTIVE = 1; 1808 $SDL_ACTIVE = 1;
1562 $LAST_REFRESH = time - 0.01; 1809 $LAST_REFRESH = time - 0.01;
1563 1810
1579 z => 100, 1826 z => 100,
1580 force_x => "max", 1827 force_x => "max",
1581 force_y => 0; 1828 force_y => 0;
1582 $DEBUG_STATUS->show; 1829 $DEBUG_STATUS->show;
1583 1830
1584 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1585
1586 $STATUSBOX = new CFPlus::UI::Statusbox; 1831 $STATUSBOX = new CFPlus::UI::Statusbox;
1587 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1832 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1588 1833
1589 (new CFPlus::UI::Frame 1834 (new CFPlus::UI::Frame
1590 bg => [0, 0, 0, 0.4], 1835 bg => [0, 0, 0, 0.4],
1591 force_x => 0, 1836 force_x => 0,
1592 force_y => "max", 1837 force_y => "max",
1593 child => $STATUSBOX, 1838 child => $STATUSBOX,
1594 )->show; 1839 )->show;
1595 1840
1596 CFPlus::UI::FancyFrame->new ( 1841 CFPlus::UI::Toplevel->new (
1597 title => "Map", 1842 title => "Map",
1598 name => "mapmap", 1843 name => "mapmap",
1599 x => 0, 1844 x => 0,
1600 y => $FONTSIZE + 8, 1845 y => $FONTSIZE + 8,
1601 border_bg => [1, 1, 1, 192/255], 1846 border_bg => [1, 1, 1, 192/255],
1607 1852
1608 $MAPWIDGET = new CFPlus::MapWidget; 1853 $MAPWIDGET = new CFPlus::MapWidget;
1609 $MAPWIDGET->connect (activate_console => sub { 1854 $MAPWIDGET->connect (activate_console => sub {
1610 my ($mapwidget, $preset) = @_; 1855 my ($mapwidget, $preset) = @_;
1611 1856
1612 if ($CONSOLE) { 1857 $MESSAGE_WINDOW->activate_console ($preset)
1613 $CONSOLE->{input}->{auto_activated} = 1; 1858 if $MESSAGE_WINDOW;
1614 $CONSOLE->{input}->grab_focus;
1615
1616 if ($preset && $CONSOLE->{input}->get_text eq '') {
1617 $CONSOLE->{input}->set_text ($preset);
1618 }
1619 }
1620 }); 1859 });
1621 $MAPWIDGET->show; 1860 $MAPWIDGET->show;
1622 $MAPWIDGET->grab_focus; 1861 $MAPWIDGET->grab_focus;
1623 1862
1624 $LOGVIEW = new CFPlus::UI::TextScroller
1625 expand => 1,
1626 font => $FONT_FIXED,
1627 fontsize => $::CFG->{log_fontsize},
1628 indent => -4,
1629 can_hover => 1,
1630 can_events => 1,
1631 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1632 ;
1633
1634 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1863 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1635 title => "Setup", 1864 title => "Setup",
1636 name => "setup_dialog", 1865 name => "setup_dialog",
1637 x => 'center', 1866 x => 'center',
1638 y => 'center', 1867 y => 'center',
1639 z => 2, 1868 z => 2,
1641 force_h => $::HEIGHT * 0.6, 1870 force_h => $::HEIGHT * 0.6,
1642 has_close_button => 1, 1871 has_close_button => 1,
1643 ; 1872 ;
1644 1873
1645 $METASERVER = metaserver_dialog; 1874 $METASERVER = metaserver_dialog;
1875 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1646 1876
1647 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1877 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1648 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1878 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1649 1879
1650 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1880 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1651 "Configure the server to play on, your username, password and other server-related options."); 1881 "Configure the server to play on, your username, password and other server-related options.");
1652 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1882 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1653 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1883 "Configure various client-specific settings.");
1654 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1884 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1655 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1885 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1656 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1886 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1657 "Configure the use of audio, sound effects and background music."); 1887 "Configure the use of audio, sound effects and background music.");
1658 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1888 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1659 "Lets you define, edit and delete key bindings." 1889 "Lets you define, edit and delete key bindings."
1660 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1890 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1661 . "with nothing set and the recording started. After doing the actions you " 1891 . "with nothing set and the recording started. After doing the actions you "
1662 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1892 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1663 . "After pressing the combo the binding will be saved automatically and the " 1893 . "After pressing the combo the binding will be saved automatically and the "
1664 . "binding editor closes"); 1894 . "binding editor closes");
1665 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1895 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1666 "Some debuggin' options. Do not ask."); 1896 "Some debuggin' options. Do not ask.");
1667 1897
1668 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1898 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1669 1899
1670 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1900 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1671 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1901 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1672 1902
1673 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1903 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1674 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1904 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1675 1905
1676 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 1906 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
1677 1907
1678 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1908 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1689 }, 1919 },
1690 ); 1920 );
1691 1921
1692 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1922 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1693 tooltip => "View Documentation"); 1923 tooltip => "View Documentation");
1924
1694 1925
1695 $BUTTONBAR->add (new CFPlus::UI::Button 1926 $BUTTONBAR->add (new CFPlus::UI::Button
1696 text => "Quit", 1927 text => "Quit",
1697 tooltip => "Terminates the program", 1928 tooltip => "Terminates the program",
1698 on_activate => sub { 1929 on_activate => sub {
1716 CFPlus::OpenGL::shutdown; 1947 CFPlus::OpenGL::shutdown;
1717 1948
1718 undef $SDL_ACTIVE; 1949 undef $SDL_ACTIVE;
1719} 1950}
1720 1951
1721my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1722my $bgmusic;#TODO#hack#d#
1723
1724sub audio_channel_finished {
1725 my ($channel) = @_;
1726
1727 #warn "channel $channel finished\n";#d#
1728}
1729
1730sub audio_music_finished {
1731 return unless $CFG->{bgm_enable};
1732
1733 # TODO: hack, do play loop and mood music
1734 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1735 $bgmusic->play (0);
1736
1737 push @bgmusic, shift @bgmusic;
1738}
1739
1740sub audio_init { 1952sub audio_init {
1741 if ($CFG->{audio_enable}) { 1953 if ($CFG->{audio_enable}) {
1742 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1954 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1743 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1955 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1744 1956
1745 unless ($SDL_MIXER) { 1957 unless ($SDL_MIXER) {
1746 status "Unable to open sound device: there will be no sound"; 1958 status "Unable to open sound device: there will be no sound";
1747 return; 1959 return;
1748 }
1749
1750 CFPlus::Mix_AllocateChannels 8;
1751 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1752
1753 audio_music_finished;
1754
1755 while (<$fh>) {
1756 next if /^\s*#/;
1757 next if /^\s*$/;
1758
1759 my ($file, $volume, $event) = split /\s+/, $_, 3;
1760
1761 push @SOUNDS, "$volume,$file";
1762
1763 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1764 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1765 $chunk->volume ($volume * 128 / 100);
1766 $chunk
1767 };
1768 }
1769 } else {
1770 status "unable to open sound config: $!";
1771 } 1960 }
1961
1962 CFPlus::Mix_AllocateChannels 16;
1963
1964 audio_music_finished;
1965 } else {
1966 undef $SDL_MIXER;
1772 } 1967 }
1773} 1968}
1774 1969
1775sub audio_shutdown { 1970sub audio_shutdown {
1776 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1971 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1777 undef $SDL_MIXER; 1972 undef $SDL_MIXER;
1778 @SOUNDS = (); 1973 @SOUNDS = ();
1779 %AUDIO_CHUNKS = (); 1974 %AUDIO_CHUNK = ();
1780} 1975}
1781 1976
1782my %animate_object; 1977my %animate_object;
1783my $animate_timer; 1978my $animate_timer;
1784 1979
1785my $fps = 9; 1980my $fps = 9;
1786
1787my %demo;#d#
1788 1981
1789sub force_refresh { 1982sub force_refresh {
1790 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1983 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1791 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1984 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1792 1985
1793 $CFPlus::UI::ROOT->draw; 1986 $CFPlus::UI::ROOT->draw;
1794 1987
1795 $WANT_REFRESH = 0; 1988 $WANT_REFRESH = 0;
1796 $CAN_REFRESH = 0; 1989 $CAN_REFRESH = 0;
1797 $LAST_REFRESH = $NOW; 1990 $LAST_REFRESH = $NOW;
1798 1991
1799 CFPlus::SDL_GL_SwapBuffers; 1992 CFPlus::SDL_GL_SwapBuffers;
1800} 1993}
1801 1994
1802my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1995my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1803 $NOW = time; 1996 $NOW = time;
1804 1997
1805 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1998 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1806 for CFPlus::SDL_PollEvent; 1999 for CFPlus::poll_events;
1807 2000
1808 if (%animate_object) { 2001 if (%animate_object) {
1809 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2002 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1810 $WANT_REFRESH++; 2003 ++$WANT_REFRESH;
1811 } 2004 }
1812 2005
1813 if ($WANT_REFRESH) { 2006 if ($WANT_REFRESH) {
1814 force_refresh; 2007 force_refresh;
1815 } else { 2008 } else {
1825sub animation_stop { 2018sub animation_stop {
1826 my ($widget) = @_; 2019 my ($widget) = @_;
1827 delete $animate_object{$widget}; 2020 delete $animate_object{$widget};
1828} 2021}
1829 2022
1830# check once/second for faces that need to be prefetched
1831# this should, of course, only run on demand, but
1832# SDL forces worse things on us....
1833
1834Event->timer (after => 1, interval => 0.25, cb => sub {
1835 $CONN->face_prefetch
1836 if $CONN;
1837});
1838
1839%SDL_CB = ( 2023%SDL_CB = (
1840 CFPlus::SDL_QUIT => sub { 2024 CFPlus::SDL_QUIT => sub {
1841 Event::unloop -1; 2025 exit;
1842 }, 2026 },
1843 CFPlus::SDL_VIDEORESIZE => sub { 2027 CFPlus::SDL_VIDEORESIZE => sub {
1844 }, 2028 },
1845 CFPlus::SDL_VIDEOEXPOSE => sub { 2029 CFPlus::SDL_VIDEOEXPOSE => sub {
1846 CFPlus::UI::full_refresh; 2030 CFPlus::UI::full_refresh;
1847 }, 2031 },
1848 CFPlus::SDL_ACTIVEEVENT => sub { 2032 CFPlus::SDL_ACTIVEEVENT => sub {
1849# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2033# not useful, as APPACTIVE include sonly iconified state, not unmapped
2034# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2035# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2036# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2037# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2038# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1850 }, 2039 },
1851 CFPlus::SDL_KEYDOWN => sub { 2040 CFPlus::SDL_KEYDOWN => sub {
1852 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2041 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1853 # alt-enter 2042 # alt-enter
1854 $FULLSCREEN_ENABLE->toggle; 2043 $FULLSCREEN_ENABLE->toggle;
1875 2064
1876$SIG{INT} = $SIG{TERM} = sub { exit }; 2065$SIG{INT} = $SIG{TERM} = sub { exit };
1877 2066
1878{ 2067{
1879 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2068 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2069 CFPlus::DB::Server::run;
2070
1880 CFPlus::UI::set_layout ($::CFG->{layout}); 2071 CFPlus::UI::set_layout ($::CFG->{layout});
1881 2072
1882 my %DEF_CFG = ( 2073 my %DEF_CFG = (
1883 sdl_mode => 0, 2074 sdl_mode => 0,
1884 width => 640,
1885 height => 480,
1886 fullscreen => 0, 2075 fullscreen => 0,
1887 fast => 0, 2076 fast => 0,
1888 map_scale => 1, 2077 map_scale => 1,
1889 fow_enable => 1, 2078 fow_enable => 1,
1890 fow_intensity => 0.45, 2079 fow_intensity => 0,
1891 fow_smooth => 0, 2080 map_smoothing => 1,
1892 gui_fontsize => 1, 2081 gui_fontsize => 1,
1893 log_fontsize => 0.7, 2082 log_fontsize => 0.7,
1894 gauge_fontsize => 1, 2083 gauge_fontsize => 1,
1895 gauge_size => 0.35, 2084 gauge_size => 0.35,
1896 stat_fontsize => 0.7, 2085 stat_fontsize => 0.7,
1897 mapsize => 100, 2086 mapsize => 100,
1898 say_command => 'say',
1899 audio_enable => 1, 2087 audio_enable => 1,
1900 bgm_enable => 1, 2088 bgm_enable => 1,
1901 bgm_volume => 0.25, 2089 bgm_volume => 0.25,
1902 face_prefetch => 0,
1903 output_sync => 1, 2090 output_sync => 1,
1904 output_count => 1, 2091 output_count => 1,
2092 output_rate => "",
1905 pickup => 0, 2093 pickup => 0,
1906 inv_sort => "mtime", 2094 inv_sort => "mtime",
1907 default => "profile", # default profile 2095 default => "profile", # default profile
2096 show_tips => 1,
2097 logview_max_par => 1000,
1908 ); 2098 );
1909 2099
1910 while (my ($k, $v) = each %DEF_CFG) { 2100 while (my ($k, $v) = each %DEF_CFG) {
1911 $CFG->{$k} = $v unless exists $CFG->{$k}; 2101 $CFG->{$k} = $v unless exists $CFG->{$k};
1912 } 2102 }
1913 2103
1914 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2104 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2105 $PROFILE = $CFG->{profile}{default};
2106
2107 # convert old bindings (only default profile matters)
2108 if (my $bindings = delete $PROFILE->{bindings}) {
2109 while (my ($mod, $syms) = each %$bindings) {
2110 while (my ($sym, $cmds) = each %$syms) {
2111 push @{ $PROFILE->{macro} }, {
2112 accelkey => [$mod*1, $sym*1],
2113 action => $cmds,
2114 };
2115 }
2116 }
2117 }
1915 2118
1916 sdl_init; 2119 sdl_init;
1917 2120
1918 @SDL_MODES = reverse 2121 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1919 grep $_->[0] >= 640 && $_->[1] >= 480, 2122 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1920 CFPlus::SDL_ListModes;
1921
1922 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2123 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2124
2125 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1923 2126
1924 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2127 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1925 2128
1926 { 2129 {
1927 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2130 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1956# } 2159# }
1957# my $t2 = Time::HiRes::time; 2160# my $t2 = Time::HiRes::time;
1958# warn $t2-$t1; 2161# warn $t2-$t1;
1959# } 2162# }
1960 2163
2164 $startup_done->();
2165
1961 video_init; 2166 video_init;
1962 audio_init; 2167 audio_init;
1963} 2168}
2169
2170show_tip_of_the_day if $CFG->{show_tips};
1964 2171
1965Event::loop; 2172Event::loop;
1966#CFPlus::SDL_Quit; 2173#CFPlus::SDL_Quit;
1967#CFPlus::_exit 0; 2174#CFPlus::_exit 0;
1968 2175
2176END {
1969END { CFPlus::SDL_Quit } 2177 CFPlus::SDL_Quit;
2178 CFPlus::DB::Server::stop;
2179}
1970 2180
1971=head1 NAME 2181=head1 NAME
1972 2182
1973cfplus - A Crossfire+ and Crossfire game client 2183cfplus - A Crossfire+ and Crossfire game client
1974 2184

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines