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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.205 by root, Thu Aug 9 03:40:02 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines