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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines