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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines