ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.40 by root, Fri Jun 2 02:12:04 2006 UTC vs.
Revision 1.176 by root, Thu Jul 19 14:54:51 2007 UTC

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

Diff Legend

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