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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines