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.82 by elmex, Wed Jun 28 10:37:19 2006 UTC vs.
Revision 1.225 by root, Fri Aug 31 08:03:10 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines