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.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.224 by root, Thu Aug 30 07:57:59 2007 UTC

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

Diff Legend

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