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.51 by root, Sat Jun 3 21:59:55 2006 UTC vs.
Revision 1.156 by root, Sun Jun 24 19:17:47 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 Carp::confess $_[1];#d#TODO: remove when stable
47 CFClient::error $_[1];
48}; 98};
49
50#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
51
52our $VERSION = '0.1';
53 99
54my $MAX_FPS = 60; 100my $MAX_FPS = 60;
55my $MIN_FPS = 5; # unused as of yet 101my $MIN_FPS = 5; # unused as of yet
56 102
57our $META_SERVER = "crossfire.real-time.com:13326"; 103our $META_SERVER = "http://metaserver.schmorp.de/current.json";
58 104
59our $LAST_REFRESH; 105our $LAST_REFRESH;
60our $NOW; 106our $NOW;
61 107
62our $CFG; 108our $CFG;
63our $CONN; 109our $CONN;
110our $PROFILE; # current profile
64our $FAST; # fast, low-quality mode, possibly useful for software-rendering 111our $FAST; # fast, low-quality mode, possibly useful for software-rendering
65 112
66our $WANT_REFRESH; 113our $WANT_REFRESH;
67our $CAN_REFRESH; 114our $CAN_REFRESH;
68 115
… …
83our $CONSOLE; 130our $CONSOLE;
84our $METASERVER; 131our $METASERVER;
85our $LOGIN_BUTTON; 132our $LOGIN_BUTTON;
86our $QUIT_DIALOG; 133our $QUIT_DIALOG;
87our $HOST_ENTRY; 134our $HOST_ENTRY;
135our $FULLSCREEN_ENABLE;
136our $PICKUP_ENABLE;
137our $SERVER_INFO;
88 138
89our $SETUP_DIALOG; 139our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK; 140our $SETUP_NOTEBOOK;
91our $SETUP_SERVER; 141our $SETUP_SERVER;
92our $SETUP_KEYBOARD; 142our $SETUP_KEYBOARD;
93our $SETUP_SPELLS;
94 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;
95our $FLOORBOX; 155our $FLOORBOX;
96our $GAUGES; 156our $GAUGES;
97our $STATWIDS; 157our $STATWIDS;
98 158
99our $SDL_ACTIVE; 159our $SDL_ACTIVE;
… …
105 165
106our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
107our $STATUSBOX; 167our $STATUSBOX;
108our $DEBUG_STATUS; 168our $DEBUG_STATUS;
109 169
110our $INV_WINDOW;
111our $INV; 170our $INV;
112our $INVR; 171our $INVR;
113our $INV_RIGHT_HB; 172our $INV_RIGHT_HB;
114 173
115our $BIND_EDITOR;
116
117our $PICKUP_CFG; 174our $PICKUP_CFG;
118 175
176our $IN_BUILD_MODE;
177our $BUILD_BUTTON;
178
119sub status { 179sub status {
120 $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]);
121} 181}
122 182
123sub debug { 183sub debug {
124 $DEBUG_STATUS->set_text ($_[0]); 184 $DEBUG_STATUS->set_text ($_[0]);
125} 185}
126 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
127sub start_game { 437sub start_game {
128 status "logging in..."; 438 status "logging in...";
129 439
130 $LOGIN_BUTTON->set_text ("Logout"); 440 $LOGIN_BUTTON->set_text ("Logout");
131 $SETUP_DIALOG->hide; 441 $SETUP_DIALOG->hide;
132 442
133 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;
134 444
135 my ($host, $port) = split /:/, $CFG->{host}; 445 my ($host, $port) = split /:/, $PROFILE->{host};
136 446
137 $MAP = new CFClient::Map $mapsize, $mapsize; 447 $MAP = new CFPlus::Map;
138 448
139 $CONN = eval { 449 $CONN = eval {
140 new CFClient::Protocol 450 new CFPlus::Protocol
141 host => $host, 451 host => $host,
142 port => $port || 13327, 452 port => $port || 13327,
143 user => $CFG->{user}, 453 user => $PROFILE->{user},
144 pass => $CFG->{password}, 454 pass => $PROFILE->{password},
145 mapw => $mapsize, 455 mapw => $mapsize,
146 maph => $mapsize, 456 maph => $mapsize,
457
458 client => "cfplus $CFPlus::VERSION $] $^O",
147 459
148 map_widget => $MAPWIDGET, 460 map_widget => $MAPWIDGET,
149 logview => $LOGVIEW, 461 logview => $LOGVIEW,
150 statusbox => $STATUSBOX, 462 statusbox => $STATUSBOX,
151 map => $MAP, 463 map => $MAP,
152 mapmap => $MAPMAP, 464 mapmap => $MAPMAP,
465 query => \&server_query,
466
467 setup_req => {
468 smoothing => $CFG->{map_smoothing}*1,
469 },
153 470
154 sound_play => sub { 471 sound_play => sub {
155 my ($x, $y, $soundnum, $type) = @_; 472 my ($x, $y, $soundnum, $type) = @_;
156 473
157 $SDL_MIXER 474 $SDL_MIXER
… …
163 $chunk->play; 480 $chunk->play;
164 }, 481 },
165 }; 482 };
166 483
167 if ($CONN) { 484 if ($CONN) {
168 CFClient::lowdelay fileno $CONN->{fh}; 485 CFPlus::lowdelay fileno $CONN->{fh};
169 486
170 status "login successful"; 487 status "login successful";
171 } else { 488 } else {
172 status "unable to connect"; 489 status "unable to connect";
173 stop_game(); 490 stop_game();
174 } 491 }
175} 492}
176 493
177sub stop_game { 494sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login"); 495 $LOGIN_BUTTON->set_text ("Login");
496 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show; 497 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide; 498 $PL_WINDOW->hide;
181 $LOGVIEW->hide; 499 $SPELL_LIST->clear_spells;
500 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
182 501
183 return unless $CONN; 502 return unless $CONN;
184 503
185 status "connection closed"; 504 status "connection closed";
186 505
506 destroy_query_dialog $CONN;
187 $CONN->destroy; 507 $CONN->destroy;
188 $CONN = 0; # false, does not autovivify 508 $CONN = 0; # false, does not autovivify
509
510 undef $MAP;
189} 511}
190 512
191sub graphics_setup { 513sub graphics_setup {
192 my $vbox = new CFClient::UI::VBox; 514 my $vbox = new CFPlus::UI::VBox;
193 515
194 $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]);
195 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
196 $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");
197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 526 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
198 527
199 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 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]);
200 $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");
201 530
202 $mode_slider->connect (changed => sub { 531 $mode_slider->connect (changed => sub {
203 my ($self, $value) = @_; 532 my ($self, $value) = @_;
204 533
205 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 534 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
206 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 535 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
207 }); 536 });
208 $mode_slider->emit (changed => $mode_slider->{range}[0]); 537 $mode_slider->emit (changed => $mode_slider->{range}[0]);
209 538
210 my $row = 1;
211
212 $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");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 540 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
214 state => $CFG->{fullscreen}, 541 state => $CFG->{fullscreen},
215 tooltip => "Bring the client into fullscreen mode.", 542 tooltip => "Bring the client into fullscreen mode.",
216 on_changed => sub { 543 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
217 my ($self, $value) = @_;
218 $CFG->{fullscreen} = $value;
219 }
220 ); 544 );
221 545
222 $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");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 547 $table->add (1, $row++, new CFPlus::UI::CheckBox
224 state => $CFG->{fast}, 548 state => $CFG->{fast},
225 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.",
226 on_changed => sub { 563 on_activate => sub {
227 my ($self, $value) = @_; 564 video_shutdown ();
228 $CFG->{fast} = $value; 565 video_init ();
566 0
229 } 567 }
230 ); 568 );
231 569
232 $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");
233 $table->add (1, $row++, new CFClient::UI::Slider 571 $table->add (1, $row++, new CFPlus::UI::Slider
234 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 572 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
235 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 573 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
236 on_changed => sub { 574 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
237 my ($self, $value) = @_;
238 $CFG->{map_scale} = 2 ** $value;
239 }
240 ); 575 );
241 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
242 $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");
243 $table->add (1, $row++, new CFClient::UI::CheckBox 587 $table->add (1, $row++, new CFPlus::UI::CheckBox
244 state => $CFG->{fow_enable}, 588 state => $CFG->{fow_enable},
245 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.",
246 on_changed => sub { 590 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
247 my ($self, $value) = @_;
248 $CFG->{fow_enable} = $value;
249 }
250 ); 591 );
251 592
252 $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");
253 $table->add (1, $row++, new CFClient::UI::Slider 594 $table->add (1, $row++, new CFPlus::UI::Slider
254 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 595 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
255 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 596 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
256 on_changed => sub { 597 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
257 my ($self, $value) = @_;
258 $CFG->{fow_intensity} = $value;
259 }
260 ); 598 );
261 599
262 $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");
263 $table->add (1, $row++, new CFClient::UI::CheckBox 601 $table->add (1, $row++, new CFPlus::UI::CheckBox
264 state => $CFG->{fow_smooth}, 602 state => $CFG->{fow_smooth},
265 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.",
266 on_changed => sub { 604 on_changed => sub {
267 my ($self, $value) = @_; 605 my ($self, $value) = @_;
268 $CFG->{fow_smooth} = $value; 606 $CFG->{fow_smooth} = $value;
269 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
270 } 609 }
271 ); 610 );
272 611
273 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
274 $table->add (1, $row++, new CFClient::UI::Slider
275 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
276 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
277 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
278 );
279
280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 612 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
281 $table->add (1, $row++, new CFClient::UI::Slider 613 $table->add (1, $row++, new CFPlus::UI::Slider
282 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 614 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
283 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 615 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
284 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 616 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
285 ); 617 );
286 618
287 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
288
289 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
291 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
292 on_changed => sub {
293 $CFG->{stat_fontsize} = $_[1];
294 &set_stats_window_fontsize;
295 }
296 );
297
298 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 619 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
299 $table->add (1, $row++, new CFClient::UI::Slider 620 $table->add (1, $row++, new CFPlus::UI::Slider
300 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 621 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
301 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 622 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
302 on_changed => sub { 623 on_changed => sub {
303 $CFG->{gauge_fontsize} = $_[1]; 624 $CFG->{gauge_fontsize} = $_[1];
304 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
626 0
305 } 627 }
306 ); 628 );
307 629
308 $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");
309 $table->add (1, $row++, new CFClient::UI::Slider 631 $table->add (1, $row++, new CFPlus::UI::Slider
310 range => [$CFG->{gauge_size}, 0.2, 0.8], 632 range => [$CFG->{gauge_size}, 0.2, 0.8],
311 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.",
312 on_changed => sub { 634 on_changed => sub {
313 $CFG->{gauge_size} = $_[1]; 635 $CFG->{gauge_size} = $_[1];
314 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 636 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
315 } 637 0
316 );
317
318 $table->add (1, $row++, new CFClient::UI::Button
319 expand => 1, align => 0, text => "Apply",
320 tooltip => "Apply the video settings",
321 on_activate => sub {
322 video_shutdown ();
323 video_init ();
324 } 638 }
325 ); 639 );
326 640
327 $vbox 641 $vbox
328} 642}
329 643
330sub audio_setup { 644sub audio_setup {
331 my $vbox = new CFClient::UI::VBox; 645 my $vbox = new CFPlus::UI::VBox;
332 646
333 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 647 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
334 648
335 my $row = 0; 649 my $row = 0;
336 650
337 $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");
338 $table->add (1, $row++, new CFClient::UI::CheckBox 652 $table->add (1, $row++, new CFPlus::UI::CheckBox
339 state => $CFG->{audio_enable}, 653 state => $CFG->{audio_enable},
340 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.",
341 on_changed => sub { 655 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
342 $CFG->{audio_enable} = $_[1];
343 }
344 ); 656 );
345# $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");
346# $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 {
347# $CFG->{effects_volume} = $_[1]; 659# $CFG->{effects_volume} = $_[1];
348# }); 660# });
349 $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");
350 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 662 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
351 $hbox->add (new CFClient::UI::CheckBox 663 $hbox->add (new CFPlus::UI::CheckBox
352 expand => 1, state => $CFG->{bgm_enable}, 664 expand => 1, state => $CFG->{bgm_enable},
353 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.",
354 on_changed => sub { 666 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
355 $CFG->{bgm_enable} = $_[1];
356 }
357 ); 667 );
358 $hbox->add (new CFClient::UI::Slider 668 $hbox->add (new CFPlus::UI::Slider
359 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 669 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
360 tooltip => "The volume of the background music. Changes are instant.", 670 tooltip => "The volume of the background music. Changes are instant.",
361 on_changed => sub { 671 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
362 $CFG->{bgm_volume} = $_[1];
363 CFClient::MixMusic::volume $_[1] * 128;
364 }
365 ); 672 );
366 673
367 $table->add (1, $row++, new CFClient::UI::Button 674 $table->add (1, $row++, new CFPlus::UI::Button
368 expand => 1, align => 0, text => "Apply", 675 expand => 1, align => 0, text => "Apply",
369 tooltip => "Apply the audio settings", 676 tooltip => "Apply the audio settings",
370 on_activate => sub { 677 on_activate => sub {
371 audio_shutdown (); 678 audio_shutdown ();
372 audio_init (); 679 audio_init ();
680 0
373 } 681 }
374 ); 682 );
375 683
376 $vbox 684 $vbox
377}
378
379sub set_stats_window_fontsize {
380 for (values %{$STATWIDS}) {
381 $_->set_fontsize ($::CFG->{stat_fontsize});
382 }
383} 685}
384 686
385sub set_gauge_window_fontsize { 687sub set_gauge_window_fontsize {
386 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 688 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
387 $_->set_fontsize ($::CFG->{gauge_fontsize}); 689 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
389} 691}
390 692
391sub make_gauge_window { 693sub make_gauge_window {
392 my $gh = int $HEIGHT * $CFG->{gauge_size}; 694 my $gh = int $HEIGHT * $CFG->{gauge_size};
393 695
394 my $win = new CFClient::UI::Frame ( 696 my $win = new CFPlus::UI::Frame (
395 force_x => 0, 697 force_x => 0,
396 force_y => "max", 698 force_y => "max",
397 force_w => $WIDTH, 699 force_w => $WIDTH,
398 force_h => $gh, 700 force_h => $gh,
399 ); 701 );
400 702
401 $win->add (my $hbox = new CFClient::UI::HBox 703 $win->add (my $hbox = new CFPlus::UI::HBox
402 children => [ 704 children => [
403 (new CFClient::UI::HBox expand => 1), 705 (new CFPlus::UI::HBox expand => 1),
404 (new CFClient::UI::VBox children => [ 706 (new CFPlus::UI::VBox children => [
405 (new CFClient::UI::Empty expand => 1), 707 (new CFPlus::UI::Empty expand => 1),
406 (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)),
407 ]), 709 ]),
408 (my $vbox = new CFClient::UI::VBox), 710 (my $vbox = new CFPlus::UI::VBox),
409 ], 711 ],
410 ); 712 );
411 713
412 $vbox->add (new CFClient::UI::HBox 714 $vbox->add (new CFPlus::UI::HBox
413 expand => 1, 715 expand => 1,
414 children => [ 716 children => [
415 (new CFClient::UI::Empty expand => 1), 717 (new CFPlus::UI::Empty expand => 1),
416 (my $hb = new CFClient::UI::HBox), 718 (my $hb = new CFPlus::UI::HBox),
417 ], 719 ],
418 ); 720 );
419 721
420 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 722 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
421 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.");
422 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 723 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
423 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.");
424 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 724 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
425 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.");
426 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 725 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
427 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.");
428 726
429 $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");
430 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.");
431 $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");
432 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
433 729
434 $GAUGES = { 730 $GAUGES = {
435 exp => $exp, win => $win, range => $rng, 731 exp => $exp, win => $win, range => $rng,
436 food => $fg, mana => $mg, hp => $hg, grace => $gg 732 food => $fg, mana => $mg, hp => $hg, grace => $gg
437 }; 733 };
… …
439 &set_gauge_window_fontsize; 735 &set_gauge_window_fontsize;
440 736
441 $win 737 $win
442} 738}
443 739
740sub debug_setup {
741 my $table = new CFPlus::UI::Table;
444 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
445sub make_stats_window { 770sub stats_window {
446 my $tgw = new CFClient::UI::FancyFrame 771 my $r = new CFPlus::UI::ScrolledWindow (
447 y => $HEIGHT * (2/8), 772 expand => 1,
448 x => "max", 773 scroll_y => 1
449 title => "Stats", 774 );
450 name => "stats_window"; 775 $r->add (my $vb = new CFPlus::UI::VBox);
451 776
452 $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
453 $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,
454 can_hover => 1, can_events => 1, 783 can_hover => 1, can_events => 1,
455 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.");
456 $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,
457 can_hover => 1, can_events => 1, 786 can_hover => 1, can_events => 1,
458 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).");
459 788
460 $vb->add (my $hb0 = new CFClient::UI::HBox); 789 $pi->add (my $hb0 = new CFPlus::UI::HBox);
461 $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,
462 can_hover => 1, can_events => 1, 791 can_hover => 1, can_events => 1,
463 tooltip => "The weight of the player including all inventory items."); 792 tooltip => "The weight of the player including all inventory items.");
464 $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,
465 can_hover => 1, can_events => 1, 794 can_hover => 1, can_events => 1,
466 tooltip => "The weight limit: you cannot carry more than this."); 795 tooltip => "The weight limit: you cannot carry more than this.");
467 796
468 797 $vb->add (new CFPlus::UI::FancyFrame
798 label => "Primary/Secondary Statistics",
469 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 799 child => (my $hb = new CFPlus::UI::HBox expand => 1),
800 );
470 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 801 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
471 802
472 my $color2 = [1, 1, 0]; 803 my $color2 = [1, 1, 0];
473 804
474 for ( 805 for (
475 [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],
476 [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],
477 [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],
478 [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],
479 [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],
480 [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],
481 [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],
482 813
483 [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],
484 [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],
485 [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],
486 [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],
487 [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],
488 [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],
489 ) { 820 ) {
490 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 821 my ($col, $row, $id, $label, $template) = @$_;
491 822
492 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 823 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
493 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");
494 $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
495 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");
496 } 829 }
497 830
831 $vb->add (new CFPlus::UI::FancyFrame
832 label => "Resistancies",
498 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 833 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
834 );
499 835
500 my $row = 0; 836 my $row = 0;
501 my $col = 0; 837 my $col = 0;
502 838
503 my %resist_names = ( 839 my %resist_names = (
840 slow => ["Slow",
504 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",
505 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",
506 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",
507 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",
508 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",
509 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",
510 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",
511 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",
512 pois => "<b>Poison</b> (resistance to getting poisoned)", 857 "<b>Poison</b> (resistance to getting poisoned)"],
858 para => ["Paralysation",
513 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",
514 deat => "<b>Death</b> (resistance against death spells)", 861 "<b>Death</b> (resistance against death spells)"],
515 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",
516 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",
517 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",
518 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",
519 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",
520 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",
521 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)"],
522 ); 876 );
523 for (qw/slow holyw conf fire depl magic 877 for (qw/slow holyw conf fire depl magic
524 drain acid pois para deat phys 878 drain acid pois para deat phys
525 blind fear tund elec cold ghit/) 879 blind fear tund elec cold ghit/)
526 { 880 {
527 $tbl2->add ($col, $row, 881 $tbl2->add ($col, $row,
528 $STATWIDS->{"res_$_"} = 882 $STATWIDS->{"res_$_"} =
529 new CFClient::UI::Label 883 new CFPlus::UI::Label
530 font => $FONT_FIXED, 884 font => $FONT_FIXED,
531 template => "-100%", 885 template => "-100%",
532 align => +1, 886 align => +1,
533 valign => 0, 887 valign => 0,
534 can_events => 1, 888 can_events => 1,
535 can_hover => 1, 889 can_hover => 1,
536 tooltip => $resist_names{$_}, 890 tooltip => $resist_names{$_}->[1],
537 ); 891 );
538 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 892 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
539 font => $FONT_FIXED, 893 font => $FONT_FIXED,
540 can_hover => 1, 894 can_hover => 1,
541 can_events => 1, 895 can_events => 1,
542 image => "ui/resist/resist_$_.png", 896 path => "ui/resist/resist_$_.png",
543 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],
544 ); 905 );
545 906
546 $row++; 907 $row++;
547 if ($row % 6 == 0) { 908 if ($row % 6 == 0) {
548 $col += 2; 909 $col += 3;
549 $row = 0; 910 $row = 0;
550 } 911 }
551 } 912 }
552 913
553 &set_stats_window_fontsize;
554 update_stats_window ({}); 914 #update_stats_window ({});
555 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]);
556 $tgw 922 $sw
557} 923}
558 924
559sub formsep($) { 925sub formsep($) {
560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 926 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
561} 927}
562 928
563sub update_stats_window {
564 my ($stats) = @_;
565
566 # I love text protocols...
567
568 my $hp = $stats->{+CS_STAT_HP} * 1;
569 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
570 my $sp = $stats->{+CS_STAT_SP} * 1;
571 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
572 my $fo = $stats->{+CS_STAT_FOOD} * 1;
573 my $fo_m = 999;
574 my $gr = $stats->{+CS_STAT_GRACE} * 1;
575 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
576
577 $GAUGES->{hp} ->set_value ($hp, $hp_m);
578 $GAUGES->{mana} ->set_value ($sp, $sp_m);
579 $GAUGES->{food} ->set_value ($fo, $fo_m);
580 $GAUGES->{grace} ->set_value ($gr, $gr_m);
581 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
582 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
583 my $rng = $stats->{+CS_STAT_RANGE};
584 $rng =~ s/^Range: //; # thank you so much dear server
585 $GAUGES->{range} ->set_text ("Rng: " . $rng);
586 my $title = $stats->{+CS_STAT_TITLE};
587 $title =~ s/^Player: //;
588 $STATWIDS->{title} ->set_text ("Title: " . $title);
589
590 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
591 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
592 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
593 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
594 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
595 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
596 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
597 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
598 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
599 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
600 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
601 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
602 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
603
604 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
605
606 # TODO: replace by CS_STAT_RES_xxx constants
607 my %tbl = (
608 phys => 100,
609 magic => 101,
610 fire => 102,
611 elec => 103,
612 cold => 104,
613 conf => 105,
614 acid => 106,
615 drain => 107,
616 ghit => 108,
617 pois => 109,
618 slow => 110,
619 para => 111,
620 tund => 112,
621 fear => 113,
622 depl => 113,
623 deat => 115,
624 holyw => 116,
625 blind => 117,
626 );
627
628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
629 for keys %tbl;
630}
631
632my $METASERVER_ATIME; 929my $METASERVER_ATIME;
633 930
634sub update_metaserver { 931sub update_metaserver {
932 my ($metaserver_dialog) = @_;
933
934 $METASERVER = $metaserver_dialog
935 if defined $metaserver_dialog;
936
635 return if $METASERVER_ATIME > time; 937 return if $METASERVER_ATIME > time;
636 $METASERVER_ATIME = time + 60; 938 $METASERVER_ATIME = time + 60;
637 939
638 my $table = $METASERVER->{table}; 940 my $table = $METASERVER->{table};
639 $table->clear; 941 $table->clear;
640 $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...");
641 943
642 my $buf; 944 my $ok = 0;
643 945
644 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 946 CFPlus::background {
947 my $ua = CFPlus::lwp_useragent;
645 948
646 unless ($fh) { 949 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
647 $label->set_text ("unable to contact metaserver: $!"); 950 } sub {
648 return; 951 my ($msg) = @_;
649 } 952 if ($msg) {
650
651 Event->io (fd => $fh, poll => 'r', cb => sub {
652 my $res = sysread $fh, $buf, 8192, length $buf;
653
654 if (!defined $res) {
655 $_[0]->w->cancel;
656 $label->set_text ("error while retrieving server list: $!");
657 } elsif ($res == 0) {
658 $_[0]->w->cancel;
659 status "server list retrieved";
660
661 utf8::decode $buf if utf8::valid $buf;
662
663 $table->clear; 953 $table->clear;
664 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 );
665 my @col = qw(Use #Users Host Uptime Version Description); 962 my @col = qw(#Users Host Uptime Version Description);
666 $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[$_])
667 for 0 .. $#col; 967 for 0 .. $#col;
668 968
669 my @align = qw(1 0 1 1 -1); 969 my @align = qw(1 0 1 1 -1);
670 970
671 my $y = 0; 971 my $y = 0;
672 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 972 for my $m (@{ $msg->{servers} }) {
673 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)};
674 975
675 for ($desc) { 976 for ($desc) {
676 s/<br>/\n/gi; 977 s/<br>/\n/gi;
677 s/<li>/\n· /gi; 978 s/<li>/\n· /gi;
678 s/<.*?>//sgi; 979 s/<.*?>//sgi;
679 s/&/&amp;/g; 980 s/&amp;/&/g;
680 s/</&lt;/g; 981 s/&lt;/</g;
681 s/>/&gt;/g; 982 s/&gt;/>/g;
682 } 983 }
683 984
684 $uptime = sprintf "%dd %02d:%02d:%02d", 985 $uptime = sprintf "%dd %02d:%02d:%02d",
685 (int $m->[8] / 86400), 986 (int $uptime / 86400),
686 (int $m->[8] / 3600) % 24, 987 (int $uptime / 3600) % 24,
687 (int $m->[8] / 60) % 60, 988 (int $uptime / 60) % 60,
688 $m->[8] % 60; 989 $uptime % 60;
689 990
690 $m = [$users, $host, $uptime, $version, $desc]; 991 $m = [$users, $host, $uptime, $version, $desc];
691 992
692 $y++; 993 $y++;
693 994
694 $table->add (0, $y, new CFClient::UI::VBox children => [ 995 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
695 (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 {
696 $HOST_ENTRY->set_text ($CFG->{host} = $host); 1000 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
697 $METASERVER->toggle_visibility; 1001 $METASERVER->hide;
1002 0
1003 },
698 }), 1004 ),
699 (new CFClient::UI::Empty expand => 1), 1005 (new CFPlus::UI::Empty expand => 1),
700 ]); 1006 ]);
701 1007
702 $table->add ($_ + 1, $y, new CFClient::UI::Label 1008 $table->add ($_, $y, new CFPlus::UI::Label
703 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)
704 for 0 .. $#$m; 1018 for 0 .. $#$m;
705 } 1019 }
1020 } else {
1021 $ok or $label->set_text ("error while contacting metaserver");
706 } 1022 }
707 }); 1023 };
1024
708} 1025}
709 1026
710sub metaserver_dialog { 1027sub metaserver_dialog {
711 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
712 title => "Server List", 1033 title => "Server List",
713 name => 'metaserver_dialog', 1034 name => 'metaserver_dialog',
714 x => 'center', 1035 x => 'center',
715 y => 'center', 1036 y => 'center',
716 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,
717 on_visibility_change => sub { 1043 on_visibility_change => sub {
718 update_metaserver if $_[1]; 1044 update_metaserver ($_[0]) if $_[1];
1045 0
719 }, 1046 },
720 ; 1047 ;
721 1048
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723
724 $dialog 1049 $dialog
725} 1050}
726 1051
727sub server_setup { 1052sub server_setup {
728 my $vbox = new CFClient::UI::VBox; 1053 my $vbox = new CFPlus::UI::VBox;
729 1054
1055 $vbox->add (new CFPlus::UI::FancyFrame
1056 label => "Connection Settings",
730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1057 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1058 );
731 $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");
732 1060
733 { 1061 {
734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1062 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
735 1063
736 $vbox->add ( 1064 $vbox->add (
737 $HOST_ENTRY = new CFClient::UI::Entry 1065 $HOST_ENTRY = new CFPlus::UI::Entry
738 expand => 1, 1066 expand => 1,
739 text => $CFG->{host}, 1067 text => $CFG->{profile}{default}{host},
740 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",
741 on_changed => sub { 1069 on_changed => sub {
742 my ($self, $value) = @_; 1070 my ($self, $value) = @_;
743 $CFG->{host} = $value; 1071 $CFG->{profile}{default}{host} = $value;
1072 0
744 } 1073 }
745 ); 1074 );
746 1075
747 $METASERVER = metaserver_dialog;
748
749 $vbox->add (new CFClient::UI::Button 1076 $vbox->add (new CFPlus::UI::Button
750 expand => 1, 1077 expand => 1,
751 text => "Server List", 1078 text => "Server List",
752 other => $METASERVER, 1079 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 1080 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 1081 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1082 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
755 ); 1083 );
756 } 1084 }
757 1085
758 $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");
759 $table->add (1, 4, new CFClient::UI::Entry 1087 $table->add (1, 4, new CFPlus::UI::Entry
760 text => $CFG->{user}, 1088 text => $CFG->{profile}{default}{user},
761 tooltip => "The name of your character on the server", 1089 tooltip => "The name of your character on the server",
762 on_changed => sub { 1090 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
763 my ($self, $value) = @_;
764 $CFG->{user} = $value;
765 }
766 ); 1091 );
767 1092
768 $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");
769 $table->add (1, 5, new CFClient::UI::Entry 1094 $table->add (1, 5, new CFPlus::UI::Entry
770 text => $CFG->{password}, 1095 text => $CFG->{profile}{default}{password},
771 hidden => 1, 1096 hidden => 1,
772 tooltip => "The password for your character", 1097 tooltip => "The password for your character",
773 on_changed => sub { 1098 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
774 my ($self, $value) = @_;
775 $CFG->{password} = $value;
776 }
777 ); 1099 );
778 1100
779 $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");
780 $table->add (1, 7, new CFClient::UI::Slider 1102 $table->add (1, 7, new CFPlus::UI::Slider
781 force_w => 100, 1103 force_w => 100,
782 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1104 range => [$CFG->{mapsize}, 10, 100, 0, 1],
783 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. "
784 . "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, "
785 . "but you also increase bandwidth requirements and latency. " 1107 . "but you also increase bandwidth requirements and latency. "
786 . "This option is only used once at log-in.", 1108 . "This option is only used once at log-in.",
787 on_changed => sub { 1109 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
788 my ($self, $value) = @_;
789
790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
791 },
792 ); 1110 );
793 1111
794 $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");
795 $table->add (1, 8, new CFClient::UI::CheckBox 1113 $table->add (1, 8, new CFPlus::UI::CheckBox
796 state => $CFG->{face_prefetch}, 1114 state => $CFG->{face_prefetch},
797 tooltip => "<b>Background Image Prefetch</b>\n\n" 1115 tooltip => "<b>Background Image Prefetch</b>\n\n"
798 . "If enabled, the client automatically pre-fetches images from the server. " 1116 . "If enabled, the client automatically pre-fetches images from the server. "
799 . "This might increase or create lag, but increases the chances " 1117 . "This might increase or create lag, but increases the chances "
800 . "of faces being ready for display when you encounter them. " 1118 . "of faces being ready for display when you encounter them. "
801 . "It also uses up server bandwidth on every connect, " 1119 . "It also uses up server bandwidth on every connect, "
802 . "so only set it if you really need to prefetch images. " 1120 . "so only set it if you really need to prefetch images. "
803 . "This option can be set and unset any time.", 1121 . "This option can be set and unset any time.",
804 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1122 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805 ); 1123 );
806 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
807 $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");
808 $table->add (1, 9, new CFClient::UI::Entry 1135 $table->add (1, 10, new CFPlus::UI::Entry
809 text => $CFG->{output_count}, 1136 text => $CFG->{output_count},
810 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.",
811 on_changed => sub { $CFG->{output_count} = $_[1] }, 1138 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812 ); 1139 );
813 1140
814 $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");
815 $table->add (1, 10, new CFClient::UI::Entry 1142 $table->add (1, 11, new CFPlus::UI::Entry
816 text => $CFG->{output_sync}, 1143 text => $CFG->{output_sync},
817 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.",
818 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1145 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819 ); 1146 );
820 1147
821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1148 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
822 expand => 1, 1149 expand => 1,
823 align => 0, 1150 align => 0,
824 text => "Login", 1151 text => "Login",
825 on_activate => sub { 1152 on_activate => sub {
826 $CONN ? stop_game 1153 $CONN ? stop_game
827 : start_game; 1154 : start_game;
1155 0
828 }, 1156 },
829 ); 1157 );
830 1158
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
831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1172 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1173 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
833 text => $CFG->{say_command}, 1174 text => $CFG->{say_command},
834 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. " 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. "
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1176 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1177 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub { 1178 on_changed => sub {
838 my ($self, $value) = @_; 1179 my ($self, $value) = @_;
839 $CFG->{say_command} = $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
840 } 1206 },
841 ); 1207 );
842 1208
843 $vbox 1209 $table
844} 1210}
845 1211
846sub message_window { 1212sub message_window {
847 my $window = new CFClient::UI::FancyFrame 1213 my $window = new CFPlus::UI::Toplevel
848 name => "message_window", 1214 name => "message_window",
849 title => "Messages", 1215 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1216 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75],
852 x => "max", 1217 x => "max",
853 y => 0, 1218 y => 0,
854 force_w => $::WIDTH / 3, 1219 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1220 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1221 child => (my $vbox = new CFPlus::UI::VBox),
1222 has_close_button => 1;
857 1223
858 $vbox->add ($LOGVIEW); 1224 $vbox->add ($LOGVIEW);
859 1225
860 $vbox->add (my $input = new CFClient::UI::Entry 1226 $vbox->add (my $input = new CFPlus::UI::Entry
861 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> "
862 . "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>...). "
863 . "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). "
864 . "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.",
865 on_focus_in => sub { 1231 on_focus_in => sub {
… …
869 1235
870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1236 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
871 $input->{refocus_map} = 1; 1237 $input->{refocus_map} = 1;
872 } 1238 }
873 delete $input->{auto_activated}; 1239 delete $input->{auto_activated};
1240
1241 0
874 }, 1242 },
875 on_activate => sub { 1243 on_activate => sub {
876 my ($input, $text) = @_; 1244 my ($input, $text) = @_;
877 $input->set_text (''); 1245 $input->set_text ('');
878 1246
… …
884 } 1252 }
885 if ($input->{refocus_map}) { 1253 if ($input->{refocus_map}) {
886 delete $input->{refocus_map}; 1254 delete $input->{refocus_map};
887 $MAPWIDGET->focus_in 1255 $MAPWIDGET->focus_in
888 } 1256 }
1257
1258 0
889 }, 1259 },
890 on_escape => sub { 1260 on_escape => sub {
891 $MAPWIDGET->focus_in 1261 $MAPWIDGET->grab_focus;
1262
1263 0
892 }, 1264 },
893 ); 1265 );
894 1266
895 $CONSOLE = { 1267 $CONSOLE = {
896 window => $window, 1268 window => $window,
… …
898 }; 1270 };
899 1271
900 $window 1272 $window
901} 1273}
902 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, debug => 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
903sub open_quit_dialog { 1617sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1618 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1619 $QUIT_DIALOG = new CFPlus::UI::Toplevel
906 x => "center", 1620 x => "center",
907 y => "center", 1621 y => "center",
1622 z => 50,
908 title => "Really Quit?", 1623 title => "Really Quit?",
1624 on_key_down => sub {
1625 my ($dialog, $ev) = @_;
1626 $ev->{sym} == 27 and $dialog->hide;
1627 }
909 ; 1628 ;
910 1629
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1630 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
912 1631
913 $vb->add (new CFClient::UI::Label 1632 $vb->add (new CFPlus::UI::Label
914 text => "You should find a savebed and apply it first!", 1633 text => "You should find a savebed and apply it first!",
915 max_w => $WIDTH * 0.25, 1634 max_w => $WIDTH * 0.25,
916 ellipsize => 0, 1635 ellipsize => 0,
917 ); 1636 );
918 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1637 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
919 $hb->add (new CFClient::UI::Button 1638 $hb->add (new CFPlus::UI::Button
920 text => "Ok", 1639 text => "Ok",
921 expand => 1, 1640 expand => 1,
922 on_activate => sub { $QUIT_DIALOG->hide }, 1641 on_activate => sub { $QUIT_DIALOG->hide; 0 },
923 ); 1642 );
924 $hb->add (new CFClient::UI::Button 1643 $hb->add (new CFPlus::UI::Button
925 text => "Quit anyway", 1644 text => "Quit anyway",
926 expand => 1, 1645 expand => 1,
927 on_activate => sub { exit }, 1646 on_activate => sub { exit },
928 ); 1647 );
929 } 1648 }
930 1649
931 $QUIT_DIALOG->show; 1650 $QUIT_DIALOG->show;
1651 $QUIT_DIALOG->grab_focus;
932} 1652}
933 1653
934sub autopickup_setup { 1654sub show_tip_of_the_day {
935 my $table = new CFClient::UI::Table; 1655 # find all tips
1656 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
936 1657
937 for ( 1658 CFPlus::DB::get state => "tip_of_the_day", sub {
938 ["General", 0, 0, 1659 my ($todindex) = @_;
939 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1660 $todindex = 0 if $todindex >= @tod;
940 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1661 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
941 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
942 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
943 ],
944 ["Weapons", 0, 6,
945 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
946 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
947 ["Bows" => CFClient::Pickup::PU_BOW],
948 ["Arrows" => CFClient::Pickup::PU_ARROW],
949 ],
950 ["Armour", 0, 12,
951 ["Helmets" => CFClient::Pickup::PU_HELMET],
952 ["Shields" => CFClient::Pickup::PU_SHIELD],
953 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
954 ["Boots" => CFClient::Pickup::PU_BOOTS],
955 ["Gloves" => CFClient::Pickup::PU_GLOVES],
956 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
957 ],
958 1662
959 ["Readables", 2, 2, 1663 # create dialog
960 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1664 my $dialog;
961 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
962 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
963 ],
964 ["Misc", 2, 7,
965 ["Food" => CFClient::Pickup::PU_FOOD],
966 ["Drinks" => CFClient::Pickup::PU_DRINK],
967 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
968 ["Keys" => CFClient::Pickup::PU_KEY],
969 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
970 ["Potions" => CFClient::Pickup::PU_POTION],
971 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
972 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
973 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
974 ],
975 )
976 {
977 my ($title, $x, $y, @bits) = @$_;
978 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
979 1665
980 for (@bits) { 1666 my $close = sub {
981 ++$y; 1667 $dialog->destroy;
982
983 my $mask = $_->[1];
984 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
985 $table->add ($x+1, $y, new CFClient::UI::CheckBox
986 state => $CFG->{pickup} & $mask,
987 on_changed => sub {
988 my ($box, $value) = @_;
989 if ($value) {
990 $::CFG->{pickup} |= $mask;
991 } else {
992 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
993 }
994 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
995 if defined $::CONN;
996 });
997 } 1668 };
998 }
999 1669
1000 $table 1670 $dialog = new CFPlus::UI::Toplevel
1001}
1002
1003sub make_inventory_window {
1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center", 1671 x => "center",
1006 y => "center", 1672 y => "center",
1007 force_w => $WIDTH * 9/10, 1673 z => 3,
1008 force_h => $HEIGHT * 9/10, 1674 name => 'tip_of_the_day',
1009 title => "Inventory",
1010 ;
1011
1012 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1013
1014 $hb->add (my $vb1 = new CFClient::UI::VBox);
1015 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1016 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
1017
1018 $hb->add (my $vb2 = new CFClient::UI::VBox);
1019
1020 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1021
1022 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1023
1024 # XXX: Call after $INVR = ... because set_opencont sets the items
1025 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1026
1027 $invwin
1028}
1029
1030sub spell_setup {
1031 new CFClient::UI::SpellList
1032}
1033
1034sub keyboard_setup {
1035 my $binding_list = new CFClient::UI::VBox;
1036
1037 my $refresh;
1038 $refresh = sub {
1039 $binding_list->clear ();
1040
1041 for my $mod (keys %{$::CFG->{bindings}}) {
1042 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1043 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1044 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1045
1046 my $lbl = join "; ", @$cmds;
1047 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1048 $binding_list->add (my $hb = new CFClient::UI::HBox);
1049 $hb->add (new CFClient::UI::Button
1050 text => "delete",
1051 tooltip => "Deletes the binding",
1052 on_activate => sub {
1053 $binding_list->remove ($hb);
1054 delete $::CFG->{bindings}->{$mod}->{$sym};
1055 });
1056
1057 $hb->add (new CFClient::UI::Button
1058 text => "edit",
1059 tooltip => "Edits the binding",
1060 on_activate => sub {
1061 $::BIND_EDITOR->set_binding (
1062 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1063 sub {
1064 my ($nmod, $nsym, $ncmds) = @_;
1065 delete $::CFG->{bindings}->{$mod}->{$sym};
1066 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1067 $refresh->();
1068 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1069 $SETUP_DIALOG->show;
1070 },
1071 sub {
1072 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1073 $SETUP_DIALOG->show;
1074 });
1075 $::BIND_EDITOR->show;
1076 $SETUP_DIALOG->hide;
1077 });
1078
1079 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1080 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1081 }
1082 }
1083 };
1084
1085 my $vb = new CFClient::UI::VBox;
1086 $vb->add ($binding_list);
1087 $vb->add (my $hb = new CFClient::UI::HBox);
1088
1089 $hb->add (new CFClient::UI::Button
1090 text => "record new",
1091 expand => 1,
1092 tooltip => "This button opens the binding editor with an empty binding.",
1093 on_activate => sub {
1094 $::BIND_EDITOR->set_binding (undef, undef, [],
1095 sub {
1096 my ($mod, $sym, $cmds) = @_;
1097 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1098 $refresh->();
1099 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1100 $SETUP_DIALOG->show;
1101 },
1102 sub {
1103 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1104 $SETUP_DIALOG->show;
1105 });
1106 $SETUP_DIALOG->hide;
1107 $::BIND_EDITOR->show;
1108 },
1109 );
1110
1111 $hb->add (new CFClient::UI::Button
1112 text => "close",
1113 tooltip => "Closes the binding window",
1114 expand => 1,
1115 on_activate => sub {
1116 $SETUP_DIALOG->hide;
1117 }
1118 );
1119
1120 $refresh->();
1121
1122 $vb
1123}
1124
1125sub make_help_window {
1126 my $win = new CFClient::UI::FancyFrame
1127 x => 'center',
1128 y => 'center',
1129 name => 'doc_browser',
1130 force_w => int $WIDTH * 7/8, 1675 force_w => int $WIDTH * 4/9,
1131 force_h => int $HEIGHT * 7/8, 1676 force_h => int $WIDTH * 2/9,
1132 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 ;
1133 1682
1134 $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]);
1135 1686
1136 $vbox->add (my $buttons = new CFClient::UI::HBox); 1687 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1137 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1138 1688
1139 for ( 1689 $table->add (0, 0, new CFPlus::UI::Button
1140 [intro => "Introduction"],
1141 [manual => "Manual"],
1142 [command_help => "Commands"],
1143 [skill_help => "Skills"],
1144 ) {
1145 my ($pod, $label) = @$_;
1146
1147 $buttons->add (new CFClient::UI::Button
1148 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>.",
1149 on_activate => sub { 1698 on_activate => sub {
1150 my $parser = new Pod::POM; 1699 $close->();
1151 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1700 &show_tip_of_the_day;
1152
1153 $viewer->clear;
1154
1155 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1156 for @{ CFClient::pod_to_pango_list $pom };
1157
1158 $viewer->set_offset (0);
1159 }, 1701 },
1160 ); 1702 );
1703
1704 $dialog->show;
1161 } 1705 };
1162
1163 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1164
1165 $win
1166} 1706}
1167 1707
1168sub sdl_init { 1708sub sdl_init {
1169 CFClient::SDL_Init 1709 CFPlus::SDL_Init
1170 and die "SDL::Init failed!\n"; 1710 and die "SDL::Init failed!\n";
1171} 1711}
1172 1712
1173sub video_init { 1713sub video_init {
1174 sdl_init; 1714 sdl_init;
… …
1179 1719
1180 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1720 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1181 $FULLSCREEN = $CFG->{fullscreen}; 1721 $FULLSCREEN = $CFG->{fullscreen};
1182 $FAST = $CFG->{fast}; 1722 $FAST = $CFG->{fast};
1183 1723
1184 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1724 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1185 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1725 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1186 1726
1187 $SDL_ACTIVE = 1; 1727 $SDL_ACTIVE = 1;
1188 $LAST_REFRESH = time - 0.01; 1728 $LAST_REFRESH = time - 0.01;
1189 1729
1190 CFClient::OpenGL::init; 1730 CFPlus::OpenGL::init;
1191 1731
1192 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1732 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1193 1733
1194 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1734 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1195 1735
1196 ############################################################################# 1736 #############################################################################
1197 1737
1198 if ($DEBUG_STATUS) { 1738 if ($DEBUG_STATUS) {
1199 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1739 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1200 } else { 1740 } else {
1201 # create the widgets 1741 # create the widgets
1202 1742
1203 $DEBUG_STATUS = new CFClient::UI::Label 1743 $DEBUG_STATUS = new CFPlus::UI::Label
1204 padding => 0, 1744 padding => 0,
1205 z => 100, 1745 z => 100,
1206 force_x => "max", 1746 force_x => "max",
1207 force_y => 0; 1747 force_y => 0;
1208 $DEBUG_STATUS->show; 1748 $DEBUG_STATUS->show;
1209 1749
1210 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1211
1212 $STATUSBOX = new CFClient::UI::Statusbox; 1750 $STATUSBOX = new CFPlus::UI::Statusbox;
1213 $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]);
1214 1752
1215 (new CFClient::UI::Frame 1753 (new CFPlus::UI::Frame
1216 bg => [0, 0, 0, 0.4], 1754 bg => [0, 0, 0, 0.4],
1217 force_x => 0, 1755 force_x => 0,
1218 force_y => "max", 1756 force_y => "max",
1219 child => $STATUSBOX, 1757 child => $STATUSBOX,
1220 )->show; 1758 )->show;
1221 1759
1222 CFClient::UI::FancyFrame->new ( 1760 CFPlus::UI::Toplevel->new (
1223 title => "Map", 1761 title => "Map",
1224 name => "mapmap", 1762 name => "mapmap",
1225 x => 0, 1763 x => 0,
1226 y => $FONTSIZE + 8, 1764 y => $FONTSIZE + 8,
1227 border_bg => [1, 1, 1, 192/255], 1765 border_bg => [1, 1, 1, 192/255],
1228 bg => [1, 1, 1, 0], 1766 bg => [1, 1, 1, 0],
1229 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1767 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1230 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.",
1231 ), 1769 ),
1232 )->show; 1770 )->show;
1233 1771
1234 $MAPWIDGET = new CFClient::MapWidget; 1772 $MAPWIDGET = new CFPlus::MapWidget;
1235 $MAPWIDGET->connect (activate_console => sub { 1773 $MAPWIDGET->connect (activate_console => sub {
1236 my ($mapwidget, $preset) = @_; 1774 my ($mapwidget, $preset) = @_;
1237 1775
1238 if ($CONSOLE) { 1776 if ($CONSOLE) {
1239 $CONSOLE->{input}->{auto_activated} = 1; 1777 $CONSOLE->{input}->{auto_activated} = 1;
1240 $CONSOLE->{input}->focus_in; 1778 $CONSOLE->{input}->grab_focus;
1241 1779
1242 if ($preset && $CONSOLE->{input}->get_text eq '') { 1780 if ($preset && $CONSOLE->{input}->get_text eq '') {
1243 $CONSOLE->{input}->set_text ($preset); 1781 $CONSOLE->{input}->set_text ($preset);
1244 } 1782 }
1245 } 1783 }
1246 }); 1784 });
1247 $MAPWIDGET->show; 1785 $MAPWIDGET->show;
1248 $MAPWIDGET->focus_in; 1786 $MAPWIDGET->grab_focus;
1249 1787
1250 $LOGVIEW = new CFClient::UI::TextView 1788 $LOGVIEW = new CFPlus::UI::TextScroller
1251 expand => 1, 1789 expand => 1,
1252 font => $FONT_FIXED, 1790 font => $FONT_FIXED,
1253 fontsize => $::CFG->{log_fontsize}, 1791 fontsize => $::CFG->{log_fontsize},
1792 indent => -4,
1254 can_hover => 1, 1793 can_hover => 1,
1255 can_events => 1, 1794 can_events => 1,
1795 max_par => $CFG->{logview_max_par},
1256 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.",
1257 ; 1797 ;
1258 1798
1259 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1799 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1260 title => "Setup", 1800 title => "Setup",
1261 name => "setup_dialog", 1801 name => "setup_dialog",
1262 x => 'center', 1802 x => 'center',
1263 y => 'center', 1803 y => 'center',
1804 z => 2,
1264 force_w => $::WIDTH * 0.6, 1805 force_w => $::WIDTH * 0.6,
1265 force_h => $::HEIGHT * 0.6, 1806 force_h => $::HEIGHT * 0.6,
1807 has_close_button => 1,
1266 ; 1808 ;
1267 1809
1810 $METASERVER = metaserver_dialog;
1811
1268 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1812 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1269 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1813 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1270 1814
1271 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1815 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1272 "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.");
1273 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1817 $SETUP_NOTEBOOK->add (Client => client_setup,
1274 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1818 "Configure various client-specific settings.");
1275 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1819 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1276 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1820 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1277 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1821 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1278 "Configure the use of audio, sound effects and background music."); 1822 "Configure the use of audio, sound effects and background music.");
1279 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1823 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1280 "Lets you define, edit and delete bindings." 1824 "Lets you define, edit and delete key bindings."
1281 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor " 1825 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1282 . "with nothing set and the recording started. After doing the actions you " 1826 . "with nothing set and the recording started. After doing the actions you "
1283 . "want to record press Insert and you will be asked to press a key-combo." 1827 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1284 . "After pressing the combo the binding will be saved automatically and the " 1828 . "After pressing the combo the binding will be saved automatically and the "
1285 . "binding editor closes"); 1829 . "binding editor closes");
1286 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1830 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1287 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1831 "Some debuggin' options. Do not ask.");
1288 1832
1289 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1833 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1290 1834
1291 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1835 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1292 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1836 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1293 1837
1294 $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,
1295 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.");
1296 1840
1297 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
1298 1842
1299 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1300 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1843 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1302 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1844 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1303 ."You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1304 1845
1305 $BUTTONBAR->add (new CFClient::UI::Button 1846 $BUTTONBAR->add (new CFPlus::UI::Button
1306 text => "Save Config", 1847 text => "Save Config",
1307 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.",
1308 on_activate => sub { 1849 on_activate => sub {
1309 $::CFG->{layout} = CFClient::UI::get_layout; 1850 $::CFG->{layout} = CFPlus::UI::get_layout;
1310 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1851 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1311 status "Configuration Saved"; 1852 status "Configuration Saved";
1853 0
1312 }, 1854 },
1313 ); 1855 );
1314 1856
1315 $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,
1316 tooltip => "View Documentation"); 1858 tooltip => "View Documentation");
1317 1859
1860
1318 $BUTTONBAR->add (new CFClient::UI::Button 1861 $BUTTONBAR->add (new CFPlus::UI::Button
1319 text => "Quit", 1862 text => "Quit",
1320 tooltip => "Terminates the program", 1863 tooltip => "Terminates the program",
1321 on_activate => sub { 1864 on_activate => sub {
1322 if ($CONN) { 1865 if ($CONN) {
1323 open_quit_dialog; 1866 open_quit_dialog;
1324 } else { 1867 } else {
1325 exit; 1868 exit;
1326 } 1869 }
1870 0
1327 }, 1871 },
1328 ); 1872 );
1329 1873
1330 $BUTTONBAR->show; 1874 $BUTTONBAR->show;
1331 $SETUP_DIALOG->show; 1875 $SETUP_DIALOG->show;
1332 } 1876 }
1333 1877
1334 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1878 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1335} 1879}
1336 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;
1998}
1999
1337sub video_shutdown { 2000sub video_shutdown {
2001 CFPlus::OpenGL::shutdown;
2002
1338 undef $SDL_ACTIVE; 2003 undef $SDL_ACTIVE;
1339} 2004}
1340 2005
1341my @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#
1342my $bgmusic;#TODO#hack#d# 2007my $bgmusic;#TODO#hack#d#
… …
1349 2014
1350sub audio_music_finished { 2015sub audio_music_finished {
1351 return unless $CFG->{bgm_enable}; 2016 return unless $CFG->{bgm_enable};
1352 2017
1353 # TODO: hack, do play loop and mood music 2018 # TODO: hack, do play loop and mood music
1354 $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]";
1355 $bgmusic->play (0); 2020 $bgmusic->play (0);
1356 2021
1357 push @bgmusic, shift @bgmusic; 2022 push @bgmusic, shift @bgmusic;
1358} 2023}
1359 2024
1360sub audio_init { 2025sub audio_init {
1361 if ($CFG->{audio_enable}) { 2026 if ($CFG->{audio_enable}) {
1362 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2027 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1363 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2028 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1364 2029
1365 unless ($SDL_MIXER) { 2030 unless ($SDL_MIXER) {
1366 status "Unable to open sound device: there will be no sound"; 2031 status "Unable to open sound device: there will be no sound";
1367 return; 2032 return;
1368 } 2033 }
1369 2034
1370 CFClient::Mix_AllocateChannels 8; 2035 CFPlus::Mix_AllocateChannels 8;
1371 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2036 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1372 2037
1373 audio_music_finished; 2038 audio_music_finished;
1374 2039
2040 local $_;
1375 while (<$fh>) { 2041 while (<$fh>) {
1376 next if /^\s*#/; 2042 next if /^\s*#/;
1377 next if /^\s*$/; 2043 next if /^\s*$/;
1378 2044
1379 my ($file, $volume, $event) = split /\s+/, $_, 3; 2045 my ($file, $volume, $event) = split /\s+/, $_, 3;
1380 2046
1381 push @SOUNDS, "$volume,$file"; 2047 push @SOUNDS, "$volume,$file";
1382 2048
1383 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2049 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1384 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";
1385 $chunk->volume ($volume * 128 / 100); 2051 $chunk->volume ($volume * 128 / 100);
1386 $chunk 2052 $chunk
1387 }; 2053 };
1388 } 2054 }
1389 } else { 2055 } else {
… …
1391 } 2057 }
1392 } 2058 }
1393} 2059}
1394 2060
1395sub audio_shutdown { 2061sub audio_shutdown {
1396 CFClient::Mix_CloseAudio if $SDL_MIXER; 2062 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1397 undef $SDL_MIXER; 2063 undef $SDL_MIXER;
1398 @SOUNDS = (); 2064 @SOUNDS = ();
1399 %AUDIO_CHUNKS = (); 2065 %AUDIO_CHUNKS = ();
1400} 2066}
1401 2067
… …
1408 2074
1409sub force_refresh { 2075sub force_refresh {
1410 $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;
1411 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2077 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1412 2078
1413 $CFClient::UI::ROOT->draw; 2079 $CFPlus::UI::ROOT->draw;
1414 2080
1415 $WANT_REFRESH = 0; 2081 $WANT_REFRESH = 0;
1416 $CAN_REFRESH = 0; 2082 $CAN_REFRESH = 0;
1417 $LAST_REFRESH = $NOW; 2083 $LAST_REFRESH = $NOW;
1418 2084
14190 && do {
1420 # some weird model-drawing code, just a joke right now
1421 use CFClient::OpenGL;
1422
1423 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1424 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1425 $demo{r} ||= do {
1426 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1427 $mod->{v} = pack "f*", @{$mod->{v}};
1428 $_ = [scalar @$_, pack "S!*", @$_]
1429 for values %{$mod->{g}};
1430 $mod
1431 };
1432
1433 my $r = $demo{r} or die;
1434
1435 glDepthMask 1;
1436 glClear GL_DEPTH_BUFFER_BIT;
1437 glEnable GL_TEXTURE_2D;
1438 glEnable GL_DEPTH_TEST;
1439 glEnable GL_CULL_FACE;
1440 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1441
1442 glMatrixMode GL_PROJECTION;
1443 glLoadIdentity;
1444 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1445 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1446 glMatrixMode GL_MODELVIEW;
1447 glLoadIdentity;
1448
1449 glPushMatrix;
1450 glTranslate 0, 0, -800;
1451 glScale 1, -1, 1;
1452 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1453 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1454 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1455 glScale 50, 50, 50;
1456
1457 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1458 while (my ($k, $v) = each %{$r->{g}}) {
1459 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1460 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1461 }
1462
1463 glPopMatrix;
1464
1465 glShadeModel GL_FLAT;
1466 glDisable GL_DEPTH_TEST;
1467 glDisable GL_TEXTURE_2D;
1468 glDepthMask 0;
1469
1470 $WANT_REFRESH++;
1471};
1472
1473 CFClient::SDL_GL_SwapBuffers; 2085 CFPlus::SDL_GL_SwapBuffers;
1474} 2086}
1475 2087
1476my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2088my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1477 $NOW = time; 2089 $NOW = time;
1478 2090
1479 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2091 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1480 for CFClient::SDL_PollEvent; 2092 for CFPlus::SDL_PollEvent;
1481 2093
1482 if (%animate_object) { 2094 if (%animate_object) {
1483 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2095 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1484 $WANT_REFRESH++; 2096 $WANT_REFRESH++;
1485 } 2097 }
… …
1509 $CONN->face_prefetch 2121 $CONN->face_prefetch
1510 if $CONN; 2122 if $CONN;
1511}); 2123});
1512 2124
1513%SDL_CB = ( 2125%SDL_CB = (
1514 CFClient::SDL_QUIT => sub { 2126 CFPlus::SDL_QUIT => sub {
1515 Event::unloop -1; 2127 exit;
1516 }, 2128 },
1517 CFClient::SDL_VIDEORESIZE => sub { 2129 CFPlus::SDL_VIDEORESIZE => sub {
1518 }, 2130 },
1519 CFClient::SDL_VIDEOEXPOSE => sub { 2131 CFPlus::SDL_VIDEOEXPOSE => sub {
1520 CFClient::UI::full_refresh; 2132 CFPlus::UI::full_refresh;
1521 }, 2133 },
1522 CFClient::SDL_ACTIVEEVENT => sub { 2134 CFPlus::SDL_ACTIVEEVENT => sub {
1523# 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;
1524 }, 2140 },
1525 CFClient::SDL_KEYDOWN => sub { 2141 CFPlus::SDL_KEYDOWN => sub {
1526 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2142 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1527 # alt-enter 2143 # alt-enter
2144 $FULLSCREEN_ENABLE->toggle;
1528 video_shutdown; 2145 video_shutdown;
1529 $CFG->{fullscreen} = !$CFG->{fullscreen};
1530 video_init; 2146 video_init;
1531 } else { 2147 } else {
1532 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2148 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1533 } 2149 }
1534 }, 2150 },
1535 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2151 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1536 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2152 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1537 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2153 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1538 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2154 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1539 CFClient::SDL_USEREVENT => sub { 2155 CFPlus::SDL_USEREVENT => sub {
1540 if ($_[0]{code} == 1) { 2156 if ($_[0]{code} == 1) {
1541 audio_channel_finished $_[0]{data1}; 2157 audio_channel_finished $_[0]{data1};
1542 } elsif ($_[0]{code} == 0) { 2158 } elsif ($_[0]{code} == 0) {
1543 audio_music_finished; 2159 audio_music_finished;
1544 } 2160 }
… …
1548############################################################################# 2164#############################################################################
1549 2165
1550$SIG{INT} = $SIG{TERM} = sub { exit }; 2166$SIG{INT} = $SIG{TERM} = sub { exit };
1551 2167
1552{ 2168{
1553 local $SIG{__DIE__} = sub {
1554 return unless defined $^S && !$^S;
1555 Carp::confess $_[1];#d#TODO: remove when stable
1556 CFClient::fatal $_[0];
1557 };
1558
1559 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2169 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2170 CFPlus::DB::Server::run;
2171
1560 CFClient::UI::set_layout ($::CFG->{layout}); 2172 CFPlus::UI::set_layout ($::CFG->{layout});
1561 2173
1562 my %DEF_CFG = ( 2174 my %DEF_CFG = (
1563 sdl_mode => 0, 2175 sdl_mode => 0,
1564 width => 640, 2176 width => 640,
1565 height => 480, 2177 height => 480,
1566 fullscreen => 0, 2178 fullscreen => 0,
1567 fast => 0, 2179 fast => 0,
1568 map_scale => 1, 2180 map_scale => 1,
1569 fow_enable => 1, 2181 fow_enable => 1,
1570 fow_intensity => 0.45, 2182 fow_intensity => 0.45,
1571 fow_smooth => 0, 2183 fow_smooth => 0,
2184 map_smoothing => 1,
1572 gui_fontsize => 1, 2185 gui_fontsize => 1,
1573 log_fontsize => 1, 2186 log_fontsize => 0.7,
1574 gauge_fontsize=> 1, 2187 gauge_fontsize => 1,
1575 gauge_size => 0.35, 2188 gauge_size => 0.35,
1576 stat_fontsize => 1, 2189 stat_fontsize => 0.7,
1577 mapsize => 100, 2190 mapsize => 100,
1578 host => "crossfire.schmorp.de",
1579 say_command => 'say', 2191 say_command => 'chat',
1580 audio_enable => 1, 2192 audio_enable => 1,
1581 bgm_enable => 1, 2193 bgm_enable => 1,
1582 bgm_volume => 0.25, 2194 bgm_volume => 0.25,
1583 face_prefetch => 0, 2195 face_prefetch => 0,
1584 output_sync => 1, 2196 output_sync => 1,
1585 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 );
1586 ); 2205
1587
1588 while (my ($k, $v) = each %DEF_CFG) { 2206 while (my ($k, $v) = each %DEF_CFG) {
1589 $CFG->{$k} = $v unless exists $CFG->{$k}; 2207 $CFG->{$k} = $v unless exists $CFG->{$k};
1590 } 2208 }
1591 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
1592 sdl_init; 2225 sdl_init;
1593 2226
1594 @SDL_MODES = reverse 2227 @SDL_MODES = reverse
1595 grep $_->[0] >= 640 && $_->[1] >= 480, 2228 grep $_->[0] >= 640 && $_->[1] >= 480,
1596 CFClient::SDL_ListModes; 2229 CFPlus::SDL_ListModes;
1597 2230
1598 @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)";
1599 2232
1600 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2233 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1601 2234
1602 { 2235 {
1603 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2236 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1604 DejaVuSans.ttf 2237 DejaVuSans.ttf
1605 DejaVuSansMono.ttf 2238 DejaVuSansMono.ttf
1606 DejaVuSans-Bold.ttf 2239 DejaVuSans-Bold.ttf
1607 DejaVuSansMono-Bold.ttf 2240 DejaVuSansMono-Bold.ttf
1608 DejaVuSans-Oblique.ttf 2241 DejaVuSans-Oblique.ttf
1609 DejaVuSansMono-Oblique.ttf 2242 DejaVuSansMono-Oblique.ttf
1610 DejaVuSans-BoldOblique.ttf 2243 DejaVuSans-BoldOblique.ttf
1611 DejaVuSansMono-BoldOblique.ttf 2244 DejaVuSansMono-BoldOblique.ttf
1612 ); 2245 );
1613 2246
1614 CFClient::add_font $_ for @fonts; 2247 CFPlus::add_font $_ for @fonts;
1615 2248
1616 CFClient::pango_init; 2249 CFPlus::pango_init;
1617 2250
1618 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2251 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1619 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2252 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1620 2253
1621 $FONT_PROP->make_default; 2254 $FONT_PROP->make_default;
1622 } 2255 }
1623 2256
1624# compare mono (ft) vs. rgba (cairo) 2257# compare mono (ft) vs. rgba (cairo)
1625# ft - 1.8s, cairo 3s, even in alpha-only mode 2258# ft - 1.8s, cairo 3s, even in alpha-only mode
1626# for my $rgba (0..1) { 2259# for my $rgba (0..1) {
1627# my $t1 = Time::HiRes::time; 2260# my $t1 = Time::HiRes::time;
1628# for (1..1000) { 2261# for (1..1000) {
1629# my $layout = CFClient::Layout->new ($rgba); 2262# my $layout = CFPlus::Layout->new ($rgba);
1630# $layout->set_text ("hallo" x 100); 2263# $layout->set_text ("hallo" x 100);
1631# $layout->render; 2264# $layout->render;
1632# } 2265# }
1633# my $t2 = Time::HiRes::time; 2266# my $t2 = Time::HiRes::time;
1634# warn $t2-$t1; 2267# warn $t2-$t1;
1635# } 2268# }
1636 2269
2270 $startup_done->();
2271
1637 video_init; 2272 video_init;
1638 audio_init; 2273 audio_init;
1639} 2274}
1640 2275
2276show_tip_of_the_day if $CFG->{show_tips};
2277
1641Event::loop; 2278Event::loop;
2279#CFPlus::SDL_Quit;
2280#CFPlus::_exit 0;
1642 2281
1643END { CFClient::SDL_Quit } 2282END {
2283 CFPlus::SDL_Quit;
2284 CFPlus::DB::Server::stop;
2285}
1644 2286
1645=head1 NAME 2287=head1 NAME
1646 2288
1647cfplus - A Crossfire+ and Crossfire game client 2289cfplus - A Crossfire+ and Crossfire game client
1648 2290

Diff Legend

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