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.32 by root, Tue May 30 02:55:45 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
… …
81our $LOGVIEW; 130our $LOGVIEW;
82our $CONSOLE; 131our $CONSOLE;
83our $METASERVER; 132our $METASERVER;
84our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 134our $QUIT_DIALOG;
86our $SERVER_SETUP; 135our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE;
137our $PICKUP_ENABLE;
138our $SERVER_INFO;
87 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;
88our $FLOORBOX; 156our $FLOORBOX;
89our $GAUGES; 157our $GAUGES;
90our $STATWIDS; 158our $STATWIDS;
91 159
92our $SDL_ACTIVE; 160our $SDL_ACTIVE;
93our %SDL_CB; 161our %SDL_CB;
94 162
95our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_PLAYING;
167our $MUSIC_PLAYER;
96our @SOUNDS; # event => file mapping 168our @SOUNDS; # event => file mapping
97our %AUDIO_CHUNKS; # audio files 169our %AUDIO_CHUNKS; # audio files
98 170
99our $ALT_ENTER_MESSAGE; 171our $ALT_ENTER_MESSAGE;
100our $STATUSBOX; 172our $STATUSBOX;
101our $DEBUG_STATUS; 173our $DEBUG_STATUS;
102 174
103our $INV_WINDOW;
104our $INV; 175our $INV;
105our $INVR; 176our $INVR;
106our $INV_RIGHT_HB; 177our $INV_RIGHT_HB;
107 178
108our $BIND_WINDOW; 179our $PICKUP_CFG;
180
181our $IN_BUILD_MODE;
182our $BUILD_BUTTON;
109 183
110sub status { 184sub status {
111 $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]);
112} 186}
113 187
114sub debug { 188sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 189 $DEBUG_STATUS->set_text ($_[0]);
116} 190}
117 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
118sub start_game { 442sub start_game {
119 status "logging in..."; 443 status "logging in...";
120 444
121 $LOGIN_BUTTON->set_text ("Logout"); 445 $LOGIN_BUTTON->set_text ("Logout");
122 $SERVER_SETUP->hide; 446 $SETUP_DIALOG->hide;
123 447
124 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;
125 449
126 my ($host, $port) = split /:/, $CFG->{host}; 450 my ($host, $port) = split /:/, $PROFILE->{host};
127 451
128 $MAP = new CFClient::Map $mapsize, $mapsize; 452 $MAP = new CFPlus::Map;
129 453
130 $CONN = eval { 454 $CONN = eval {
131 new CFClient::Protocol 455 new CFPlus::Protocol
132 host => $host, 456 host => $host,
133 port => $port || 13327, 457 port => $port || 13327,
134 user => $CFG->{user}, 458 user => $PROFILE->{user},
135 pass => $CFG->{password}, 459 pass => $PROFILE->{password},
136 mapw => $mapsize, 460 mapw => $mapsize,
137 maph => $mapsize, 461 maph => $mapsize,
462
463 client => "cfplus $CFPlus::VERSION $] $^O",
138 464
139 map_widget => $MAPWIDGET, 465 map_widget => $MAPWIDGET,
140 logview => $LOGVIEW, 466 logview => $LOGVIEW,
141 statusbox => $STATUSBOX, 467 statusbox => $STATUSBOX,
142 map => $MAP, 468 map => $MAP,
143 mapmap => $MAPMAP, 469 mapmap => $MAPMAP,
470 query => \&server_query,
471
472 setup_req => {
473 smoothing => $CFG->{map_smoothing}*1,
474 },
144 475
145 sound_play => sub { 476 sound_play => sub {
146 my ($x, $y, $soundnum, $type) = @_; 477 my ($x, $y, $soundnum, $type) = @_;
147 478
148 $SDL_MIXER 479 $SDL_MIXER
… …
154 $chunk->play; 485 $chunk->play;
155 }, 486 },
156 }; 487 };
157 488
158 if ($CONN) { 489 if ($CONN) {
159 CFClient::lowdelay fileno $CONN->{fh}; 490 CFPlus::lowdelay fileno $CONN->{fh};
160 491
161 status "login successful"; 492 status "login successful";
162 } else { 493 } else {
163 status "unable to connect"; 494 status "unable to connect";
164 stop_game(); 495 stop_game();
165 } 496 }
166} 497}
167 498
168sub stop_game { 499sub stop_game {
169 $LOGIN_BUTTON->set_text ("Login"); 500 $LOGIN_BUTTON->set_text ("Login");
170 $SERVER_SETUP->show; 501 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
502 $SETUP_DIALOG->show;
171 $INV_WINDOW->hide; 503 $PL_WINDOW->hide;
172 $LOGVIEW->hide; 504 $SPELL_LIST->clear_spells;
505 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
173 506
174 return unless $CONN; 507 return unless $CONN;
175 508
176 status "connection closed"; 509 status "connection closed";
177 510
511 destroy_query_dialog $CONN;
178 $CONN->destroy; 512 $CONN->destroy;
179 $CONN = 0; # false, does not autovivify 513 $CONN = 0; # false, does not autovivify
180}
181 514
182sub client_setup { 515 undef $MAP;
183 my $dialog = new CFClient::UI::FancyFrame 516}
184 x => 1,
185 y => $HEIGHT * (1/8),
186 name => "client_setup",
187 title => "Client Setup",
188 child => (my $vbox = new CFClient::UI::VBox);
189 517
518sub graphics_setup {
519 my $vbox = new CFPlus::UI::VBox;
520
190 $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]);
191 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
192 $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");
193 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 531 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
194 532
195 $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]);
196 $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");
197 535
198 $mode_slider->connect (changed => sub { 536 $mode_slider->connect (changed => sub {
199 my ($self, $value) = @_; 537 my ($self, $value) = @_;
200 538
201 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 539 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
202 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 540 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
203 }); 541 });
204 $mode_slider->emit (changed => $mode_slider->{range}[0]); 542 $mode_slider->emit (changed => $mode_slider->{range}[0]);
205 543
206 my $row = 1;
207
208 $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");
209 $table->add (1, $row++, new CFClient::UI::CheckBox 545 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
210 state => $CFG->{fullscreen}, 546 state => $CFG->{fullscreen},
211 tooltip => "Bring the client into fullscreen mode.", 547 tooltip => "Bring the client into fullscreen mode.",
212 on_changed => sub { 548 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
213 my ($self, $value) = @_;
214 $CFG->{fullscreen} = $value;
215 }
216 ); 549 );
217 550
218 $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");
219 $table->add (1, $row++, new CFClient::UI::CheckBox 552 $table->add (1, $row++, new CFPlus::UI::CheckBox
220 state => $CFG->{fast}, 553 state => $CFG->{fast},
221 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.",
222 on_changed => sub { 568 on_activate => sub {
223 my ($self, $value) = @_; 569 video_shutdown ();
224 $CFG->{fast} = $value; 570 video_init ();
571 0
225 } 572 }
226 ); 573 );
227 574
228 $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");
229 $table->add (1, $row++, new CFClient::UI::Slider 576 $table->add (1, $row++, new CFPlus::UI::Slider
230 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 577 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
231 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 578 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
232 on_changed => sub { 579 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
233 my ($self, $value) = @_;
234 $CFG->{map_scale} = 2 ** $value;
235 }
236 ); 580 );
237 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
238 $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");
239 $table->add (1, $row++, new CFClient::UI::CheckBox 592 $table->add (1, $row++, new CFPlus::UI::CheckBox
240 state => $CFG->{fow_enable}, 593 state => $CFG->{fow_enable},
241 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.",
242 on_changed => sub { 595 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
243 my ($self, $value) = @_;
244 $CFG->{fow_enable} = $value;
245 }
246 ); 596 );
247 597
248 $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");
249 $table->add (1, $row++, new CFClient::UI::Slider 599 $table->add (1, $row++, new CFPlus::UI::Slider
250 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 600 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
251 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.",
252 on_changed => sub { 602 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
253 my ($self, $value) = @_;
254 $CFG->{fow_intensity} = $value;
255 }
256 ); 603 );
257 604
258 $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");
259 $table->add (1, $row++, new CFClient::UI::CheckBox 606 $table->add (1, $row++, new CFPlus::UI::CheckBox
260 state => $CFG->{fow_smooth}, 607 state => $CFG->{fow_smooth},
261 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.",
262 on_changed => sub { 609 on_changed => sub {
263 my ($self, $value) = @_; 610 my ($self, $value) = @_;
264 $CFG->{fow_smooth} = $value; 611 $CFG->{fow_smooth} = $value;
265 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
266 } 614 }
267 ); 615 );
268 616
269 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
270 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
272 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
273 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
274 );
275
276 $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");
277 $table->add (1, $row++, new CFClient::UI::Slider 618 $table->add (1, $row++, new CFPlus::UI::Slider
278 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 619 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
279 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.",
280 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 621 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
281 ); 622 );
282 623
283 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
284
285 $table->add (1, $row++, new CFClient::UI::Slider
286 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
287 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
288 on_changed => sub {
289 $CFG->{stat_fontsize} = $_[1];
290 &set_stats_window_fontsize;
291 }
292 );
293
294 $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");
295 $table->add (1, $row++, new CFClient::UI::Slider 625 $table->add (1, $row++, new CFPlus::UI::Slider
296 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 626 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
297 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.",
298 on_changed => sub { 628 on_changed => sub {
299 $CFG->{gauge_fontsize} = $_[1]; 629 $CFG->{gauge_fontsize} = $_[1];
300 &set_gauge_window_fontsize; 630 &set_gauge_window_fontsize;
631 0
301 } 632 }
302 ); 633 );
303 634
304 $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");
305 $table->add (1, $row++, new CFClient::UI::Slider 636 $table->add (1, $row++, new CFPlus::UI::Slider
306 range => [$CFG->{gauge_size}, 0.2, 0.8], 637 range => [$CFG->{gauge_size}, 0.2, 0.8],
307 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.",
308 on_changed => sub { 639 on_changed => sub {
309 $CFG->{gauge_size} = $_[1]; 640 $CFG->{gauge_size} = $_[1];
310 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 641 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
642 0
311 } 643 }
312 ); 644 );
313 645
314 $table->add (1, $row++, new CFClient::UI::Button 646 $vbox
315 expand => 1, align => 0, text => "Apply", 647}
316 tooltip => "Apply the video settings",
317 on_activate => sub {
318 video_shutdown ();
319 video_init ();
320 }
321 );
322 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
323 $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");
324 $table->add (1, $row++, new CFClient::UI::CheckBox 657 $table->add (1, $row++, new CFPlus::UI::CheckBox
325 state => $CFG->{audio_enable}, 658 state => $CFG->{audio_enable},
326 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.",
327 on_changed => sub { 660 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
328 $CFG->{audio_enable} = $_[1];
329 }
330 ); 661 );
331# $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");
332# $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 {
333# $CFG->{effects_volume} = $_[1]; 664# $CFG->{effects_volume} = $_[1];
334# }); 665# });
335 $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");
336 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 667 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
337 $hbox->add (new CFClient::UI::CheckBox 668 $hbox->add (new CFPlus::UI::CheckBox
338 expand => 1, state => $CFG->{bgm_enable}, 669 expand => 1, state => $CFG->{bgm_enable},
339 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.",
340 on_changed => sub { 671 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
341 $CFG->{bgm_enable} = $_[1];
342 }
343 ); 672 );
344 $hbox->add (new CFClient::UI::Slider 673 $hbox->add (new CFPlus::UI::Slider
345 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 674 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
346 tooltip => "The volume of the background music. Changes are instant.", 675 tooltip => "The volume of the background music. Changes are instant.",
347 on_changed => sub { 676 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
348 $CFG->{bgm_volume} = $_[1];
349 CFClient::MixMusic::volume $_[1] * 128;
350 }
351 ); 677 );
352 678
353 $table->add (1, $row++, new CFClient::UI::Button 679 $table->add (1, $row++, new CFPlus::UI::Button
354 expand => 1, align => 0, text => "Apply", 680 expand => 1, align => 0, text => "Apply",
355 tooltip => "Apply the audio settings", 681 tooltip => "Apply the audio settings",
356 on_activate => sub { 682 on_activate => sub {
357 audio_shutdown (); 683 audio_shutdown ();
358 audio_init (); 684 audio_init ();
685 0
359 } 686 }
360 ); 687 );
361 688
362 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 689 $vbox
363 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
364 text => $CFG->{say_command},
365 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. "
366 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
367 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
368 on_changed => sub {
369 my ($self, $value) = @_;
370 $CFG->{say_command} = $value;
371 }
372 );
373
374 $dialog
375}
376
377sub set_stats_window_fontsize {
378 for (values %{$STATWIDS}) {
379 $_->set_fontsize ($::CFG->{stat_fontsize});
380 }
381} 690}
382 691
383sub set_gauge_window_fontsize { 692sub set_gauge_window_fontsize {
384 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 693 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
385 $_->set_fontsize ($::CFG->{gauge_fontsize}); 694 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
387} 696}
388 697
389sub make_gauge_window { 698sub make_gauge_window {
390 my $gh = int $HEIGHT * $CFG->{gauge_size}; 699 my $gh = int $HEIGHT * $CFG->{gauge_size};
391 700
392 my $win = new CFClient::UI::Frame ( 701 my $win = new CFPlus::UI::Frame (
393 force_x => 0, 702 force_x => 0,
394 force_y => "max", 703 force_y => "max",
395 force_w => $WIDTH, 704 force_w => $WIDTH,
396 force_h => $gh, 705 force_h => $gh,
397 ); 706 );
398 707
399 $win->add (my $hbox = new CFClient::UI::HBox 708 $win->add (my $hbox = new CFPlus::UI::HBox
400 children => [ 709 children => [
401 (new CFClient::UI::HBox expand => 1), 710 (new CFPlus::UI::HBox expand => 1),
402 (new CFClient::UI::VBox children => [ 711 (new CFPlus::UI::VBox children => [
403 (new CFClient::UI::Empty expand => 1), 712 (new CFPlus::UI::Empty expand => 1),
404 (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)),
405 ]), 714 ]),
406 (my $vbox = new CFClient::UI::VBox), 715 (my $vbox = new CFPlus::UI::VBox),
407 ], 716 ],
408 ); 717 );
409 718
410 $vbox->add (new CFClient::UI::HBox 719 $vbox->add (new CFPlus::UI::HBox
411 expand => 1, 720 expand => 1,
412 children => [ 721 children => [
413 (new CFClient::UI::Empty expand => 1), 722 (new CFPlus::UI::Empty expand => 1),
414 (my $hb = new CFClient::UI::HBox), 723 (my $hb = new CFPlus::UI::HBox),
415 ], 724 ],
416 ); 725 );
417 726
418 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 727 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
419 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.");
420 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 728 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
421 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.");
422 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 729 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
423 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.");
424 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 730 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
425 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.");
426 731
427 $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");
428 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.");
429 $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");
430 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
431 734
432 $GAUGES = { 735 $GAUGES = {
433 exp => $exp, win => $win, range => $rng, 736 exp => $exp, win => $win, range => $rng,
434 food => $fg, mana => $mg, hp => $hg, grace => $gg 737 food => $fg, mana => $mg, hp => $hg, grace => $gg
435 }; 738 };
… …
437 &set_gauge_window_fontsize; 740 &set_gauge_window_fontsize;
438 741
439 $win 742 $win
440} 743}
441 744
745sub debug_setup {
746 my $table = new CFPlus::UI::Table;
442 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
443sub make_stats_window { 775sub stats_window {
444 my $tgw = new CFClient::UI::FancyFrame 776 my $r = new CFPlus::UI::ScrolledWindow (
445 y => $HEIGHT * (2/8), 777 expand => 1,
446 x => "max", 778 scroll_y => 1
447 title => "Stats", 779 );
448 name => "stats_window"; 780 $r->add (my $vb = new CFPlus::UI::VBox);
449 781
450 $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
451 $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,
452 can_hover => 1, can_events => 1, 788 can_hover => 1, can_events => 1,
453 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.");
454 $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,
455 can_hover => 1, can_events => 1, 791 can_hover => 1, can_events => 1,
456 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).");
457 793
458 $vb->add (my $hb0 = new CFClient::UI::HBox); 794 $pi->add (my $hb0 = new CFPlus::UI::HBox);
459 $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,
460 can_hover => 1, can_events => 1, 796 can_hover => 1, can_events => 1,
461 tooltip => "The weight of the player including all inventory items."); 797 tooltip => "The weight of the player including all inventory items.");
462 $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,
463 can_hover => 1, can_events => 1, 799 can_hover => 1, can_events => 1,
464 tooltip => "The weight limit: you cannot carry more than this."); 800 tooltip => "The weight limit: you cannot carry more than this.");
465 801
466 802 $vb->add (new CFPlus::UI::FancyFrame
803 label => "Primary/Secondary Statistics",
467 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 804 child => (my $hb = new CFPlus::UI::HBox expand => 1),
805 );
468 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 806 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
469 807
470 my $color2 = [1, 1, 0]; 808 my $color2 = [1, 1, 0];
471 809
472 for ( 810 for (
473 [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],
474 [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],
475 [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],
476 [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],
477 [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],
478 [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],
479 [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],
480 818
481 [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],
482 [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],
483 [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],
484 [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],
485 [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],
486 [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],
487 ) { 825 ) {
488 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 826 my ($col, $row, $id, $label, $template) = @$_;
489 827
490 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 828 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
491 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");
492 $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
493 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");
494 } 834 }
495 835
836 $vb->add (new CFPlus::UI::FancyFrame
837 label => "Resistancies",
496 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 838 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
839 );
497 840
498 my $row = 0; 841 my $row = 0;
499 my $col = 0; 842 my $col = 0;
500 843
501 my %resist_names = ( 844 my %resist_names = (
845 slow => ["Slow",
502 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",
503 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",
504 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",
505 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",
506 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",
507 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",
508 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",
509 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",
510 pois => "<b>Poison</b> (resistance to getting poisoned)", 862 "<b>Poison</b> (resistance to getting poisoned)"],
863 para => ["Paralysation",
511 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",
512 deat => "<b>Death</b> (resistance against death spells)", 866 "<b>Death</b> (resistance against death spells)"],
513 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",
514 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",
515 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",
516 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",
517 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",
518 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",
519 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)"],
520 ); 881 );
521 for (qw/slow holyw conf fire depl magic 882 for (qw/slow holyw conf fire depl magic
522 drain acid pois para deat phys 883 drain acid pois para deat phys
523 blind fear tund elec cold ghit/) 884 blind fear tund elec cold ghit/)
524 { 885 {
525 $tbl2->add ($col, $row, 886 $tbl2->add ($col, $row,
526 $STATWIDS->{"res_$_"} = 887 $STATWIDS->{"res_$_"} =
527 new CFClient::UI::Label 888 new CFPlus::UI::Label
528 font => $FONT_FIXED, 889 font => $FONT_FIXED,
529 template => "-100%", 890 template => "-100%",
530 align => +1, 891 align => +1,
531 valign => 0, 892 valign => 0,
532 can_events => 1, 893 can_events => 1,
533 can_hover => 1, 894 can_hover => 1,
534 tooltip => $resist_names{$_}, 895 tooltip => $resist_names{$_}->[1],
535 ); 896 );
536 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 897 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
537 font => $FONT_FIXED, 898 font => $FONT_FIXED,
538 can_hover => 1, 899 can_hover => 1,
539 can_events => 1, 900 can_events => 1,
540 image => "ui/resist/resist_$_.png", 901 path => "ui/resist/resist_$_.png",
541 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],
542 ); 910 );
543 911
544 $row++; 912 $row++;
545 if ($row % 6 == 0) { 913 if ($row % 6 == 0) {
546 $col += 2; 914 $col += 3;
547 $row = 0; 915 $row = 0;
548 } 916 }
549 } 917 }
550 918
551 &set_stats_window_fontsize;
552 update_stats_window ({}); 919 #update_stats_window ({});
553 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]);
554 $tgw 927 $sw
555} 928}
556 929
557sub formsep { 930sub formsep($) {
558 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 931 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
559}
560
561sub update_stats_window {
562 my ($stats) = @_;
563
564 # I love text protocols...
565
566 my $hp = $stats->{+CS_STAT_HP} * 1;
567 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
568 my $sp = $stats->{+CS_STAT_SP} * 1;
569 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
570 my $fo = $stats->{+CS_STAT_FOOD} * 1;
571 my $fo_m = 999;
572 my $gr = $stats->{+CS_STAT_GRACE} * 1;
573 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
574
575 $GAUGES->{hp} ->set_value ($hp, $hp_m);
576 $GAUGES->{mana} ->set_value ($sp, $sp_m);
577 $GAUGES->{food} ->set_value ($fo, $fo_m);
578 $GAUGES->{grace} ->set_value ($gr, $gr_m);
579 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
580 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
581 my $rng = $stats->{+CS_STAT_RANGE};
582 $rng =~ s/^Range: //; # thank you so much dear server
583 $GAUGES->{range} ->set_text ("Rng: " . $rng);
584 my $title = $stats->{+CS_STAT_TITLE};
585 $title =~ s/^Player: //;
586 $STATWIDS->{title} ->set_text ("Title: " . $title);
587
588 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
589 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
590 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
591 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
592 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
593 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
594 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
595 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
596 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
597 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
598 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
599 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
600 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
601
602 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
603
604 # TODO: replace by CS_STAT_RES_xxx constants
605 my %tbl = (
606 phys => 100,
607 magic => 101,
608 fire => 102,
609 elec => 103,
610 cold => 104,
611 conf => 105,
612 acid => 106,
613 drain => 107,
614 ghit => 108,
615 pois => 109,
616 slow => 110,
617 para => 111,
618 tund => 112,
619 fear => 113,
620 depl => 113,
621 deat => 115,
622 holyw => 116,
623 blind => 117,
624 );
625
626 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
627 for keys %tbl;
628}
629
630sub metaserver_dialog {
631 my $dialog = new CFClient::UI::FancyFrame
632 title => "Server List",
633 child => (my $vbox = new CFClient::UI::VBox);
634
635 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
636
637 $dialog
638} 932}
639 933
640my $METASERVER_ATIME; 934my $METASERVER_ATIME;
641 935
642sub update_metaserver { 936sub update_metaserver {
643 my ($HOST) = @_; 937 my ($metaserver_dialog) = @_;
938
939 $METASERVER = $metaserver_dialog
940 if defined $metaserver_dialog;
644 941
645 return if $METASERVER_ATIME > time; 942 return if $METASERVER_ATIME > time;
646 $METASERVER_ATIME = time + 60; 943 $METASERVER_ATIME = time + 60;
647 944
648 my $table = $METASERVER->{table}; 945 my $table = $METASERVER->{table};
649 $table->clear; 946 $table->clear;
650 $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...");
651 948
652 my $buf; 949 my $ok = 0;
653 950
654 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 951 CFPlus::background {
952 my $ua = CFPlus::lwp_useragent;
655 953
656 unless ($fh) { 954 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
657 $label->set_text ("unable to contact metaserver: $!"); 955 } sub {
658 return; 956 my ($msg) = @_;
659 } 957 if ($msg) {
660
661 Event->io (fd => $fh, poll => 'r', cb => sub {
662 my $res = sysread $fh, $buf, 8192, length $buf;
663
664 if (!defined $res) {
665 $_[0]->w->cancel;
666 $label->set_text ("error while retrieving server list: $!");
667 } elsif ($res == 0) {
668 $_[0]->w->cancel;
669 status "server list retrieved";
670
671 utf8::decode $buf if utf8::valid $buf;
672
673 $table->clear; 958 $table->clear;
674 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 );
675 my @col = qw(Use #Users Host Uptime Version Description); 967 my @col = qw(#Users Host Uptime Version Description);
676 $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[$_])
677 for 0 .. $#col; 972 for 0 .. $#col;
678 973
679 my @align = qw(1 0 1 1 -1); 974 my @align = qw(1 0 1 1 -1);
680 975
681 my $y = 0; 976 my $y = 0;
682 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 977 for my $m (@{ $msg->{servers} }) {
683 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)};
684 980
685 for ($desc) { 981 for ($desc) {
686 s/<br>/\n/gi; 982 s/<br>/\n/gi;
687 s/<li>/\n· /gi; 983 s/<li>/\n· /gi;
688 s/<.*?>//sgi; 984 s/<.*?>//sgi;
689 s/&/&amp;/g; 985 s/&amp;/&/g;
690 s/</&lt;/g; 986 s/&lt;/</g;
691 s/>/&gt;/g; 987 s/&gt;/>/g;
692 } 988 }
693 989
694 $uptime = sprintf "%dd %02d:%02d:%02d", 990 $uptime = sprintf "%dd %02d:%02d:%02d",
695 (int $m->[8] / 86400), 991 (int $uptime / 86400),
696 (int $m->[8] / 3600) % 24, 992 (int $uptime / 3600) % 24,
697 (int $m->[8] / 60) % 60, 993 (int $uptime / 60) % 60,
698 $m->[8] % 60; 994 $uptime % 60;
699 995
700 $m = [$users, $host, $uptime, $version, $desc]; 996 $m = [$users, $host, $uptime, $version, $desc];
701 997
702 $y++; 998 $y++;
703 999
704 $table->add (0, $y, new CFClient::UI::VBox children => [ 1000 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
705 (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 {
706 $HOST->set_text ($CFG->{host} = $host); 1005 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1006 $METASERVER->hide;
1007 0
1008 },
707 }), 1009 ),
708 (new CFClient::UI::Empty expand => 1), 1010 (new CFPlus::UI::Empty expand => 1),
709 ]); 1011 ]);
710 1012
711 $table->add ($_ + 1, $y, new CFClient::UI::Label 1013 $table->add ($_, $y, new CFPlus::UI::Label
712 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)
713 for 0 .. $#$m; 1023 for 0 .. $#$m;
714 } 1024 }
1025 } else {
1026 $ok or $label->set_text ("error while contacting metaserver");
1027 }
1028 };
1029
1030}
1031
1032sub metaserver_dialog {
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
1038 title => "Server List",
1039 name => 'metaserver_dialog',
1040 x => 'center',
1041 y => 'center',
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,
1048 on_visibility_change => sub {
1049 update_metaserver ($_[0]) if $_[1];
1050 0
715 } 1051 },
716 }); 1052 ;
1053
1054 $dialog
717} 1055}
718 1056
719sub server_setup { 1057sub server_setup {
720 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 1058 my $vbox = new CFPlus::UI::VBox;
721 x => "center", 1059
722 y => "center", 1060 $vbox->add (new CFPlus::UI::FancyFrame
723 name => "server_setup", 1061 label => "Connection Settings",
724 title => "Server Setup", 1062 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
725 child => (my $vbox = new CFClient::UI::VBox),
726 ; 1063 );
727
728 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
729 $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");
730 1065
731 { 1066 {
732 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1067 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
733 1068
734 $vbox->add ( 1069 $vbox->add (
735 my $HOST = new CFClient::UI::Entry 1070 $HOST_ENTRY = new CFPlus::UI::Entry
736 expand => 1, 1071 expand => 1,
737 text => $CFG->{host}, 1072 text => $CFG->{profile}{default}{host},
738 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",
739 on_changed => sub { 1074 on_changed => sub {
740 my ($self, $value) = @_; 1075 my ($self, $value) = @_;
741 $CFG->{host} = $value; 1076 $CFG->{profile}{default}{host} = $value;
1077 0
742 } 1078 }
743 ); 1079 );
744 1080
745 $METASERVER = metaserver_dialog;
746
747 $vbox->add (new CFClient::UI::Flopper 1081 $vbox->add (new CFPlus::UI::Button
748 expand => 1, 1082 expand => 1,
749 text => "Server List", 1083 text => "Server List",
750 other => $METASERVER, 1084 other => $METASERVER,
751 tooltip => "Show a list of available crossfire servers", 1085 tooltip => "Show a list of available crossfire servers",
752 on_open => sub { 1086 on_activate => sub { $METASERVER->toggle_visibility; 0 },
753 update_metaserver $HOST; 1087 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
754 }
755 ); 1088 );
756 } 1089 }
757 1090
758 $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");
759 $table->add (1, 4, new CFClient::UI::Entry 1092 $table->add (1, 4, new CFPlus::UI::Entry
760 text => $CFG->{user}, 1093 text => $CFG->{profile}{default}{user},
761 tooltip => "The name of your character on the server", 1094 tooltip => "The name of your character on the server",
762 on_changed => sub { 1095 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
763 my ($self, $value) = @_;
764 $CFG->{user} = $value;
765 }
766 ); 1096 );
767 1097
768 $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");
769 $table->add (1, 5, new CFClient::UI::Entry 1099 $table->add (1, 5, new CFPlus::UI::Entry
770 text => $CFG->{password}, 1100 text => $CFG->{profile}{default}{password},
771 hidden => 1, 1101 hidden => 1,
772 tooltip => "The password for your character", 1102 tooltip => "The password for your character",
773 on_changed => sub { 1103 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
774 my ($self, $value) = @_;
775 $CFG->{password} = $value;
776 }
777 ); 1104 );
778 1105
779 $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");
780 $table->add (1, 7, new CFClient::UI::Slider 1107 $table->add (1, 7, new CFPlus::UI::Slider
781 force_w => 100, 1108 force_w => 100,
782 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1109 range => [$CFG->{mapsize}, 10, 100, 0, 1],
783 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. "
784 . "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, "
785 . "but you also increase bandwidth requirements and latency. " 1112 . "but you also increase bandwidth requirements and latency. "
786 . "This option is only used once at log-in.", 1113 . "This option is only used once at log-in.",
787 on_changed => sub { 1114 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
788 my ($self, $value) = @_;
789
790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
791 },
792 ); 1115 );
793 1116
794 $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");
795 $table->add (1, 8, new CFClient::UI::CheckBox 1118 $table->add (1, 8, new CFPlus::UI::CheckBox
796 state => $CFG->{face_prefetch}, 1119 state => $CFG->{face_prefetch},
797 tooltip => "<b>Background Image Prefetch</b>\n\n" 1120 tooltip => "<b>Background Image Prefetch</b>\n\n"
798 . "If enabled, the client automatically pre-fetches images from the server. " 1121 . "If enabled, the client automatically pre-fetches images from the server. "
799 . "This might increase or create lag, but increases the chances " 1122 . "This might increase or create lag, but increases the chances "
800 . "of faces being ready for display when you encounter them. " 1123 . "of faces being ready for display when you encounter them. "
801 . "It also uses up server bandwidth on every connect, " 1124 . "It also uses up server bandwidth on every connect, "
802 . "so only set it if you really need to prefetch images. " 1125 . "so only set it if you really need to prefetch images. "
803 . "This option can be set and unset any time.", 1126 . "This option can be set and unset any time.",
804 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1127 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805 ); 1128 );
806 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
807 $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");
808 $table->add (1, 9, new CFClient::UI::Entry 1140 $table->add (1, 10, new CFPlus::UI::Entry
809 text => $CFG->{output_count}, 1141 text => $CFG->{output_count},
810 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.",
811 on_changed => sub { $CFG->{output_count} = $_[1] }, 1143 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812 ); 1144 );
813 1145
814 $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");
815 $table->add (1, 10, new CFClient::UI::Entry 1147 $table->add (1, 11, new CFPlus::UI::Entry
816 text => $CFG->{output_sync}, 1148 text => $CFG->{output_sync},
817 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.",
818 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1150 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819 ); 1151 );
820 1152
821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1153 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
822 expand => 1, 1154 expand => 1,
823 align => 0, 1155 align => 0,
824 text => "Login", 1156 text => "Login",
825 on_activate => sub { 1157 on_activate => sub {
826 $CONN ? stop_game 1158 $CONN ? stop_game
827 : start_game; 1159 : start_game;
1160 0
828 }, 1161 },
829 ); 1162 );
830 1163
831 $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
832} 1215}
833 1216
834sub message_window { 1217sub message_window {
835 my $window = new CFClient::UI::FancyFrame 1218 my $window = new CFPlus::UI::Toplevel
836 name => "message_window", 1219 name => "message_window",
837 title => "Messages", 1220 title => "Messages",
838 border_bg => [1, 1, 1, 1], 1221 border_bg => [1, 1, 1, 1],
839 bg => [0, 0, 0, 0.75],
840 x => "max", 1222 x => "max",
841 y => 0, 1223 y => 0,
842 force_w => $::WIDTH / 3, 1224 force_w => $::WIDTH * 0.4,
843 force_h => $::HEIGHT / 5, 1225 force_h => $::HEIGHT * 0.5,
844 child => (my $vbox = new CFClient::UI::VBox); 1226 child => (my $vbox = new CFPlus::UI::VBox),
1227 has_close_button => 1;
845 1228
846 $vbox->add ($LOGVIEW); 1229 $vbox->add ($LOGVIEW);
847 1230
848 $vbox->add (my $input = new CFClient::UI::Entry 1231 $vbox->add (my $input = new CFPlus::UI::Entry
849 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> "
850 . "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>...). "
851 . "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). "
852 . "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.",
853 on_focus_in => sub { 1236 on_focus_in => sub {
… …
857 1240
858 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1241 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
859 $input->{refocus_map} = 1; 1242 $input->{refocus_map} = 1;
860 } 1243 }
861 delete $input->{auto_activated}; 1244 delete $input->{auto_activated};
1245
1246 0
862 }, 1247 },
863 on_activate => sub { 1248 on_activate => sub {
864 my ($input, $text) = @_; 1249 my ($input, $text) = @_;
865 $input->set_text (''); 1250 $input->set_text ('');
866 1251
867 if ($text =~ /^\/bind\s+(.*)$/) {
868 CFClient::Recorder::open_binding_dialog ([$1]);
869 } elsif ($text =~ /^\/(.*)/) { 1252 if ($text =~ /^\/(.*)/) {
870 $::CONN->user_send ($1); 1253 $::CONN->user_send ($1);
871 } else { 1254 } else {
872 my $say_cmd = $::CFG->{say_command} || 'say'; 1255 my $say_cmd = $::CFG->{say_command} || 'say';
873 $::CONN->user_send ("$say_cmd $text"); 1256 $::CONN->user_send ("$say_cmd $text");
874 } 1257 }
875 if ($input->{refocus_map}) { 1258 if ($input->{refocus_map}) {
876 delete $input->{refocus_map}; 1259 delete $input->{refocus_map};
877 $MAPWIDGET->focus_in 1260 $MAPWIDGET->focus_in
878 } 1261 }
1262
1263 0
879 }, 1264 },
880 on_escape => sub { 1265 on_escape => sub {
881 $MAPWIDGET->focus_in 1266 $MAPWIDGET->grab_focus;
1267
1268 0
882 }, 1269 },
883 ); 1270 );
884 1271
885 $CONSOLE = { 1272 $CONSOLE = {
886 window => $window, 1273 window => $window,
… …
888 }; 1275 };
889 1276
890 $window 1277 $window
891} 1278}
892 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
893sub open_quit_dialog { 1622sub open_quit_dialog {
894 unless ($QUIT_DIALOG) { 1623 unless ($QUIT_DIALOG) {
895 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1624 $QUIT_DIALOG = new CFPlus::UI::Toplevel
896 x => "center", 1625 x => "center",
897 y => "center", 1626 y => "center",
1627 z => 50,
898 title => "Really Quit?", 1628 title => "Really Quit?",
1629 on_key_down => sub {
1630 my ($dialog, $ev) = @_;
1631 $ev->{sym} == 27 and $dialog->hide;
1632 }
899 ; 1633 ;
900 1634
901 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1635 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
902 1636
903 $vb->add (new CFClient::UI::Label 1637 $vb->add (new CFPlus::UI::Label
904 text => "You should find a savebed and apply it first!", 1638 text => "You should find a savebed and apply it first!",
905 max_w => $WIDTH * 0.25, 1639 max_w => $WIDTH * 0.25,
906 ellipsize => 0, 1640 ellipsize => 0,
907 ); 1641 );
908 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1642 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
909 $hb->add (new CFClient::UI::Button 1643 $hb->add (new CFPlus::UI::Button
910 text => "Ok", 1644 text => "Ok",
911 expand => 1, 1645 expand => 1,
912 on_activate => sub { $QUIT_DIALOG->hide }, 1646 on_activate => sub { $QUIT_DIALOG->hide; 0 },
913 ); 1647 );
914 $hb->add (new CFClient::UI::Button 1648 $hb->add (new CFPlus::UI::Button
915 text => "Quit anyway", 1649 text => "Quit anyway",
916 expand => 1, 1650 expand => 1,
917 on_activate => sub { exit }, 1651 on_activate => sub { exit },
918 ); 1652 );
919 } 1653 }
920 1654
921 $QUIT_DIALOG->show; 1655 $QUIT_DIALOG->show;
1656 $QUIT_DIALOG->grab_focus;
922} 1657}
923 1658
924sub make_inventory_window { 1659sub show_tip_of_the_day {
925 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1660 # find all tips
926 x => "center", 1661 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
927 y => "center",
928 force_w => $WIDTH * 9/10,
929 force_h => $HEIGHT * 9/10,
930 title => "Inventory",
931 name => "inventory_window",
932 ;
933 1662
934 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1663 CFPlus::DB::get state => "tip_of_the_day", sub {
1664 my ($todindex) = @_;
1665 $todindex = 0 if $todindex >= @tod;
1666 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
935 1667
936 $hb->add (my $vb1 = new CFClient::UI::VBox); 1668 # create dialog
937 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1669 my $dialog;
938 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
939 1670
940 $hb->add (my $vb2 = new CFClient::UI::VBox); 1671 my $close = sub {
941 1672 $dialog->destroy;
942 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
943
944 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
945
946 # XXX: Call after $INVR = ... because set_opencont sets the items
947 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
948
949 $invwin
950}
951
952sub make_binding_window {
953 my $binding_list = new CFClient::UI::VBox;
954
955 my $refresh = sub {
956 $binding_list->clear ();
957
958 for my $mod (keys %{$::CFG->{bindings}}) {
959 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
960 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
961 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
962
963 my $lbl = join "; ", @$cmds;
964 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);
965 $binding_list->add (my $hb = new CFClient::UI::HBox);
966 $hb->add (new CFClient::UI::Button
967 text => "delete",
968 on_activate => sub {
969 $binding_list->remove ($hb);
970 delete $::CFG->{bindings}->{$mod}->{$sym};
971 });
972 $hb->add (new CFClient::UI::Label text => "($nam)");
973 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
974 }
975 }
976 };
977
978 $BIND_WINDOW = new CFClient::UI::FancyFrame
979 title => "Bindings",
980 x => "center",
981 y => "center",
982 def_w => int $WIDTH * 9/10,
983 def_h => int $HEIGHT * 9/10,
984 on_visibility_change => sub {
985 my ($self, $visible) = @_;
986 $refresh->() if $visible;
987 }; 1673 };
988 1674
989 $BIND_WINDOW->add ($binding_list); 1675 $dialog = new CFPlus::UI::Toplevel
990 $refresh->(); 1676 x => "center",
991 $BIND_WINDOW 1677 y => "center",
992} 1678 z => 3,
993 1679 name => 'tip_of_the_day',
994sub make_help_window {
995 my $win = new CFClient::UI::FancyFrame
996 def_w => int $WIDTH * 7/8, 1680 force_w => int $WIDTH * 4/9,
997 def_h => int $HEIGHT * 7/8, 1681 force_h => int $WIDTH * 2/9,
998 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 ;
999 1687
1000 $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]);
1001 1691
1002 $vbox->add (my $buttons = new CFClient::UI::HBox); 1692 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1003 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1004 1693
1005 for ( 1694 $table->add (0, 0, new CFPlus::UI::Button
1006 [intro => "Introduction"],
1007 [manual => "Manual"],
1008 [command_help => "Commands"],
1009 [skill_help => "Skills"],
1010 ) {
1011 my ($pod, $label) = @$_;
1012
1013 $buttons->add (new CFClient::UI::Button
1014 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>.",
1015 on_activate => sub { 1703 on_activate => sub {
1016 my $parser = new Pod::POM; 1704 $close->();
1017 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1705 &show_tip_of_the_day;
1018
1019 $viewer->clear;
1020
1021 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1022 for @{ CFClient::pod_to_pango_list $pom };
1023
1024 $viewer->set_offset (0);
1025 }, 1706 },
1026 ); 1707 );
1708
1709 $dialog->show;
1027 } 1710 };
1028
1029 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1030
1031 $win
1032} 1711}
1033 1712
1034sub sdl_init { 1713sub sdl_init {
1035 CFClient::SDL_Init 1714 CFPlus::SDL_Init
1036 and die "SDL::Init failed!\n"; 1715 and die "SDL::Init failed!\n";
1037} 1716}
1038 1717
1039sub video_init { 1718sub video_init {
1040 sdl_init; 1719 sdl_init;
… …
1045 1724
1046 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1725 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1047 $FULLSCREEN = $CFG->{fullscreen}; 1726 $FULLSCREEN = $CFG->{fullscreen};
1048 $FAST = $CFG->{fast}; 1727 $FAST = $CFG->{fast};
1049 1728
1050 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1729 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1051 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1730 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1052 1731
1053 $SDL_ACTIVE = 1; 1732 $SDL_ACTIVE = 1;
1054 $LAST_REFRESH = time - 0.01; 1733 $LAST_REFRESH = time - 0.01;
1055 1734
1056 CFClient::OpenGL::init; 1735 CFPlus::OpenGL::init;
1057 1736
1058 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1737 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1059 1738
1060 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1739 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1061 1740
1062 ############################################################################# 1741 #############################################################################
1063 1742
1064 if ($DEBUG_STATUS) { 1743 if ($DEBUG_STATUS) {
1065 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1744 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1066 } else { 1745 } else {
1067 # create the widgets 1746 # create the widgets
1068 1747
1069 $DEBUG_STATUS = new CFClient::UI::Label 1748 $DEBUG_STATUS = new CFPlus::UI::Label
1070 padding => 0, 1749 padding => 0,
1071 z => 100, 1750 z => 100,
1072 force_x => "max", 1751 force_x => "max",
1073 force_y => 0; 1752 force_y => 0;
1074 $DEBUG_STATUS->show; 1753 $DEBUG_STATUS->show;
1075 1754
1076 $STATUSBOX = new CFClient::UI::Statusbox; 1755 $STATUSBOX = new CFPlus::UI::Statusbox;
1077 $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]);
1078 1757
1079 (new CFClient::UI::Frame 1758 (new CFPlus::UI::Frame
1080 bg => [0, 0, 0, 0.4], 1759 bg => [0, 0, 0, 0.4],
1081 force_x => 0, 1760 force_x => 0,
1082 force_y => "max", 1761 force_y => "max",
1083 child => $STATUSBOX, 1762 child => $STATUSBOX,
1084 )->show; 1763 )->show;
1085 1764
1086 CFClient::UI::FancyFrame->new ( 1765 CFPlus::UI::Toplevel->new (
1766 title => "Map",
1767 name => "mapmap",
1087 x => 0, 1768 x => 0,
1088 y => $FONTSIZE + 8, 1769 y => $FONTSIZE + 8,
1089 border_bg => [1, 1, 1, 192/255], 1770 border_bg => [1, 1, 1, 192/255],
1090 bg => [1, 1, 1, 0], 1771 bg => [1, 1, 1, 0],
1091 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1772 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1092 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.",
1093 ), 1774 ),
1094 )->show; 1775 )->show;
1095 1776
1096 $MAPWIDGET = new CFClient::MapWidget; 1777 $MAPWIDGET = new CFPlus::MapWidget;
1097 $MAPWIDGET->connect (activate_console => sub { 1778 $MAPWIDGET->connect (activate_console => sub {
1098 my ($mapwidget, $preset) = @_; 1779 my ($mapwidget, $preset) = @_;
1099 1780
1100 if ($CONSOLE) { 1781 if ($CONSOLE) {
1101 $CONSOLE->{input}->{auto_activated} = 1; 1782 $CONSOLE->{input}->{auto_activated} = 1;
1102 $CONSOLE->{input}->focus_in; 1783 $CONSOLE->{input}->grab_focus;
1103 1784
1104 if ($preset && $CONSOLE->{input}->get_text eq '') { 1785 if ($preset && $CONSOLE->{input}->get_text eq '') {
1105 $CONSOLE->{input}->set_text ($preset); 1786 $CONSOLE->{input}->set_text ($preset);
1106 } 1787 }
1107 } 1788 }
1108 }); 1789 });
1109 $MAPWIDGET->show; 1790 $MAPWIDGET->show;
1110 $MAPWIDGET->focus_in; 1791 $MAPWIDGET->grab_focus;
1111 1792
1112 $LOGVIEW = new CFClient::UI::TextView 1793 $LOGVIEW = new CFPlus::UI::TextScroller
1113 expand => 1, 1794 expand => 1,
1114 font => $FONT_FIXED, 1795 font => $FONT_FIXED,
1115 fontsize => $::CFG->{log_fontsize}, 1796 fontsize => $::CFG->{log_fontsize},
1797 indent => -4,
1116 can_hover => 1, 1798 can_hover => 1,
1117 can_events => 1, 1799 can_events => 1,
1800 max_par => $CFG->{logview_max_par},
1118 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.",
1119 ; 1802 ;
1120 1803
1121 $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 ;
1122 1814
1123 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1815 $METASERVER = metaserver_dialog;
1124 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1816
1125 $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,
1126 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
1127 $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,
1128 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.");
1129 1845
1130 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
1131 1847
1132 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1133 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1134 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1848 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1135 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.");
1136 1850
1137 $BUTTONBAR->add (new CFClient::UI::Button 1851 $BUTTONBAR->add (new CFPlus::UI::Button
1138 text => "Save Config", 1852 text => "Save Config",
1139 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.",
1140 on_activate => sub { 1854 on_activate => sub {
1141 $::CFG->{layout} = CFClient::UI::get_layout; 1855 $::CFG->{layout} = CFPlus::UI::get_layout;
1142 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1856 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1143 status "Configuration Saved"; 1857 status "Configuration Saved";
1858 0
1144 }, 1859 },
1145 ); 1860 );
1146 1861
1147 $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,
1148 tooltip => "View Documentation"); 1863 tooltip => "View Documentation");
1149 1864
1150 $BUTTONBAR->add (new CFClient::UI::Flopper
1151 text => "Bindings",
1152 other => make_binding_window,
1153 tooltip => "Lets you delete bindings you have made with the recorder"
1154 );
1155 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1156 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1157 1865
1158 $BUTTONBAR->add (new CFClient::UI::Button 1866 $BUTTONBAR->add (new CFPlus::UI::Button
1159 text => "Quit", 1867 text => "Quit",
1160 tooltip => "Terminates the program", 1868 tooltip => "Terminates the program",
1161 on_activate => sub { 1869 on_activate => sub {
1162 if ($CONN) { 1870 if ($CONN) {
1163 open_quit_dialog; 1871 open_quit_dialog;
1164 } else { 1872 } else {
1165 exit; 1873 exit;
1166 } 1874 }
1875 0
1167 }, 1876 },
1168 ); 1877 );
1169 1878
1170 $BUTTONBAR->show; 1879 $BUTTONBAR->show;
1171 $SERVER_SETUP->show; 1880 $SETUP_DIALOG->show;
1172
1173 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1174 } 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;
1175} 2003}
1176 2004
1177sub video_shutdown { 2005sub video_shutdown {
2006 CFPlus::OpenGL::shutdown;
2007
1178 undef $SDL_ACTIVE; 2008 undef $SDL_ACTIVE;
1179} 2009}
1180
1181my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1182my $bgmusic;#TODO#hack#d#
1183 2010
1184sub audio_channel_finished { 2011sub audio_channel_finished {
1185 my ($channel) = @_; 2012 my ($channel) = @_;
1186 2013
1187 #warn "channel $channel finished\n";#d# 2014 #warn "channel $channel finished\n";#d#
1188} 2015}
1189 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
1190sub audio_music_finished { 2067sub audio_music_finished {
1191 return unless $CFG->{bgm_enable}; 2068 $MUSIC_PLAYING = undef;
2069 undef $MUSIC_PLAYER;
1192 2070
1193 # TODO: hack, do play loop and mood music 2071 audio_music_changed;
1194 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1195 $bgmusic->play (0);
1196
1197 push @bgmusic, shift @bgmusic;
1198} 2072}
1199 2073
1200sub audio_init { 2074sub audio_init {
1201 if ($CFG->{audio_enable}) { 2075 if ($CFG->{audio_enable}) {
1202 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2076 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1203 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2077 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1204 2078
1205 unless ($SDL_MIXER) { 2079 unless ($SDL_MIXER) {
1206 status "Unable to open sound device: there will be no sound"; 2080 status "Unable to open sound device: there will be no sound";
1207 return; 2081 return;
1208 } 2082 }
1209 2083
1210 CFClient::Mix_AllocateChannels 8; 2084 CFPlus::Mix_AllocateChannels 8;
1211 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2085 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1212 2086
1213 audio_music_finished; 2087 audio_music_finished;
1214 2088
2089 local $_;
1215 while (<$fh>) { 2090 while (<$fh>) {
1216 next if /^\s*#/; 2091 next if /^\s*#/;
1217 next if /^\s*$/; 2092 next if /^\s*$/;
1218 2093
1219 my ($file, $volume, $event) = split /\s+/, $_, 3; 2094 my ($file, $volume, $event) = split /\s+/, $_, 3;
1220 2095
1221 push @SOUNDS, "$volume,$file"; 2096 push @SOUNDS, "$volume,$file";
1222 2097
1223 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2098 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1224 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";
1225 $chunk->volume ($volume * 128 / 100); 2100 $chunk->volume ($volume * 128 / 100);
1226 $chunk 2101 $chunk
1227 }; 2102 };
1228 } 2103 }
1229 } else { 2104 } else {
… …
1231 } 2106 }
1232 } 2107 }
1233} 2108}
1234 2109
1235sub audio_shutdown { 2110sub audio_shutdown {
1236 CFClient::Mix_CloseAudio if $SDL_MIXER; 2111 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1237 undef $SDL_MIXER; 2112 undef $SDL_MIXER;
1238 @SOUNDS = (); 2113 @SOUNDS = ();
1239 %AUDIO_CHUNKS = (); 2114 %AUDIO_CHUNKS = ();
1240} 2115}
1241 2116
… …
1246 2121
1247my %demo;#d# 2122my %demo;#d#
1248 2123
1249sub force_refresh { 2124sub force_refresh {
1250 $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;
1251 debug sprintf "%3.2f", $fps; 2126 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1252 2127
1253 $CFClient::UI::ROOT->draw; 2128 $CFPlus::UI::ROOT->draw;
1254 2129
1255 $WANT_REFRESH = 0; 2130 $WANT_REFRESH = 0;
1256 $CAN_REFRESH = 0; 2131 $CAN_REFRESH = 0;
1257 $LAST_REFRESH = $NOW; 2132 $LAST_REFRESH = $NOW;
1258 2133
12590 && do {
1260 # some weird model-drawing code, just a joke right now
1261 use CFClient::OpenGL;
1262
1263 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1264 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1265 $demo{r} ||= do {
1266 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1267 $mod->{v} = pack "f*", @{$mod->{v}};
1268 $_ = [scalar @$_, pack "S!*", @$_]
1269 for values %{$mod->{g}};
1270 $mod
1271 };
1272
1273 my $r = $demo{r} or die;
1274
1275 glDepthMask 1;
1276 glClear GL_DEPTH_BUFFER_BIT;
1277 glEnable GL_TEXTURE_2D;
1278 glEnable GL_DEPTH_TEST;
1279 glEnable GL_CULL_FACE;
1280 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1281
1282 glMatrixMode GL_PROJECTION;
1283 glLoadIdentity;
1284 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1285 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1286 glMatrixMode GL_MODELVIEW;
1287 glLoadIdentity;
1288
1289 glPushMatrix;
1290 glTranslate 0, 0, -800;
1291 glScale 1, -1, 1;
1292 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1293 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1294 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1295 glScale 50, 50, 50;
1296
1297 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1298 while (my ($k, $v) = each %{$r->{g}}) {
1299 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1300 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1301 }
1302
1303 glPopMatrix;
1304
1305 glShadeModel GL_FLAT;
1306 glDisable GL_DEPTH_TEST;
1307 glDisable GL_TEXTURE_2D;
1308 glDepthMask 0;
1309
1310 $WANT_REFRESH++;
1311};
1312
1313 CFClient::SDL_GL_SwapBuffers; 2134 CFPlus::SDL_GL_SwapBuffers;
1314} 2135}
1315 2136
1316my $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 {
1317 $NOW = time; 2138 $NOW = time;
1318 2139
1319 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2140 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1320 for CFClient::SDL_PollEvent; 2141 for CFPlus::SDL_PollEvent;
1321 2142
1322 if (%animate_object) { 2143 if (%animate_object) {
1323 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2144 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1324 $WANT_REFRESH++; 2145 $WANT_REFRESH++;
1325 } 2146 }
… …
1349 $CONN->face_prefetch 2170 $CONN->face_prefetch
1350 if $CONN; 2171 if $CONN;
1351}); 2172});
1352 2173
1353%SDL_CB = ( 2174%SDL_CB = (
1354 CFClient::SDL_QUIT => sub { 2175 CFPlus::SDL_QUIT => sub {
1355 Event::unloop -1; 2176 exit;
1356 }, 2177 },
1357 CFClient::SDL_VIDEORESIZE => sub { 2178 CFPlus::SDL_VIDEORESIZE => sub {
1358 }, 2179 },
1359 CFClient::SDL_VIDEOEXPOSE => sub { 2180 CFPlus::SDL_VIDEOEXPOSE => sub {
1360 CFClient::UI::full_refresh; 2181 CFPlus::UI::full_refresh;
1361 }, 2182 },
1362 CFClient::SDL_ACTIVEEVENT => sub { 2183 CFPlus::SDL_ACTIVEEVENT => sub {
1363# 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;
1364 }, 2189 },
1365 CFClient::SDL_KEYDOWN => sub { 2190 CFPlus::SDL_KEYDOWN => sub {
1366 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2191 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1367 # alt-enter 2192 # alt-enter
2193 $FULLSCREEN_ENABLE->toggle;
1368 video_shutdown; 2194 video_shutdown;
1369 $CFG->{fullscreen} = !$CFG->{fullscreen};
1370 video_init; 2195 video_init;
1371 } else { 2196 } else {
1372 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2197 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1373 } 2198 }
1374 }, 2199 },
1375 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2200 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1376 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2201 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1377 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2202 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1378 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2203 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1379 CFClient::SDL_USEREVENT => sub { 2204 CFPlus::SDL_USEREVENT => sub {
1380 if ($_[0]{code} == 1) { 2205 if ($_[0]{code} == 1) {
1381 audio_channel_finished $_[0]{data1}; 2206 audio_channel_finished $_[0]{data1};
1382 } elsif ($_[0]{code} == 0) { 2207 } elsif ($_[0]{code} == 0) {
1383 audio_music_finished; 2208 audio_music_finished;
1384 } 2209 }
… …
1388############################################################################# 2213#############################################################################
1389 2214
1390$SIG{INT} = $SIG{TERM} = sub { exit }; 2215$SIG{INT} = $SIG{TERM} = sub { exit };
1391 2216
1392{ 2217{
1393 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1394
1395 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2218 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2219 CFPlus::DB::Server::run;
2220
1396 CFClient::UI::set_layout ($::CFG->{layout}); 2221 CFPlus::UI::set_layout ($::CFG->{layout});
1397 2222
1398 my %DEF_CFG = ( 2223 my %DEF_CFG = (
1399 sdl_mode => 0, 2224 sdl_mode => 0,
1400 width => 640, 2225 width => 640,
1401 height => 480, 2226 height => 480,
1402 fullscreen => 0, 2227 fullscreen => 0,
1403 fast => 0, 2228 fast => 0,
1404 map_scale => 1, 2229 map_scale => 1,
1405 fow_enable => 1, 2230 fow_enable => 1,
1406 fow_intensity => 0.45, 2231 fow_intensity => 0.45,
1407 fow_smooth => 0, 2232 fow_smooth => 0,
2233 map_smoothing => 1,
1408 gui_fontsize => 1, 2234 gui_fontsize => 1,
1409 log_fontsize => 1, 2235 log_fontsize => 0.7,
1410 gauge_fontsize=> 1, 2236 gauge_fontsize => 1,
1411 gauge_size => 0.35, 2237 gauge_size => 0.35,
1412 stat_fontsize => 1, 2238 stat_fontsize => 0.7,
1413 mapsize => 100, 2239 mapsize => 100,
1414 host => "crossfire.schmorp.de",
1415 say_command => 'say', 2240 say_command => 'chat',
1416 audio_enable => 1, 2241 audio_enable => 1,
1417 bgm_enable => 1, 2242 bgm_enable => 1,
1418 bgm_volume => 0.25, 2243 bgm_volume => 0.25,
1419 face_prefetch => 0, 2244 face_prefetch => 0,
1420 output_sync => 1, 2245 output_sync => 1,
1421 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 );
1422 ); 2254
1423
1424 while (my ($k, $v) = each %DEF_CFG) { 2255 while (my ($k, $v) = each %DEF_CFG) {
1425 $CFG->{$k} = $v unless exists $CFG->{$k}; 2256 $CFG->{$k} = $v unless exists $CFG->{$k};
1426 } 2257 }
1427 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
1428 sdl_init; 2274 sdl_init;
1429 2275
1430 @SDL_MODES = reverse 2276 @SDL_MODES = reverse
1431 grep $_->[0] >= 640 && $_->[1] >= 480, 2277 grep $_->[0] >= 640 && $_->[1] >= 480,
1432 CFClient::SDL_ListModes; 2278 CFPlus::SDL_ListModes;
1433 2279
1434 @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)";
1435 2281
1436 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2282 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1437 2283
1438 { 2284 {
1439 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2285 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1440 DejaVuSans.ttf 2286 DejaVuSans.ttf
1441 DejaVuSansMono.ttf 2287 DejaVuSansMono.ttf
1442 DejaVuSans-Bold.ttf 2288 DejaVuSans-Bold.ttf
1443 DejaVuSansMono-Bold.ttf 2289 DejaVuSansMono-Bold.ttf
1444 DejaVuSans-Oblique.ttf 2290 DejaVuSans-Oblique.ttf
1445 DejaVuSansMono-Oblique.ttf 2291 DejaVuSansMono-Oblique.ttf
1446 DejaVuSans-BoldOblique.ttf 2292 DejaVuSans-BoldOblique.ttf
1447 DejaVuSansMono-BoldOblique.ttf 2293 DejaVuSansMono-BoldOblique.ttf
1448 ); 2294 );
1449 2295
1450 CFClient::add_font $_ for @fonts; 2296 CFPlus::add_font $_ for @fonts;
1451 2297
1452 CFClient::pango_init; 2298 CFPlus::pango_init;
1453 2299
1454 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2300 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1455 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2301 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1456 2302
1457 $FONT_PROP->make_default; 2303 $FONT_PROP->make_default;
1458 } 2304 }
1459 2305
1460# compare mono (ft) vs. rgba (cairo) 2306# compare mono (ft) vs. rgba (cairo)
1461# ft - 1.8s, cairo 3s, even in alpha-only mode 2307# ft - 1.8s, cairo 3s, even in alpha-only mode
1462# for my $rgba (0..1) { 2308# for my $rgba (0..1) {
1463# my $t1 = Time::HiRes::time; 2309# my $t1 = Time::HiRes::time;
1464# for (1..1000) { 2310# for (1..1000) {
1465# my $layout = CFClient::Layout->new ($rgba); 2311# my $layout = CFPlus::Layout->new ($rgba);
1466# $layout->set_text ("hallo" x 100); 2312# $layout->set_text ("hallo" x 100);
1467# $layout->render; 2313# $layout->render;
1468# } 2314# }
1469# my $t2 = Time::HiRes::time; 2315# my $t2 = Time::HiRes::time;
1470# warn $t2-$t1; 2316# warn $t2-$t1;
1471# } 2317# }
1472 2318
2319 $startup_done->();
2320
1473 video_init; 2321 video_init;
1474 audio_init; 2322 audio_init;
1475} 2323}
1476 2324
2325show_tip_of_the_day if $CFG->{show_tips};
2326
1477Event::loop; 2327Event::loop;
2328#CFPlus::SDL_Quit;
2329#CFPlus::_exit 0;
1478 2330
1479END { CFClient::SDL_Quit } 2331END {
2332 CFPlus::SDL_Quit;
2333 CFPlus::DB::Server::stop;
2334}
1480 2335
1481=head1 NAME 2336=head1 NAME
1482 2337
1483cfplus - A Crossfire+ and Crossfire game client 2338cfplus - A Crossfire+ and Crossfire game client
1484 2339
… …
1489=head1 USAGE 2344=head1 USAGE
1490 2345
1491cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2346cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1492fullscreen and interactively. 2347fullscreen and interactively.
1493 2348
2349=head1 DEBUGGING
2350
2351
2352CFPLUS_DEBUG - environment variable
2353
2354 1 draw borders around widgets
2355 2 add low-level widget info to tooltips
2356 4 show fps
2357 8 suppress tooltips
2358
1494=head1 AUTHOR 2359=head1 AUTHOR
1495 2360
1496Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2361Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1497 2362
1498 2363

Diff Legend

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