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.39 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.182 by elmex, Sat Jul 21 20:30:41 2007 UTC

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

Diff Legend

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