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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines