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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.225 by root, Fri Aug 31 08:03:10 2007 UTC

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

Diff Legend

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