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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines