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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines