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.24 by elmex, Mon May 29 19:30:28 2006 UTC vs.
Revision 1.170 by root, Sun Jul 15 21:15:14 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
… …
81our $LOGVIEW; 130our $LOGVIEW;
82our $CONSOLE; 131our $CONSOLE;
83our $METASERVER; 132our $METASERVER;
84our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 134our $QUIT_DIALOG;
86our $SERVER_SETUP; 135our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE;
137our $PICKUP_ENABLE;
138our $SERVER_INFO;
87 139
140our $SETUP_DIALOG;
141our $SETUP_NOTEBOOK;
142our $SETUP_SERVER;
143our $SETUP_KEYBOARD;
144
145our $PL_NOTEBOOK;
146our $PL_WINDOW;
147
148our $INVENTORY_PAGE;
149our $STATS_PAGE;
150our $SKILL_PAGE;
151our $SPELL_PAGE;
152our $SPELL_LIST;
153
154our $HELP_WINDOW;
155our $MESSAGE_WINDOW;
88our $FLOORBOX; 156our $FLOORBOX;
89our $GAUGES; 157our $GAUGES;
90our $STATWIDS; 158our $STATWIDS;
91 159
92our $SDL_ACTIVE; 160our $SDL_ACTIVE;
93our %SDL_CB; 161our %SDL_CB;
94 162
95our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
96our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
97our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
98 172
99our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
100our $STATUSBOX; 174our $STATUSBOX;
101our $DEBUG_STATUS; 175our $DEBUG_STATUS;
102 176
103our $INV_WINDOW;
104our $INV; 177our $INV;
105our $INVR; 178our $INVR;
106our $INVR_LBL; 179our $INV_RIGHT_HB;
107 180
108our $BIND_WINDOW; 181our $PICKUP_CFG;
182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
109 185
110sub status { 186sub status {
111 $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]);
112} 188}
113 189
114sub debug { 190sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 191 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request; 192}
117 $DEBUG_STATUS->move ($WIDTH - $w, 0); 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;
118} 442}
119 443
120sub start_game { 444sub start_game {
121 status "logging in..."; 445 status "logging in...";
122 446
123 $LOGIN_BUTTON->set_text ("Logout"); 447 $LOGIN_BUTTON->set_text ("Logout");
124 $SERVER_SETUP->hide; 448 $SETUP_DIALOG->hide;
125 449
126 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;
127 451
128 my ($host, $port) = split /:/, $CFG->{host}; 452 my ($host, $port) = split /:/, $PROFILE->{host};
129 453
130 $MAP = new CFClient::Map $mapsize, $mapsize; 454 $MAP = new CFPlus::Map;
131 455
132 $CONN = eval { 456 $CONN = eval {
133 new CFClient::Protocol 457 new CFPlus::Protocol
134 host => $host, 458 host => $host,
135 port => $port || 13327, 459 port => $port || 13327,
136 user => $CFG->{user}, 460 user => $PROFILE->{user},
137 pass => $CFG->{password}, 461 pass => $PROFILE->{password},
138 mapw => $mapsize, 462 mapw => $mapsize,
139 maph => $mapsize, 463 maph => $mapsize,
464
465 client => "cfplus $CFPlus::VERSION $] $^O",
140 466
141 map_widget => $MAPWIDGET, 467 map_widget => $MAPWIDGET,
142 logview => $LOGVIEW, 468 logview => $LOGVIEW,
143 statusbox => $STATUSBOX, 469 statusbox => $STATUSBOX,
144 map => $MAP, 470 map => $MAP,
145 mapmap => $MAPMAP, 471 mapmap => $MAPMAP,
472 query => \&server_query,
473
474 setup_req => {
475 smoothing => $CFG->{map_smoothing}*1,
476 },
146 477
147 sound_play => sub { 478 sound_play => sub {
148 my ($x, $y, $soundnum, $type) = @_; 479 my ($x, $y, $soundnum, $type) = @_;
149 480
150 $SDL_MIXER 481 $SDL_MIXER
… …
156 $chunk->play; 487 $chunk->play;
157 }, 488 },
158 }; 489 };
159 490
160 if ($CONN) { 491 if ($CONN) {
161 CFClient::lowdelay fileno $CONN->{fh}; 492 CFPlus::lowdelay fileno $CONN->{fh};
162 493
163 status "login successful"; 494 status "login successful";
164 } else { 495 } else {
165 status "unable to connect"; 496 status "unable to connect";
166 stop_game(); 497 stop_game();
167 } 498 }
168} 499}
169 500
170sub stop_game { 501sub stop_game {
171 $LOGIN_BUTTON->set_text ("Login"); 502 $LOGIN_BUTTON->set_text ("Login");
172 $SERVER_SETUP->show; 503 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
504 $SETUP_DIALOG->show;
173 $INV_WINDOW->hide; 505 $PL_WINDOW->hide;
174 $LOGVIEW->hide; 506 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508
509 &audio_music_set ([]);
175 510
176 return unless $CONN; 511 return unless $CONN;
177 512
178 status "connection closed"; 513 status "connection closed";
179 514
515 destroy_query_dialog $CONN;
180 $CONN->destroy; 516 $CONN->destroy;
181 $CONN = 0; # false, does not autovivify 517 $CONN = 0; # false, does not autovivify
182}
183 518
184sub client_setup { 519 undef $MAP;
185 my $dialog = new CFClient::UI::FancyFrame 520}
186 req_x => 1, 521
187 req_y => $HEIGHT * (1/8), 522sub graphics_setup {
188 name => "client_setup", 523 my $vbox = new CFPlus::UI::VBox;
189 title => "Client Setup", 524
190 child => (my $vbox = new CFClient::UI::VBox);
191 $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]);
192 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
193 $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");
194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 535 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
195 536
196 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, 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]);
197 $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");
198 539
199 $mode_slider->connect (changed => sub { 540 $mode_slider->connect (changed => sub {
200 my ($self, $value) = @_; 541 my ($self, $value) = @_;
201 542
202 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 543 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
203 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 544 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
204 }); 545 });
205 $mode_slider->emit (changed => $mode_slider->{range}[0]); 546 $mode_slider->emit (changed => $mode_slider->{range}[0]);
206 547
207 my $row = 1;
208
209 $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");
210 $table->add (1, $row++, new CFClient::UI::CheckBox 549 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
211 state => $CFG->{fullscreen}, 550 state => $CFG->{fullscreen},
212 tooltip => "Bring the client into fullscreen mode.", 551 tooltip => "Bring the client into fullscreen mode.",
213 on_changed => sub { 552 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
214 my ($self, $value) = @_;
215 $CFG->{fullscreen} = $value;
216 }
217 ); 553 );
218 554
219 $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");
220 $table->add (1, $row++, new CFClient::UI::CheckBox 556 $table->add (1, $row++, new CFPlus::UI::CheckBox
221 state => $CFG->{fast}, 557 state => $CFG->{fast},
222 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.",
223 on_changed => sub { 572 on_activate => sub {
224 my ($self, $value) = @_; 573 video_shutdown ();
225 $CFG->{fast} = $value; 574 video_init ();
575 0
226 } 576 }
227 ); 577 );
228 578
229 $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");
230 $table->add (1, $row++, new CFClient::UI::Slider 580 $table->add (1, $row++, new CFPlus::UI::Slider
231 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 581 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
232 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 582 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
233 on_changed => sub { 583 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
234 my ($self, $value) = @_;
235 $CFG->{map_scale} = 2 ** $value;
236 }
237 ); 584 );
238 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
239 $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");
240 $table->add (1, $row++, new CFClient::UI::CheckBox 596 $table->add (1, $row++, new CFPlus::UI::CheckBox
241 state => $CFG->{fow_enable}, 597 state => $CFG->{fow_enable},
242 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.",
243 on_changed => sub { 599 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
244 my ($self, $value) = @_;
245 $CFG->{fow_enable} = $value;
246 }
247 ); 600 );
248 601
249 $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");
250 $table->add (1, $row++, new CFClient::UI::Slider 603 $table->add (1, $row++, new CFPlus::UI::Slider
251 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 604 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
252 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.",
253 on_changed => sub { 606 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
254 my ($self, $value) = @_;
255 $CFG->{fow_intensity} = $value;
256 }
257 ); 607 );
258 608
259 $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");
260 $table->add (1, $row++, new CFClient::UI::CheckBox 610 $table->add (1, $row++, new CFPlus::UI::CheckBox
261 state => $CFG->{fow_smooth}, 611 state => $CFG->{fow_smooth},
262 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.",
263 on_changed => sub { 613 on_changed => sub {
264 my ($self, $value) = @_; 614 my ($self, $value) = @_;
265 $CFG->{fow_smooth} = $value; 615 $CFG->{fow_smooth} = $value;
266 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
267 } 618 }
268 ); 619 );
269 620
270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
271 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
273 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
274 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
275 );
276
277 $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");
278 $table->add (1, $row++, new CFClient::UI::Slider 622 $table->add (1, $row++, new CFPlus::UI::Slider
279 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
280 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.",
281 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 625 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
282 ); 626 );
283 627
284 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
285
286 $table->add (1, $row++, new CFClient::UI::Slider
287 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
288 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
289 on_changed => sub {
290 $CFG->{stat_fontsize} = $_[1];
291 &set_stats_window_fontsize;
292 }
293 );
294
295 $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");
296 $table->add (1, $row++, new CFClient::UI::Slider 629 $table->add (1, $row++, new CFPlus::UI::Slider
297 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 630 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
298 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.",
299 on_changed => sub { 632 on_changed => sub {
300 $CFG->{gauge_fontsize} = $_[1]; 633 $CFG->{gauge_fontsize} = $_[1];
301 &set_gauge_window_fontsize; 634 &set_gauge_window_fontsize;
635 0
302 } 636 }
303 ); 637 );
304 638
305 $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");
306 $table->add (1, $row++, new CFClient::UI::Slider 640 $table->add (1, $row++, new CFPlus::UI::Slider
307 range => [$CFG->{gauge_size}, 0.2, 0.8], 641 range => [$CFG->{gauge_size}, 0.2, 0.8],
308 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.",
309 on_changed => sub { 643 on_changed => sub {
310 $CFG->{gauge_size} = $_[1]; 644 $CFG->{gauge_size} = $_[1];
311 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 645 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
646 0
312 } 647 }
313 ); 648 );
314 649
315 $table->add (1, $row++, new CFClient::UI::Button 650 $vbox
316 expand => 1, align => 0, text => "Apply", 651}
317 tooltip => "Apply the video settings",
318 on_activate => sub {
319 video_shutdown ();
320 video_init ();
321 }
322 );
323 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
324 $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");
325 $table->add (1, $row++, new CFClient::UI::CheckBox 661 $table->add (1, $row++, new CFPlus::UI::CheckBox
326 state => $CFG->{audio_enable}, 662 state => $CFG->{audio_enable},
327 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.",
328 on_changed => sub { 664 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
329 $CFG->{audio_enable} = $_[1];
330 }
331 ); 665 );
332# $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");
333# $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 {
334# $CFG->{effects_volume} = $_[1]; 668# $CFG->{effects_volume} = $_[1];
335# }); 669# });
336 $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");
337 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 671 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
338 $hbox->add (new CFClient::UI::CheckBox 672 $hbox->add (new CFPlus::UI::CheckBox
339 expand => 1, state => $CFG->{bgm_enable}, 673 expand => 1, state => $CFG->{bgm_enable},
340 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.",
341 on_changed => sub { 675 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
342 $CFG->{bgm_enable} = $_[1];
343 }
344 ); 676 );
345 $hbox->add (new CFClient::UI::Slider 677 $hbox->add (new CFPlus::UI::Slider
346 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 678 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
347 tooltip => "The volume of the background music. Changes are instant.", 679 tooltip => "The volume of the background music. Changes are instant.",
348 on_changed => sub { 680 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
349 $CFG->{bgm_volume} = $_[1];
350 CFClient::MixMusic::volume $_[1] * 128;
351 }
352 ); 681 );
353 682
354 $table->add (1, $row++, new CFClient::UI::Button 683 $table->add (1, $row++, new CFPlus::UI::Button
355 expand => 1, align => 0, text => "Apply", 684 expand => 1, align => 0, text => "Apply",
356 tooltip => "Apply the audio settings", 685 tooltip => "Apply the audio settings",
357 on_activate => sub { 686 on_activate => sub {
358 audio_shutdown (); 687 audio_shutdown ();
359 audio_init (); 688 audio_init ();
689 0
360 } 690 }
361 ); 691 );
362 692
363 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 693 $vbox
364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
365 text => $CFG->{say_command},
366 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. "
367 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
368 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
369 on_changed => sub {
370 my ($self, $value) = @_;
371 $CFG->{say_command} = $value;
372 }
373 );
374
375 $dialog
376}
377
378sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize});
381 }
382} 694}
383 695
384sub set_gauge_window_fontsize { 696sub set_gauge_window_fontsize {
385 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 697 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
386 $_->set_fontsize ($::CFG->{gauge_fontsize}); 698 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
388} 700}
389 701
390sub make_gauge_window { 702sub make_gauge_window {
391 my $gh = int $HEIGHT * $CFG->{gauge_size}; 703 my $gh = int $HEIGHT * $CFG->{gauge_size};
392 704
393 my $win = new CFClient::UI::Frame ( 705 my $win = new CFPlus::UI::Frame (
394 req_x => 0, 706 force_x => 0,
395 req_y => -1, 707 force_y => "max",
396 def_w => $WIDTH, 708 force_w => $WIDTH,
397 def_h => $gh, 709 force_h => $gh,
398 ); 710 );
399 711
400 $win->add (my $hbox = new CFClient::UI::HBox 712 $win->add (my $hbox = new CFPlus::UI::HBox
401 children => [ 713 children => [
402 (new CFClient::UI::HBox expand => 1), 714 (new CFPlus::UI::HBox expand => 1),
403 (new CFClient::UI::VBox children => [ 715 (new CFPlus::UI::VBox children => [
404 (new CFClient::UI::Empty expand => 1), 716 (new CFPlus::UI::Empty expand => 1),
405 (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)),
406 ]), 718 ]),
407 (my $vbox = new CFClient::UI::VBox), 719 (my $vbox = new CFPlus::UI::VBox),
408 ], 720 ],
409 ); 721 );
410 722
411 $vbox->add (new CFClient::UI::HBox 723 $vbox->add (new CFPlus::UI::HBox
412 expand => 1, 724 expand => 1,
413 children => [ 725 children => [
414 (new CFClient::UI::Empty expand => 1), 726 (new CFPlus::UI::Empty expand => 1),
415 (my $hb = new CFClient::UI::HBox), 727 (my $hb = new CFPlus::UI::HBox),
416 ], 728 ],
417 ); 729 );
418 730
419 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 731 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
420 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.");
421 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 732 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
422 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.");
423 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 733 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
424 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.");
425 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 734 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
426 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.");
427 735
428 $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");
429 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.");
430 $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");
431 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
432 738
433 $GAUGES = { 739 $GAUGES = {
434 exp => $exp, win => $win, range => $rng, 740 exp => $exp, win => $win, range => $rng,
435 food => $fg, mana => $mg, hp => $hg, grace => $gg 741 food => $fg, mana => $mg, hp => $hg, grace => $gg
436 }; 742 };
… …
438 &set_gauge_window_fontsize; 744 &set_gauge_window_fontsize;
439 745
440 $win 746 $win
441} 747}
442 748
749sub debug_setup {
750 my $table = new CFPlus::UI::Table;
443 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
444sub make_stats_window { 779sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 780 my $r = new CFPlus::UI::ScrolledWindow (
446 req_y => $HEIGHT * (2/8),
447 req_x => -1, 781 expand => 1,
448 title => "Stats", 782 scroll_y => 1
449 name => "stats_window"; 783 );
784 $r->add (my $vb = new CFPlus::UI::VBox);
450 785
451 $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
452 $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,
453 can_hover => 1, can_events => 1, 792 can_hover => 1, can_events => 1,
454 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.");
455 $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,
456 can_hover => 1, can_events => 1, 795 can_hover => 1, can_events => 1,
457 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).");
458 797
459 $vb->add (my $hb0 = new CFClient::UI::HBox); 798 $pi->add (my $hb0 = new CFPlus::UI::HBox);
460 $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,
461 can_hover => 1, can_events => 1, 800 can_hover => 1, can_events => 1,
462 tooltip => "The weight of the player including all inventory items."); 801 tooltip => "The weight of the player including all inventory items.");
463 $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,
464 can_hover => 1, can_events => 1, 803 can_hover => 1, can_events => 1,
465 tooltip => "The weight limit: you cannot carry more than this."); 804 tooltip => "The weight limit: you cannot carry more than this.");
466 805
467 806 $vb->add (new CFPlus::UI::FancyFrame
807 label => "Primary/Secondary Statistics",
468 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 808 child => (my $hb = new CFPlus::UI::HBox expand => 1),
809 );
469 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 810 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
470 811
471 my $color2 = [1, 1, 0]; 812 my $color2 = [1, 1, 0];
472 813
473 for ( 814 for (
474 [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],
475 [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],
476 [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],
477 [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],
478 [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],
479 [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],
480 [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],
481 822
482 [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],
483 [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],
484 [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],
485 [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],
486 [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],
487 [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],
488 ) { 829 ) {
489 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 830 my ($col, $row, $id, $label, $template) = @$_;
490 831
491 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 832 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
492 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");
493 $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
494 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");
495 } 838 }
496 839
840 $vb->add (new CFPlus::UI::FancyFrame
841 label => "Resistancies",
497 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 842 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
843 );
498 844
499 my $row = 0; 845 my $row = 0;
500 my $col = 0; 846 my $col = 0;
501 847
502 my %resist_names = ( 848 my %resist_names = (
849 slow => ["Slow",
503 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",
504 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",
505 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",
506 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",
507 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",
508 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",
509 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",
510 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",
511 pois => "<b>Poison</b> (resistance to getting poisoned)", 866 "<b>Poison</b> (resistance to getting poisoned)"],
867 para => ["Paralysation",
512 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",
513 deat => "<b>Death</b> (resistance against death spells)", 870 "<b>Death</b> (resistance against death spells)"],
514 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",
515 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",
516 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",
517 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",
518 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",
519 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",
520 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)"],
521 ); 885 );
522 for (qw/slow holyw conf fire depl magic 886 for (qw/slow holyw conf fire depl magic
523 drain acid pois para deat phys 887 drain acid pois para deat phys
524 blind fear tund elec cold ghit/) 888 blind fear tund elec cold ghit/)
525 { 889 {
526 $tbl2->add ($col, $row, 890 $tbl2->add ($col, $row,
527 $STATWIDS->{"res_$_"} = 891 $STATWIDS->{"res_$_"} =
528 new CFClient::UI::Label 892 new CFPlus::UI::Label
529 font => $FONT_FIXED, 893 font => $FONT_FIXED,
530 template => "-100%", 894 template => "-100%",
531 align => +1, 895 align => +1,
532 valign => 0, 896 valign => 0,
533 can_events => 1, 897 can_events => 1,
534 can_hover => 1, 898 can_hover => 1,
535 tooltip => $resist_names{$_}, 899 tooltip => $resist_names{$_}->[1],
536 ); 900 );
537 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 901 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
538 font => $FONT_FIXED, 902 font => $FONT_FIXED,
539 can_hover => 1, 903 can_hover => 1,
540 can_events => 1, 904 can_events => 1,
541 image => "ui/resist/resist_$_.png", 905 path => "ui/resist/resist_$_.png",
542 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],
543 ); 914 );
544 915
545 $row++; 916 $row++;
546 if ($row % 6 == 0) { 917 if ($row % 6 == 0) {
547 $col += 2; 918 $col += 3;
548 $row = 0; 919 $row = 0;
549 } 920 }
550 } 921 }
551 922
552 &set_stats_window_fontsize;
553 update_stats_window ({}); 923 #update_stats_window ({});
554 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]);
555 $tgw 931 $sw
556} 932}
557 933
558sub formsep { 934sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 935 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560}
561
562sub update_stats_window {
563 my ($stats) = @_;
564
565 # I love text protocols...
566
567 my $hp = $stats->{+CS_STAT_HP} * 1;
568 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
569 my $sp = $stats->{+CS_STAT_SP} * 1;
570 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
571 my $fo = $stats->{+CS_STAT_FOOD} * 1;
572 my $fo_m = 999;
573 my $gr = $stats->{+CS_STAT_GRACE} * 1;
574 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
575
576 $GAUGES->{hp} ->set_value ($hp, $hp_m);
577 $GAUGES->{mana} ->set_value ($sp, $sp_m);
578 $GAUGES->{food} ->set_value ($fo, $fo_m);
579 $GAUGES->{grace} ->set_value ($gr, $gr_m);
580 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
581 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
582 my $rng = $stats->{+CS_STAT_RANGE};
583 $rng =~ s/^Range: //; # thank you so much dear server
584 $GAUGES->{range} ->set_text ("Rng: " . $rng);
585 my $title = $stats->{+CS_STAT_TITLE};
586 $title =~ s/^Player: //;
587 $STATWIDS->{title} ->set_text ("Title: " . $title);
588
589 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
590 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
591 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
592 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
593 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
594 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
595 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
596 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
597 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
598 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
599 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
600 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
601 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
602
603 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
604
605 # TODO: replace by CS_STAT_RES_xxx constants
606 my %tbl = (
607 phys => 100,
608 magic => 101,
609 fire => 102,
610 elec => 103,
611 cold => 104,
612 conf => 105,
613 acid => 106,
614 drain => 107,
615 ghit => 108,
616 pois => 109,
617 slow => 110,
618 para => 111,
619 tund => 112,
620 fear => 113,
621 depl => 113,
622 deat => 115,
623 holyw => 116,
624 blind => 117,
625 );
626
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl;
629}
630
631sub metaserver_dialog {
632 my $dialog = new CFClient::UI::FancyFrame
633 title => "Server List",
634 child => (my $vbox = new CFClient::UI::VBox);
635
636 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638 $dialog
639} 936}
640 937
641my $METASERVER_ATIME; 938my $METASERVER_ATIME;
642 939
643sub update_metaserver { 940sub update_metaserver {
644 my ($HOST) = @_; 941 my ($metaserver_dialog) = @_;
942
943 $METASERVER = $metaserver_dialog
944 if defined $metaserver_dialog;
645 945
646 return if $METASERVER_ATIME > time; 946 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 947 $METASERVER_ATIME = time + 60;
648 948
649 my $table = $METASERVER->{table}; 949 my $table = $METASERVER->{table};
650 $table->clear; 950 $table->clear;
651 $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...");
652 952
653 my $buf; 953 my $ok = 0;
654 954
655 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 955 CFPlus::background {
956 my $ua = CFPlus::lwp_useragent;
656 957
657 unless ($fh) { 958 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
658 $label->set_text ("unable to contact metaserver: $!"); 959 } sub {
659 return; 960 my ($msg) = @_;
660 } 961 if ($msg) {
661
662 Event->io (fd => $fh, poll => 'r', cb => sub {
663 my $res = sysread $fh, $buf, 8192, length $buf;
664
665 if (!defined $res) {
666 $_[0]->w->cancel;
667 $label->set_text ("error while retrieving server list: $!");
668 } elsif ($res == 0) {
669 $_[0]->w->cancel;
670 status "server list retrieved";
671
672 utf8::decode $buf if utf8::valid $buf;
673
674 $table->clear; 962 $table->clear;
675 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 );
676 my @col = qw(Use #Users Host Uptime Version Description); 971 my @col = qw(#Users Host Uptime Version Description);
677 $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[$_])
678 for 0 .. $#col; 976 for 0 .. $#col;
679 977
680 my @align = qw(1 0 1 1 -1); 978 my @align = qw(1 0 1 1 -1);
681 979
682 my $y = 0; 980 my $y = 0;
683 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 981 for my $m (@{ $msg->{servers} }) {
684 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)};
685 984
686 for ($desc) { 985 for ($desc) {
687 s/<br>/\n/gi; 986 s/<br>/\n/gi;
688 s/<li>/\n· /gi; 987 s/<li>/\n· /gi;
689 s/<.*?>//sgi; 988 s/<.*?>//sgi;
690 s/&/&amp;/g; 989 s/&amp;/&/g;
691 s/</&lt;/g; 990 s/&lt;/</g;
692 s/>/&gt;/g; 991 s/&gt;/>/g;
693 } 992 }
694 993
695 $uptime = sprintf "%dd %02d:%02d:%02d", 994 $uptime = sprintf "%dd %02d:%02d:%02d",
696 (int $m->[8] / 86400), 995 (int $uptime / 86400),
697 (int $m->[8] / 3600) % 24, 996 (int $uptime / 3600) % 24,
698 (int $m->[8] / 60) % 60, 997 (int $uptime / 60) % 60,
699 $m->[8] % 60; 998 $uptime % 60;
700 999
701 $m = [$users, $host, $uptime, $version, $desc]; 1000 $m = [$users, $host, $uptime, $version, $desc];
702 1001
703 $y++; 1002 $y++;
704 1003
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 1004 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
706 (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 {
707 $HOST->set_text ($CFG->{host} = $host); 1009 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1010 $METASERVER->hide;
1011 0
1012 },
708 }), 1013 ),
709 (new CFClient::UI::Empty expand => 1), 1014 (new CFPlus::UI::Empty expand => 1),
710 ]); 1015 ]);
711 1016
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 1017 $table->add ($_, $y, new CFPlus::UI::Label
713 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)
714 for 0 .. $#$m; 1027 for 0 .. $#$m;
715 } 1028 }
1029 } else {
1030 $ok or $label->set_text ("error while contacting metaserver");
716 } 1031 }
717 }); 1032 };
718}
719 1033
720sub server_setup { 1034}
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 1035
722 x => $WIDTH * (1/3), 1036sub metaserver_dialog {
723 y => $HEIGHT * (1/8), 1037 my $vbox = new CFPlus::UI::VBox;
724 name => "server_setup", 1038 my $table = new CFPlus::UI::Table;
725 title => "Server Setup", 1039 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
726 child => (my $vbox = new CFClient::UI::VBox), 1040
1041 my $dialog = new CFPlus::UI::Toplevel
1042 title => "Server List",
1043 name => 'metaserver_dialog',
1044 x => 'center',
1045 y => 'center',
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,
727 on_visibility_change => sub { 1052 on_visibility_change => sub {
728 my ($self, $visible) = @_; 1053 update_metaserver ($_[0]) if $_[1];
729 $self->center if $visible; 1054 0
730 }, 1055 },
731 ; 1056 ;
732 1057
1058 $dialog
1059}
1060
1061sub server_setup {
1062 my $vbox = new CFPlus::UI::VBox;
1063
1064 $vbox->add (new CFPlus::UI::FancyFrame
1065 label => "Connection Settings",
733 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1066 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1067 );
734 $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");
735 1069
736 { 1070 {
737 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1071 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
738 1072
739 $vbox->add ( 1073 $vbox->add (
740 my $HOST = new CFClient::UI::Entry 1074 $HOST_ENTRY = new CFPlus::UI::Entry
741 expand => 1, 1075 expand => 1,
742 text => $CFG->{host}, 1076 text => $CFG->{profile}{default}{host},
743 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",
744 on_changed => sub { 1078 on_changed => sub {
745 my ($self, $value) = @_; 1079 my ($self, $value) = @_;
746 $CFG->{host} = $value; 1080 $CFG->{profile}{default}{host} = $value;
1081 0
747 } 1082 }
748 ); 1083 );
749 1084
750 $METASERVER = metaserver_dialog;
751
752 $vbox->add (new CFClient::UI::Flopper 1085 $vbox->add (new CFPlus::UI::Button
753 expand => 1, 1086 expand => 1,
754 text => "Server List", 1087 text => "Server List",
755 other => $METASERVER, 1088 other => $METASERVER,
756 tooltip => "Show a list of available crossfire servers", 1089 tooltip => "Show a list of available crossfire servers",
757 on_open => sub { 1090 on_activate => sub { $METASERVER->toggle_visibility; 0 },
758 update_metaserver $HOST; 1091 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
759 }
760 ); 1092 );
761 } 1093 }
762 1094
763 $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");
764 $table->add (1, 4, new CFClient::UI::Entry 1096 $table->add (1, 4, new CFPlus::UI::Entry
765 text => $CFG->{user}, 1097 text => $CFG->{profile}{default}{user},
766 tooltip => "The name of your character on the server", 1098 tooltip => "The name of your character on the server",
767 on_changed => sub { 1099 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
768 my ($self, $value) = @_;
769 $CFG->{user} = $value;
770 }
771 ); 1100 );
772 1101
773 $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");
774 $table->add (1, 5, new CFClient::UI::Entry 1103 $table->add (1, 5, new CFPlus::UI::Entry
775 text => $CFG->{password}, 1104 text => $CFG->{profile}{default}{password},
776 hidden => 1, 1105 hidden => 1,
777 tooltip => "The password for your character", 1106 tooltip => "The password for your character",
778 on_changed => sub { 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
779 my ($self, $value) = @_;
780 $CFG->{password} = $value;
781 }
782 ); 1108 );
783 1109
784 $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");
785 $table->add (1, 7, new CFClient::UI::Slider 1111 $table->add (1, 7, new CFPlus::UI::Slider
786 req_w => 100, 1112 force_w => 100,
787 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1113 range => [$CFG->{mapsize}, 10, 100, 0, 1],
788 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. "
789 . "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, "
790 . "but you also increase bandwidth requirements and latency. " 1116 . "but you also increase bandwidth requirements and latency. "
791 . "This option is only used once at log-in.", 1117 . "This option is only used once at log-in.",
792 on_changed => sub { 1118 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
793 my ($self, $value) = @_;
794
795 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
796 },
797 ); 1119 );
798 1120
799 $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");
800 $table->add (1, 8, new CFClient::UI::CheckBox 1122 $table->add (1, 8, new CFPlus::UI::CheckBox
801 state => $CFG->{face_prefetch}, 1123 state => $CFG->{face_prefetch},
802 tooltip => "<b>Background Image Prefetch</b>\n\n" 1124 tooltip => "<b>Background Image Prefetch</b>\n\n"
803 . "If enabled, the client automatically pre-fetches images from the server. " 1125 . "If enabled, the client automatically pre-fetches images from the server. "
804 . "This might increase or create lag, but increases the chances " 1126 . "This might increase or create lag, but increases the chances "
805 . "of faces being ready for display when you encounter them. " 1127 . "of faces being ready for display when you encounter them. "
806 . "It also uses up server bandwidth on every connect, " 1128 . "It also uses up server bandwidth on every connect, "
807 . "so only set it if you really need to prefetch images. " 1129 . "so only set it if you really need to prefetch images. "
808 . "This option can be set and unset any time.", 1130 . "This option can be set and unset any time.",
809 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1131 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
810 ); 1132 );
811 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
812 $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");
813 $table->add (1, 9, new CFClient::UI::Entry 1144 $table->add (1, 10, new CFPlus::UI::Entry
814 text => $CFG->{output_count}, 1145 text => $CFG->{output_count},
815 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.",
816 on_changed => sub { $CFG->{output_count} = $_[1] }, 1147 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
817 ); 1148 );
818 1149
819 $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");
820 $table->add (1, 10, new CFClient::UI::Entry 1151 $table->add (1, 11, new CFPlus::UI::Entry
821 text => $CFG->{output_sync}, 1152 text => $CFG->{output_sync},
822 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.",
823 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1154 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
824 ); 1155 );
825 1156
826 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1157 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
827 expand => 1, 1158 expand => 1,
828 align => 0, 1159 align => 0,
829 text => "Login", 1160 text => "Login",
830 on_activate => sub { 1161 on_activate => sub {
831 $CONN ? stop_game 1162 $CONN ? stop_game
832 : start_game; 1163 : start_game;
1164 0
833 }, 1165 },
834 ); 1166 );
835 1167
836 $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
837} 1219}
838 1220
839sub message_window { 1221sub message_window {
840 my $window = new CFClient::UI::FancyFrame 1222 my $window = new CFPlus::UI::Toplevel
841 name => "message_window", 1223 name => "message_window",
842 title => "Messages", 1224 title => "Messages",
843 border_bg => [1, 1, 1, 1], 1225 border_bg => [1, 1, 1, 1],
844 bg => [0, 0, 0, 0.75], 1226 x => "max",
845 req_x => -1,
846 req_y => 0, 1227 y => 0,
847 def_w => int $::WIDTH / 3, 1228 force_w => $::WIDTH * 0.4,
848 def_h => int $::HEIGHT / 5, 1229 force_h => $::HEIGHT * 0.5,
849 child => (my $vbox = new CFClient::UI::VBox); 1230 child => (my $vbox = new CFPlus::UI::VBox),
1231 has_close_button => 1;
850 1232
851 $vbox->add ($LOGVIEW); 1233 $vbox->add ($LOGVIEW);
852 1234
853 $vbox->add (my $input = new CFClient::UI::Entry 1235 $vbox->add (my $input = new CFPlus::UI::Entry
854 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> "
855 . "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>...). "
856 . "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). "
857 . "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.",
858 on_focus_in => sub { 1240 on_focus_in => sub {
… …
862 1244
863 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1245 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
864 $input->{refocus_map} = 1; 1246 $input->{refocus_map} = 1;
865 } 1247 }
866 delete $input->{auto_activated}; 1248 delete $input->{auto_activated};
1249
1250 0
867 }, 1251 },
868 on_activate => sub { 1252 on_activate => sub {
869 my ($input, $text) = @_; 1253 my ($input, $text) = @_;
870 $input->set_text (''); 1254 $input->set_text ('');
871 1255
872 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]);
874 } elsif ($text =~ /^\/(.*)/) { 1256 if ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1); 1257 $::CONN->user_send ($1);
876 } else { 1258 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say'; 1259 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text"); 1260 $::CONN->user_send ("$say_cmd $text");
879 } 1261 }
880 if ($input->{refocus_map}) { 1262 if ($input->{refocus_map}) {
881 delete $input->{refocus_map}; 1263 delete $input->{refocus_map};
882 $MAPWIDGET->focus_in 1264 $MAPWIDGET->focus_in
883 } 1265 }
1266
1267 0
884 }, 1268 },
885 on_escape => sub { 1269 on_escape => sub {
886 $MAPWIDGET->focus_in 1270 $MAPWIDGET->grab_focus;
1271
1272 0
887 }, 1273 },
888 ); 1274 );
889 1275
890 $CONSOLE = { 1276 $CONSOLE = {
891 window => $window, 1277 window => $window,
892 input => $input 1278 input => $input,
893 }; 1279 };
894 1280
895 $window 1281 $window
1282}
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;
896} 1631}
897 1632
898sub open_quit_dialog { 1633sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 1634 unless ($QUIT_DIALOG) {
900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1635 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1636 x => "center",
1637 y => "center",
1638 z => 50,
1639 title => "Really Quit?",
1640 on_key_down => sub {
1641 my ($dialog, $ev) = @_;
1642 $ev->{sym} == 27 and $dialog->hide;
1643 }
1644 ;
901 1645
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1646 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
903 1647
904 $vb->add (new CFClient::UI::Label 1648 $vb->add (new CFPlus::UI::Label
905 text => "You should find a savebed and apply it first!", 1649 text => "You should find a savebed and apply it first!",
906 max_w => $WIDTH * 0.25, 1650 max_w => $WIDTH * 0.25,
907 ellipsize => 0, 1651 ellipsize => 0,
908 ); 1652 );
909 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1653 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
910 $hb->add (new CFClient::UI::Button 1654 $hb->add (new CFPlus::UI::Button
911 text => "Ok", 1655 text => "Ok",
912 expand => 1, 1656 expand => 1,
913 on_activate => sub { $QUIT_DIALOG->hide }, 1657 on_activate => sub { $QUIT_DIALOG->hide; 0 },
914 ); 1658 );
915 $hb->add (new CFClient::UI::Button 1659 $hb->add (new CFPlus::UI::Button
916 text => "Quit anyway", 1660 text => "Quit anyway",
917 expand => 1, 1661 expand => 1,
918 on_activate => sub { exit }, 1662 on_activate => sub { exit },
919 ); 1663 );
920 } 1664 }
921 1665
922 $QUIT_DIALOG->show; 1666 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center; 1667 $QUIT_DIALOG->grab_focus;
924} 1668}
925 1669
926sub make_inventory_window { 1670sub show_tip_of_the_day {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1671 # find all tips
928 def_w => $WIDTH * 7/8, 1672 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
929 def_h => $HEIGHT * 7/8,
930 title => "Inventory",
931 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ;
937 1673
938 $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 { };
939 1678
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1679 # create dialog
941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1680 my $dialog;
942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
943 1681
944 $hb->add (my $vb2 = new CFClient::UI::VBox); 1682 my $close = sub {
945 1683 $dialog->destroy;
946 $vb2->add (my $hb2 = new CFClient::UI::HBox);
947 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
948 $hb2->add (new CFClient::UI::Button
949 text => "Close",
950 tooltip => "Close the currently open container (if one is open)",
951 on_activate => sub {
952 $CONN->send ("apply $CONN->{open_container}")
953 if $CONN->{open_container} != 0;
954 },
955 );
956
957 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
958
959 $invwin
960}
961
962sub make_binding_window {
963 my $binding_list = new CFClient::UI::VBox;
964
965 my $refresh = sub {
966 $binding_list->clear ();
967
968 for my $mod (keys %{$::CFG->{bindings}}) {
969 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
970 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
971 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
972
973 my $lbl = join "; ", @$cmds;
974 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);
975 $binding_list->add (my $hb = new CFClient::UI::HBox);
976 $hb->add (new CFClient::UI::Button
977 text => "del",
978 on_activate => sub {
979 $binding_list->remove ($hb);
980 delete $::CFG->{bindings}->{$mod}->{$sym};
981 });
982 $hb->add (new CFClient::UI::Label text => "($nam)");
983 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
984 }
985 }
986 };
987
988 $BIND_WINDOW = new CFClient::UI::FancyFrame
989 title => "Bindings",
990 def_w => int $WIDTH * 7/8,
991 def_h => int $HEIGHT * 7/8,
992 on_visibility_change => sub {
993 my ($self, $visible) = @_;
994 if ($visible) {
995 $self->center;
996 $refresh->()
997 }
998 }; 1684 };
999 1685
1000 $BIND_WINDOW->add ($binding_list); 1686 $dialog = new CFPlus::UI::Toplevel
1001 $refresh->(); 1687 x => "center",
1002 $BIND_WINDOW 1688 y => "center",
1003} 1689 z => 3,
1004 1690 name => 'tip_of_the_day',
1005sub make_help_window {
1006 my $win = new CFClient::UI::FancyFrame
1007 def_w => int $WIDTH * 7/8, 1691 force_w => int $WIDTH * 4/9,
1008 def_h => int $HEIGHT * 7/8, 1692 force_h => int $WIDTH * 2/9,
1009 title => "Documentation"; 1693 title => "Tip of the day #" . (1 + $todindex),
1694 child => my $vbox = new CFPlus::UI::VBox,
1695 has_close_button => 1,
1696 on_delete => $close,
1697 ;
1010 1698
1011 $win->add (my $vbox = new CFClient::UI::VBox); 1699 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1700 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1701 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1012 1702
1013 $vbox->add (my $buttons = new CFClient::UI::HBox); 1703 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1014 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1015 1704
1016 for ( 1705 $table->add (0, 0, new CFPlus::UI::Button
1017 [intro => "Introduction"],
1018 [manual => "Manual"],
1019 [command_help => "Commands"],
1020 [skill_help => "Skills"],
1021 ) {
1022 my ($pod, $label) = @$_;
1023
1024 $buttons->add (new CFClient::UI::Button
1025 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>.",
1026 on_activate => sub { 1714 on_activate => sub {
1027 my $parser = new Pod::POM; 1715 $close->();
1028 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1716 &show_tip_of_the_day;
1029
1030 $viewer->clear;
1031
1032 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1033 for @{ CFClient::pod_to_pango_list $pom };
1034
1035 $viewer->set_offset (0);
1036 }, 1717 },
1037 ); 1718 );
1719
1720 $dialog->show;
1038 } 1721 };
1039
1040 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1041
1042 $win
1043} 1722}
1044 1723
1045sub sdl_init { 1724sub sdl_init {
1046 CFClient::SDL_Init 1725 CFPlus::SDL_Init
1047 and die "SDL::Init failed!\n"; 1726 and die "SDL::Init failed!\n";
1048} 1727}
1049 1728
1050sub video_init { 1729sub video_init {
1051 sdl_init; 1730 sdl_init;
… …
1056 1735
1057 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1736 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1058 $FULLSCREEN = $CFG->{fullscreen}; 1737 $FULLSCREEN = $CFG->{fullscreen};
1059 $FAST = $CFG->{fast}; 1738 $FAST = $CFG->{fast};
1060 1739
1061 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1740 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1062 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1741 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1063 1742
1064 $SDL_ACTIVE = 1; 1743 $SDL_ACTIVE = 1;
1065 $LAST_REFRESH = time - 0.01; 1744 $LAST_REFRESH = time - 0.01;
1066 1745
1067 CFClient::OpenGL::init; 1746 CFPlus::OpenGL::init;
1068 1747
1069 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1748 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1070 1749
1071 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1750 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1072 1751
1073 ############################################################################# 1752 #############################################################################
1074 1753
1075 if ($DEBUG_STATUS) { 1754 if ($DEBUG_STATUS) {
1076 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1755 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1077 } else { 1756 } else {
1078 # create the widgets 1757 # create the widgets
1079 1758
1080 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1759 $DEBUG_STATUS = new CFPlus::UI::Label
1760 padding => 0,
1761 z => 100,
1762 force_x => "max",
1763 force_y => 0;
1081 $DEBUG_STATUS->show; 1764 $DEBUG_STATUS->show;
1082 1765
1083 $STATUSBOX = new CFClient::UI::Statusbox; 1766 $STATUSBOX = new CFPlus::UI::Statusbox;
1084 $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]);
1085 1768
1086 (new CFClient::UI::Frame 1769 (new CFPlus::UI::Frame
1087 bg => [0, 0, 0, 0.4], 1770 bg => [0, 0, 0, 0.4],
1088 req_y => -1, 1771 force_x => 0,
1772 force_y => "max",
1089 child => $STATUSBOX, 1773 child => $STATUSBOX,
1090 )->show; 1774 )->show;
1091 1775
1092 CFClient::UI::FancyFrame->new ( 1776 CFPlus::UI::Toplevel->new (
1777 title => "Map",
1778 name => "mapmap",
1779 x => 0,
1780 y => $FONTSIZE + 8,
1093 border_bg => [1, 1, 1, 192/255], 1781 border_bg => [1, 1, 1, 192/255],
1094 bg => [1, 1, 1, 0], 1782 bg => [1, 1, 1, 0],
1095 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1783 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1096 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.",
1097 ), 1785 ),
1098 )->show; 1786 )->show;
1099 1787
1100 $MAPWIDGET = new CFClient::MapWidget; 1788 $MAPWIDGET = new CFPlus::MapWidget;
1101 $MAPWIDGET->connect (activate_console => sub { 1789 $MAPWIDGET->connect (activate_console => sub {
1102 my ($mapwidget, $preset) = @_; 1790 my ($mapwidget, $preset) = @_;
1103 1791
1104 if ($CONSOLE) { 1792 if ($CONSOLE) {
1105 $CONSOLE->{input}->{auto_activated} = 1; 1793 $CONSOLE->{input}->{auto_activated} = 1;
1106 $CONSOLE->{input}->focus_in; 1794 $CONSOLE->{input}->grab_focus;
1107 1795
1108 if ($preset && $CONSOLE->{input}->get_text eq '') { 1796 if ($preset && $CONSOLE->{input}->get_text eq '') {
1109 $CONSOLE->{input}->set_text ($preset); 1797 $CONSOLE->{input}->set_text ($preset);
1110 } 1798 }
1111 } 1799 }
1112 }); 1800 });
1113 $MAPWIDGET->show; 1801 $MAPWIDGET->show;
1114 $MAPWIDGET->focus_in; 1802 $MAPWIDGET->grab_focus;
1115 1803
1116 $LOGVIEW = new CFClient::UI::TextView 1804 $LOGVIEW = new CFPlus::UI::TextScroller
1117 expand => 1, 1805 expand => 1,
1118 font => $FONT_FIXED, 1806 font => $FONT_FIXED,
1119 fontsize => $::CFG->{log_fontsize}, 1807 fontsize => $::CFG->{log_fontsize},
1808 indent => -4,
1120 can_hover => 1, 1809 can_hover => 1,
1121 can_events => 1, 1810 can_events => 1,
1811 max_par => $CFG->{logview_max_par},
1122 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.",
1123 ; 1813 ;
1124 1814
1125 $BUTTONBAR = new CFClient::UI::HBox; 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 ;
1126 1825
1127 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1826 $METASERVER = metaserver_dialog;
1128 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1827
1129 $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,
1130 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
1131 $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,
1132 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.");
1133 1856
1134 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
1135 1858
1136 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1137 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1138 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1859 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1139 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.");
1140 1861
1141 $BUTTONBAR->add (new CFClient::UI::Button 1862 $BUTTONBAR->add (new CFPlus::UI::Button
1142 text => "Save Config", 1863 text => "Save Config",
1143 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.",
1144 on_activate => sub { 1865 on_activate => sub {
1145 $::CFG->{layout} = CFClient::UI::get_layout; 1866 $::CFG->{layout} = CFPlus::UI::get_layout;
1146 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1867 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1147 status "Configuration Saved"; 1868 status "Configuration Saved";
1869 0
1148 }, 1870 },
1149 ); 1871 );
1150 1872
1151 $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,
1152 tooltip => "View Documentation"); 1874 tooltip => "View Documentation");
1153 1875
1154 $BUTTONBAR->add (new CFClient::UI::Flopper
1155 text => "Bindings",
1156 other => make_binding_window,
1157 tooltip => "Lets you delete bindings you have made with the recorder"
1158 );
1159 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1160 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1161 1876
1162 $BUTTONBAR->add (new CFClient::UI::Button 1877 $BUTTONBAR->add (new CFPlus::UI::Button
1163 text => "Quit", 1878 text => "Quit",
1164 tooltip => "Terminates the program", 1879 tooltip => "Terminates the program",
1165 on_activate => sub { 1880 on_activate => sub {
1166 if ($CONN) { 1881 if ($CONN) {
1167 open_quit_dialog; 1882 open_quit_dialog;
1168 } else { 1883 } else {
1169 exit; 1884 exit;
1170 } 1885 }
1886 0
1171 }, 1887 },
1172 ); 1888 );
1173 1889
1174 $BUTTONBAR->show; 1890 $BUTTONBAR->show;
1891 $SETUP_DIALOG->show;
1892 }
1175 1893
1176 $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}
1177 1896
1178 $SERVER_SETUP->show; 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;
1179 } 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;
1180} 2014}
1181 2015
1182sub video_shutdown { 2016sub video_shutdown {
2017 CFPlus::OpenGL::shutdown;
2018
1183 undef $SDL_ACTIVE; 2019 undef $SDL_ACTIVE;
1184} 2020}
1185
1186my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1187my $bgmusic;#TODO#hack#d#
1188 2021
1189sub audio_channel_finished { 2022sub audio_channel_finished {
1190 my ($channel) = @_; 2023 my ($channel) = @_;
1191 2024
1192 #warn "channel $channel finished\n";#d# 2025 #warn "channel $channel finished\n";#d#
1193} 2026}
1194 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
1195sub audio_music_finished { 2100sub audio_music_finished {
1196 return unless $CFG->{bgm_enable}; 2101 $MUSIC_PLAYING = undef;
2102 undef $MUSIC_PLAYER;
1197 2103
1198 # TODO: hack, do play loop and mood music 2104 audio_music_changed;
1199 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1200 $bgmusic->play (0);
1201
1202 push @bgmusic, shift @bgmusic;
1203} 2105}
1204 2106
1205sub audio_init { 2107sub audio_init {
1206 if ($CFG->{audio_enable}) { 2108 if ($CFG->{audio_enable}) {
1207 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2109 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1208 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2110 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1209 2111
1210 unless ($SDL_MIXER) { 2112 unless ($SDL_MIXER) {
1211 status "Unable to open sound device: there will be no sound"; 2113 status "Unable to open sound device: there will be no sound";
1212 return; 2114 return;
1213 } 2115 }
1214 2116
1215 CFClient::Mix_AllocateChannels 8; 2117 CFPlus::Mix_AllocateChannels 8;
1216 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2118 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1217 2119
1218 audio_music_finished; 2120 audio_music_finished;
1219 2121
2122 local $_;
1220 while (<$fh>) { 2123 while (<$fh>) {
1221 next if /^\s*#/; 2124 next if /^\s*#/;
1222 next if /^\s*$/; 2125 next if /^\s*$/;
1223 2126
1224 my ($file, $volume, $event) = split /\s+/, $_, 3; 2127 my ($file, $volume, $event) = split /\s+/, $_, 3;
1225 2128
1226 push @SOUNDS, "$volume,$file"; 2129 push @SOUNDS, "$volume,$file";
1227 2130
1228 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2131 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1229 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";
1230 $chunk->volume ($volume * 128 / 100); 2133 $chunk->volume ($volume * 128 / 100);
1231 $chunk 2134 $chunk
1232 }; 2135 };
1233 } 2136 }
1234 } else { 2137 } else {
… …
1236 } 2139 }
1237 } 2140 }
1238} 2141}
1239 2142
1240sub audio_shutdown { 2143sub audio_shutdown {
1241 CFClient::Mix_CloseAudio if $SDL_MIXER; 2144 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1242 undef $SDL_MIXER; 2145 undef $SDL_MIXER;
1243 @SOUNDS = (); 2146 @SOUNDS = ();
1244 %AUDIO_CHUNKS = (); 2147 %AUDIO_CHUNKS = ();
1245} 2148}
1246 2149
… …
1251 2154
1252my %demo;#d# 2155my %demo;#d#
1253 2156
1254sub force_refresh { 2157sub force_refresh {
1255 $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;
1256 debug sprintf "%3.2f", $fps; 2159 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1257 2160
1258 $CFClient::UI::ROOT->draw; 2161 $CFPlus::UI::ROOT->draw;
1259 2162
1260 $WANT_REFRESH = 0; 2163 $WANT_REFRESH = 0;
1261 $CAN_REFRESH = 0; 2164 $CAN_REFRESH = 0;
1262 $LAST_REFRESH = $NOW; 2165 $LAST_REFRESH = $NOW;
1263 2166
12640 && do {
1265 # some weird model-drawing code, just a joke right now
1266 use CFClient::OpenGL;
1267
1268 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1269 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1270 $demo{r} ||= do {
1271 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1272 $mod->{v} = pack "f*", @{$mod->{v}};
1273 $_ = [scalar @$_, pack "S!*", @$_]
1274 for values %{$mod->{g}};
1275 $mod
1276 };
1277
1278 my $r = $demo{r} or die;
1279
1280 glDepthMask 1;
1281 glClear GL_DEPTH_BUFFER_BIT;
1282 glEnable GL_TEXTURE_2D;
1283 glEnable GL_DEPTH_TEST;
1284 glEnable GL_CULL_FACE;
1285 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1286
1287 glMatrixMode GL_PROJECTION;
1288 glLoadIdentity;
1289 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1290 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1291 glMatrixMode GL_MODELVIEW;
1292 glLoadIdentity;
1293
1294 glPushMatrix;
1295 glTranslate 0, 0, -800;
1296 glScale 1, -1, 1;
1297 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1298 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1299 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1300 glScale 50, 50, 50;
1301
1302 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1303 while (my ($k, $v) = each %{$r->{g}}) {
1304 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1305 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1306 }
1307
1308 glPopMatrix;
1309
1310 glShadeModel GL_FLAT;
1311 glDisable GL_DEPTH_TEST;
1312 glDisable GL_TEXTURE_2D;
1313 glDepthMask 0;
1314
1315 $WANT_REFRESH++;
1316};
1317
1318 CFClient::SDL_GL_SwapBuffers; 2167 CFPlus::SDL_GL_SwapBuffers;
1319} 2168}
1320 2169
1321my $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 {
1322 $NOW = time; 2171 $NOW = time;
1323 2172
1324 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2173 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1325 for CFClient::SDL_PollEvent; 2174 for CFPlus::poll_events;
1326 2175
1327 if (%animate_object) { 2176 if (%animate_object) {
1328 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2177 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1329 $WANT_REFRESH++; 2178 $WANT_REFRESH++;
1330 } 2179 }
… …
1354 $CONN->face_prefetch 2203 $CONN->face_prefetch
1355 if $CONN; 2204 if $CONN;
1356}); 2205});
1357 2206
1358%SDL_CB = ( 2207%SDL_CB = (
1359 CFClient::SDL_QUIT => sub { 2208 CFPlus::SDL_QUIT => sub {
1360 Event::unloop -1; 2209 exit;
1361 }, 2210 },
1362 CFClient::SDL_VIDEORESIZE => sub { 2211 CFPlus::SDL_VIDEORESIZE => sub {
1363 }, 2212 },
1364 CFClient::SDL_VIDEOEXPOSE => sub { 2213 CFPlus::SDL_VIDEOEXPOSE => sub {
1365 CFClient::UI::full_refresh; 2214 CFPlus::UI::full_refresh;
1366 }, 2215 },
1367 CFClient::SDL_ACTIVEEVENT => sub { 2216 CFPlus::SDL_ACTIVEEVENT => sub {
1368# 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\n", $_[0]{gain}, $_[0]{state};#d#
2219# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2220# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2221# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1369 }, 2222 },
1370 CFClient::SDL_KEYDOWN => sub { 2223 CFPlus::SDL_KEYDOWN => sub {
1371 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2224 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1372 # alt-enter 2225 # alt-enter
2226 $FULLSCREEN_ENABLE->toggle;
1373 video_shutdown; 2227 video_shutdown;
1374 $CFG->{fullscreen} = !$CFG->{fullscreen};
1375 video_init; 2228 video_init;
1376 } else { 2229 } else {
1377 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2230 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1378 } 2231 }
1379 }, 2232 },
1380 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2233 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1381 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2234 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1382 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2235 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1383 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2236 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1384 CFClient::SDL_USEREVENT => sub { 2237 CFPlus::SDL_USEREVENT => sub {
1385 if ($_[0]{code} == 1) { 2238 if ($_[0]{code} == 1) {
1386 audio_channel_finished $_[0]{data1}; 2239 audio_channel_finished $_[0]{data1};
1387 } elsif ($_[0]{code} == 0) { 2240 } elsif ($_[0]{code} == 0) {
1388 audio_music_finished; 2241 audio_music_finished;
1389 } 2242 }
… …
1393############################################################################# 2246#############################################################################
1394 2247
1395$SIG{INT} = $SIG{TERM} = sub { exit }; 2248$SIG{INT} = $SIG{TERM} = sub { exit };
1396 2249
1397{ 2250{
1398 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1399
1400 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 2251 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2252 CFPlus::DB::Server::run;
2253
1401 CFClient::UI::set_layout ($::CFG->{layout}); 2254 CFPlus::UI::set_layout ($::CFG->{layout});
1402 2255
1403 my %DEF_CFG = ( 2256 my %DEF_CFG = (
1404 sdl_mode => 0, 2257 sdl_mode => 0,
1405 width => 640, 2258 width => 640,
1406 height => 480, 2259 height => 480,
1407 fullscreen => 0, 2260 fullscreen => 0,
1408 fast => 0, 2261 fast => 0,
1409 map_scale => 1, 2262 map_scale => 1,
1410 fow_enable => 1, 2263 fow_enable => 1,
1411 fow_intensity => 0.45, 2264 fow_intensity => 0.45,
1412 fow_smooth => 0, 2265 fow_smooth => 0,
2266 map_smoothing => 1,
1413 gui_fontsize => 1, 2267 gui_fontsize => 1,
1414 log_fontsize => 1, 2268 log_fontsize => 0.7,
1415 gauge_fontsize=> 1, 2269 gauge_fontsize => 1,
1416 gauge_size => 0.35, 2270 gauge_size => 0.35,
1417 stat_fontsize => 1, 2271 stat_fontsize => 0.7,
1418 mapsize => 100, 2272 mapsize => 100,
1419 host => "crossfire.schmorp.de",
1420 say_command => 'say', 2273 say_command => 'chat',
1421 audio_enable => 1, 2274 audio_enable => 1,
1422 bgm_enable => 1, 2275 bgm_enable => 1,
1423 bgm_volume => 0.25, 2276 bgm_volume => 0.25,
1424 face_prefetch => 0, 2277 face_prefetch => 0,
1425 output_sync => 1, 2278 output_sync => 1,
1426 output_count => 1, 2279 output_count => 1,
2280 output_rate => "",
2281 pickup => 0,
2282 inv_sort => "mtime",
2283 default => "profile", # default profile
2284 show_tips => 1,
2285 logview_max_par => 1000,
2286 );
1427 ); 2287
1428
1429 while (my ($k, $v) = each %DEF_CFG) { 2288 while (my ($k, $v) = each %DEF_CFG) {
1430 $CFG->{$k} = $v unless exists $CFG->{$k}; 2289 $CFG->{$k} = $v unless exists $CFG->{$k};
1431 } 2290 }
1432 2291
2292 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2293 $PROFILE = $CFG->{profile}{default};
2294
2295 # convert old bindings (only default profile matters)
2296 if (my $bindings = delete $PROFILE->{bindings}) {
2297 while (my ($mod, $syms) = each %$bindings) {
2298 while (my ($sym, $cmds) = each %$syms) {
2299 push @{ $PROFILE->{macro} }, {
2300 accelkey => [$mod*1, $sym*1],
2301 action => $cmds,
2302 };
2303 }
2304 }
2305 }
2306
1433 sdl_init; 2307 sdl_init;
1434 2308
1435 @SDL_MODES = reverse 2309 @SDL_MODES = reverse
1436 grep $_->[0] >= 640 && $_->[1] >= 480, 2310 grep $_->[0] >= 640 && $_->[1] >= 480,
1437 CFClient::SDL_ListModes; 2311 CFPlus::SDL_ListModes;
1438 2312
1439 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2313 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1440 2314
1441 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2315 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1442 2316
1443 { 2317 {
1444 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2318 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1445 DejaVuSans.ttf 2319 DejaVuSans.ttf
1446 DejaVuSansMono.ttf 2320 DejaVuSansMono.ttf
1447 DejaVuSans-Bold.ttf 2321 DejaVuSans-Bold.ttf
1448 DejaVuSansMono-Bold.ttf 2322 DejaVuSansMono-Bold.ttf
1449 DejaVuSans-Oblique.ttf 2323 DejaVuSans-Oblique.ttf
1450 DejaVuSansMono-Oblique.ttf 2324 DejaVuSansMono-Oblique.ttf
1451 DejaVuSans-BoldOblique.ttf 2325 DejaVuSans-BoldOblique.ttf
1452 DejaVuSansMono-BoldOblique.ttf 2326 DejaVuSansMono-BoldOblique.ttf
1453 ); 2327 );
1454 2328
1455 CFClient::add_font $_ for @fonts; 2329 CFPlus::add_font $_ for @fonts;
1456 2330
1457 CFClient::pango_init; 2331 CFPlus::pango_init;
1458 2332
1459 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2333 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1460 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2334 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1461 2335
1462 $FONT_PROP->make_default; 2336 $FONT_PROP->make_default;
1463 } 2337 }
1464 2338
1465# compare mono (ft) vs. rgba (cairo) 2339# compare mono (ft) vs. rgba (cairo)
1466# ft - 1.8s, cairo 3s, even in alpha-only mode 2340# ft - 1.8s, cairo 3s, even in alpha-only mode
1467# for my $rgba (0..1) { 2341# for my $rgba (0..1) {
1468# my $t1 = Time::HiRes::time; 2342# my $t1 = Time::HiRes::time;
1469# for (1..1000) { 2343# for (1..1000) {
1470# my $layout = CFClient::Layout->new ($rgba); 2344# my $layout = CFPlus::Layout->new ($rgba);
1471# $layout->set_text ("hallo" x 100); 2345# $layout->set_text ("hallo" x 100);
1472# $layout->render; 2346# $layout->render;
1473# } 2347# }
1474# my $t2 = Time::HiRes::time; 2348# my $t2 = Time::HiRes::time;
1475# warn $t2-$t1; 2349# warn $t2-$t1;
1476# } 2350# }
1477 2351
2352 $startup_done->();
2353
1478 video_init; 2354 video_init;
1479 audio_init; 2355 audio_init;
1480} 2356}
1481 2357
2358show_tip_of_the_day if $CFG->{show_tips};
2359
1482Event::loop; 2360Event::loop;
2361#CFPlus::SDL_Quit;
2362#CFPlus::_exit 0;
1483 2363
1484END { CFClient::SDL_Quit } 2364END {
2365 CFPlus::SDL_Quit;
2366 CFPlus::DB::Server::stop;
2367}
1485 2368
1486=head1 NAME 2369=head1 NAME
1487 2370
1488pclient - A Crossfire+ and Crossfire game client 2371cfplus - A Crossfire+ and Crossfire game client
1489 2372
1490=head1 SYNOPSIS 2373=head1 SYNOPSIS
1491 2374
1492Just run it - no commandline arguments are supported. 2375Just run it - no commandline arguments are supported.
1493 2376
1494=head1 USAGE 2377=head1 USAGE
1495 2378
1496Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 2379cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1497fullscreen and interactively. 2380fullscreen and interactively.
1498 2381
2382=head1 DEBUGGING
2383
2384
2385CFPLUS_DEBUG - environment variable
2386
2387 1 draw borders around widgets
2388 2 add low-level widget info to tooltips
2389 4 show fps
2390 8 suppress tooltips
2391
1499=head1 AUTHOR 2392=head1 AUTHOR
1500 2393
1501Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2394Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1502 2395
1503 2396

Diff Legend

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