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

Diff Legend

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