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

Diff Legend

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