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.48 by root, Fri Jun 2 21:46:45 2006 UTC vs.
Revision 1.157 by root, Tue Jun 26 05:06:01 2007 UTC

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

Diff Legend

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