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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines