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

Diff Legend

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