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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines