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.223 by root, Tue Aug 28 01:23:47 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines