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.49 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.162 by root, Thu Jul 5 07:06:05 2007 UTC

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

Diff Legend

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