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

Diff Legend

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