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.135 by elmex, Tue Dec 5 16:53:29 2006 UTC vs.
Revision 1.227 by root, Sun Sep 2 09:48:42 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines