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.49 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.148 by root, Mon Apr 9 04:39:11 2007 UTC

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

Diff Legend

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