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

Diff Legend

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