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.72 by elmex, Tue Jun 13 18:14:03 2006 UTC vs.
Revision 1.223 by root, Tue Aug 28 01:23:47 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines