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.44 by elmex, Fri Jun 2 16:32:12 2006 UTC vs.
Revision 1.163 by root, Thu Jul 12 17:56:51 2007 UTC

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

Diff Legend

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