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.126 by root, Sat Nov 18 18:19:05 2006 UTC vs.
Revision 1.227 by root, Sun Sep 2 09:48:42 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines