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.93 by root, Sat Jul 15 01:19:55 2006 UTC vs.
Revision 1.210 by root, Sun Aug 12 01:49:09 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines