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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines