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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines