ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.231 by elmex, Sun Oct 14 10:33:50 2007 UTC

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

Diff Legend

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