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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines