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.66 by elmex, Thu Jun 8 19:43:26 2006 UTC vs.
Revision 1.223 by root, Tue Aug 28 01:23:47 2007 UTC

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

Diff Legend

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