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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.118 by root, Tue Aug 22 06:37:30 2006 UTC vs.
Revision 1.203 by root, Mon Aug 6 02:11:45 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines