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.51 by root, Sat Jun 3 21:59:55 2006 UTC vs.
Revision 1.142 by root, Mon Mar 12 22:23:09 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
807 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1063 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
808 $table->add (1, 9, new CFClient::UI::Entry 1064 $table->add (1, 9, new CFPlus::UI::Entry
809 text => $CFG->{output_count}, 1065 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.", 1066 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] }, 1067 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812 ); 1068 );
813 1069
814 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1070 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
815 $table->add (1, 10, new CFClient::UI::Entry 1071 $table->add (1, 10, new CFPlus::UI::Entry
816 text => $CFG->{output_sync}, 1072 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.", 1073 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] }, 1074 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819 ); 1075 );
820 1076
821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1077 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
822 expand => 1, 1078 expand => 1,
823 align => 0, 1079 align => 0,
824 text => "Login", 1080 text => "Login",
825 on_activate => sub { 1081 on_activate => sub {
826 $CONN ? stop_game 1082 $CONN ? stop_game
827 : start_game; 1083 : start_game;
1084 0
828 }, 1085 },
829 ); 1086 );
830 1087
831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1088 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1089 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
833 text => $CFG->{say_command}, 1090 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. " 1091 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. " 1092 . "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.", 1093 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub { 1094 on_changed => sub {
838 my ($self, $value) = @_; 1095 my ($self, $value) = @_;
839 $CFG->{say_command} = $value; 1096 $CFG->{say_command} = $value;
1097 0
840 } 1098 }
1099 );
1100
1101 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1102 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1103 state => $CFG->{show_tips},
1104 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1105 on_changed => sub {
1106 my ($self, $value) = @_;
1107 $CFG->{show_tips} = $value;
1108 0
1109 }
1110 );
1111
1112 $vbox->add (new CFPlus::UI::FancyFrame
1113 label => "Server Info",
1114 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
841 ); 1115 );
842 1116
843 $vbox 1117 $vbox
844} 1118}
845 1119
846sub message_window { 1120sub message_window {
847 my $window = new CFClient::UI::FancyFrame 1121 my $window = new CFPlus::UI::Toplevel
848 name => "message_window", 1122 name => "message_window",
849 title => "Messages", 1123 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1124 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75],
852 x => "max", 1125 x => "max",
853 y => 0, 1126 y => 0,
854 force_w => $::WIDTH / 3, 1127 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1128 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1129 child => (my $vbox = new CFPlus::UI::VBox),
1130 has_close_button => 1;
857 1131
858 $vbox->add ($LOGVIEW); 1132 $vbox->add ($LOGVIEW);
859 1133
860 $vbox->add (my $input = new CFClient::UI::Entry 1134 $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> " 1135 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>...). " 1136 . "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). " 1137 . "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.", 1138 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
865 on_focus_in => sub { 1139 on_focus_in => sub {
… …
869 1143
870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1144 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
871 $input->{refocus_map} = 1; 1145 $input->{refocus_map} = 1;
872 } 1146 }
873 delete $input->{auto_activated}; 1147 delete $input->{auto_activated};
1148
1149 0
874 }, 1150 },
875 on_activate => sub { 1151 on_activate => sub {
876 my ($input, $text) = @_; 1152 my ($input, $text) = @_;
877 $input->set_text (''); 1153 $input->set_text ('');
878 1154
… …
884 } 1160 }
885 if ($input->{refocus_map}) { 1161 if ($input->{refocus_map}) {
886 delete $input->{refocus_map}; 1162 delete $input->{refocus_map};
887 $MAPWIDGET->focus_in 1163 $MAPWIDGET->focus_in
888 } 1164 }
1165
1166 0
889 }, 1167 },
890 on_escape => sub { 1168 on_escape => sub {
891 $MAPWIDGET->focus_in 1169 $MAPWIDGET->grab_focus;
1170
1171 0
892 }, 1172 },
893 ); 1173 );
894 1174
895 $CONSOLE = { 1175 $CONSOLE = {
896 window => $window, 1176 window => $window,
… …
898 }; 1178 };
899 1179
900 $window 1180 $window
901} 1181}
902 1182
1183sub autopickup_setup {
1184 my $table = new CFPlus::UI::Table;
1185
1186 for (
1187 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG],
1192 ],
1193 ["Weapons", 0, 6,
1194 ["All weapons" => PICKUP_ALLWEAPON],
1195 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1196 ["Bows" => PICKUP_BOW],
1197 ["Arrows" => PICKUP_ARROW],
1198 ],
1199 ["Armour", 0, 12,
1200 ["Helmets" => PICKUP_HELMET],
1201 ["Shields" => PICKUP_SHIELD],
1202 ["Body Armour" => PICKUP_ARMOUR],
1203 ["Boots" => PICKUP_BOOTS],
1204 ["Gloves" => PICKUP_GLOVES],
1205 ["Cloaks" => PICKUP_CLOAK],
1206 ],
1207
1208 ["Readables", 2, 0,
1209 ["Spellbooks" => PICKUP_SPELLBOOK],
1210 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1211 ["Normal Books/Scrolls" => PICKUP_READABLES],
1212 ],
1213 ["Misc", 2, 5,
1214 ["Food" => PICKUP_FOOD],
1215 ["Drinks" => PICKUP_DRINK],
1216 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1217 ["Keys" => PICKUP_KEY],
1218 ["Magical Items" => PICKUP_MAGICAL],
1219 ["Potions" => PICKUP_POTION],
1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1221 ["Ignore cursed" => PICKUP_NOT_CURSED],
1222 ["Jewelery" => PICKUP_JEWELS],
1223 ["Flesh" => PICKUP_FLESH],
1224 ],
1225 ["Weight/Value ratio", 2, 17]
1226 )
1227 {
1228 my ($title, $x, $y, @bits) = @$_;
1229 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1230
1231 for (@bits) {
1232 ++$y;
1233
1234 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1237 state => $::CFG->{pickup} & $mask,
1238 on_changed => sub {
1239 my ($box, $value) = @_;
1240
1241 if ($value) {
1242 $::CFG->{pickup} |= $mask;
1243 } else {
1244 $::CFG->{pickup} &= ~$mask;
1245 }
1246
1247 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN;
1249
1250 0
1251 });
1252
1253 ${$_->[2]} = $checkbox if $_->[2];
1254 }
1255 }
1256
1257 $table->add (2, 18, new CFPlus::UI::ValSlider
1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259 template => ">= 99",
1260 to_value => sub { ">= " . 5 * $_[0] },
1261 on_changed => sub {
1262 my ($slider, $value) = @_;
1263
1264 $::CFG->{pickup} &= ~0xF;
1265 $::CFG->{pickup} |= int $value
1266 if $value;
1267 1;
1268 });
1269
1270 $table->add (3, 18, new CFPlus::UI::Button
1271 text => "set",
1272 on_activate => sub {
1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN;
1275 0
1276 });
1277
1278 $table
1279}
1280
1281my %SORT_ORDER = (
1282 type => undef,
1283 mtime => sub {
1284 my $NOW = time;
1285 sort {
1286 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1287 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1288
1289 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1290 or $btime <=> $atime
1291 or $a->{type} <=> $b->{type}
1292 } @_
1293 },
1294 weight => sub { sort {
1295 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1296 or $a->{type} <=> $b->{type}
1297 } @_ },
1298);
1299
1300sub inventory_widget {
1301 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1302
1303 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1304 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1305
1306 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1307
1308 use sort 'stable';
1309
1310 $hb1->add (new CFPlus::UI::Selector
1311 value => $::CFG->{inv_sort},
1312 options => [
1313 [type => "Type/Name"],
1314 [mtime => "Recent/Normal/Locked"],
1315 [weight => "Weight/Type"],
1316 ],
1317 on_changed => sub {
1318 $::CFG->{inv_sort} = $_[1];
1319 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1320 },
1321 );
1322 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1323 #TODO# update to weigh/maxweight
1324 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1325
1326 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1327 $sw1->add ($INV = new CFPlus::UI::Inventory);
1328 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1329
1330 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1331
1332 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1333
1334 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1335 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1336
1337 # XXX: Call after $INVR = ... because set_opencont sets the items
1338 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1339
1340 $hb
1341}
1342
1343sub toggle_player_page {
1344 my ($widget) = @_;
1345
1346 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1347 $PL_WINDOW->hide;
1348 } else {
1349 $PL_NOTEBOOK->set_current_page ($widget);
1350 $PL_WINDOW->show;
1351 }
1352}
1353
1354sub player_window {
1355 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1356 x => "center",
1357 y => "center",
1358 force_w => $WIDTH * 9/10,
1359 force_h => $HEIGHT * 9/10,
1360 title => "Player",
1361 name => "playerbook",
1362 has_close_button => 1
1363 ;
1364
1365 my $ntb =
1366 $PL_NOTEBOOK =
1367 new CFPlus::UI::Notebook expand => 1, debug => 1;
1368
1369 $ntb->add (
1370 "Statistics (F2)" => $STATS_PAGE = stats_window,
1371 "Shows statistics, where all your Stats and Resistances are shown."
1372 );
1373 $ntb->add (
1374 "Skills (F3)" => $SKILL_PAGE = skill_window,
1375 "Shows all your Skills."
1376 );
1377
1378 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1379 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1380 $ntb->add (
1381 "Spellbook (F4)" => $spellsw,
1382 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1383 );
1384 $ntb->add (
1385 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1386 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1387 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1388 );
1389
1390 $ntb->set_current_page ($INVENTORY_PAGE);
1391
1392 $plwin->add ($ntb);
1393 $plwin
1394}
1395
1396sub keyboard_setup {
1397 CFPlus::Macro::keyboard_setup
1398}
1399
1400sub help_window {
1401 my $win = new CFPlus::UI::Toplevel
1402 x => 'center',
1403 y => 'center',
1404 z => 4,
1405 name => 'doc_browser',
1406 force_w => int $WIDTH * 7/8,
1407 force_h => int $HEIGHT * 7/8,
1408 title => "Help Browser",
1409 has_close_button => 1;
1410
1411 $win->add (my $vbox = new CFPlus::UI::VBox);
1412
1413 $vbox->add (new CFPlus::UI::FancyFrame
1414 label => "Navigation",
1415 child => (my $buttons = new CFPlus::UI::HBox),
1416 );
1417 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1418 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1419
1420 my @history;
1421 my @future;
1422 my $curnode;
1423
1424 my $load_node; $load_node = sub {
1425 my ($node, $para) = @_;
1426
1427 $buttons->clear;
1428
1429 $buttons->add (new CFPlus::UI::Button
1430 text => "⇤",
1431 tooltip => "back to the starting page",
1432 on_activate => sub {
1433 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1434 unshift @future, @history;
1435 @history = ();
1436 $load_node->(@{shift @future});
1437 },
1438 );
1439
1440 if (@history) {
1441 $buttons->add (new CFPlus::UI::Button
1442 text => "⋘",
1443 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1444 on_activate => sub {
1445 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1446 $load_node->(@{pop @history});
1447 },
1448 );
1449 }
1450
1451 if (@future) {
1452 $buttons->add (new CFPlus::UI::Button
1453 text => "â‹™",
1454 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1455 on_activate => sub {
1456 push @history, [$curnode, $viewer->current_paragraph];
1457 $load_node->(@{shift @future});
1458 },
1459 );
1460 }
1461
1462 $buttons->add (new CFPlus::UI::Label text => " ");
1463
1464 my @path = CFPlus::Pod::full_path_of $node;
1465 pop @path; # drop current node
1466
1467 for my $node (@path) {
1468 $buttons->add (new CFPlus::UI::Button
1469 text => $node->{kw}[0],
1470 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1471 on_activate => sub {
1472 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1473 $load_node->($node);
1474 },
1475 );
1476 $buttons->add (new CFPlus::UI::Label text => "/");
1477 }
1478
1479 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1480
1481 $curnode = $node;
1482
1483 $viewer->clear;
1484 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1485 $viewer->scroll_to ($para);
1486 };
1487
1488 $load_node->(CFPlus::Pod::find pod => "mainpage");
1489
1490 $CFPlus::Pod::goto_document = sub {
1491 my (@path) = @_;
1492
1493 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1494
1495 $load_node->((CFPlus::Pod::find @path)[0]);
1496 $win->show;
1497 };
1498
1499 $win
1500}
1501
1502sub open_string_query {
1503 my ($title, $cb, $txt, $tooltip) = @_;
1504 my $dialog = new CFPlus::UI::Toplevel
1505 x => "center",
1506 y => "center",
1507 z => 50,
1508 force_w => $WIDTH * 4/5,
1509 title => $title;
1510
1511 $dialog->add (
1512 my $e = new CFPlus::UI::Entry
1513 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1514 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1515 tooltip => $tooltip
1516 );
1517
1518 $e->grab_focus;
1519 $e->set_text ($txt) if $txt;
1520 $dialog->show;
1521}
1522
903sub open_quit_dialog { 1523sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1524 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1525 $QUIT_DIALOG = new CFPlus::UI::Toplevel
906 x => "center", 1526 x => "center",
907 y => "center", 1527 y => "center",
1528 z => 50,
908 title => "Really Quit?", 1529 title => "Really Quit?",
1530 on_key_down => sub {
1531 my ($dialog, $ev) = @_;
1532 $ev->{sym} == 27 and $dialog->hide;
1533 }
909 ; 1534 ;
910 1535
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1536 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
912 1537
913 $vb->add (new CFClient::UI::Label 1538 $vb->add (new CFPlus::UI::Label
914 text => "You should find a savebed and apply it first!", 1539 text => "You should find a savebed and apply it first!",
915 max_w => $WIDTH * 0.25, 1540 max_w => $WIDTH * 0.25,
916 ellipsize => 0, 1541 ellipsize => 0,
917 ); 1542 );
918 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1543 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
919 $hb->add (new CFClient::UI::Button 1544 $hb->add (new CFPlus::UI::Button
920 text => "Ok", 1545 text => "Ok",
921 expand => 1, 1546 expand => 1,
922 on_activate => sub { $QUIT_DIALOG->hide }, 1547 on_activate => sub { $QUIT_DIALOG->hide; 0 },
923 ); 1548 );
924 $hb->add (new CFClient::UI::Button 1549 $hb->add (new CFPlus::UI::Button
925 text => "Quit anyway", 1550 text => "Quit anyway",
926 expand => 1, 1551 expand => 1,
927 on_activate => sub { exit }, 1552 on_activate => sub { exit },
928 ); 1553 );
929 } 1554 }
930 1555
931 $QUIT_DIALOG->show; 1556 $QUIT_DIALOG->show;
1557 $QUIT_DIALOG->grab_focus;
932} 1558}
933 1559
934sub autopickup_setup { 1560sub show_tip_of_the_day {
935 my $table = new CFClient::UI::Table; 1561 # find all tips
1562 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
936 1563
937 for ( 1564 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
938 ["General", 0, 0, 1565 $todindex = 0 if $todindex >= @tod;
939 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1566 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
940 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
941 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
942 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
943 ],
944 ["Weapons", 0, 6,
945 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
946 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
947 ["Bows" => CFClient::Pickup::PU_BOW],
948 ["Arrows" => CFClient::Pickup::PU_ARROW],
949 ],
950 ["Armour", 0, 12,
951 ["Helmets" => CFClient::Pickup::PU_HELMET],
952 ["Shields" => CFClient::Pickup::PU_SHIELD],
953 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
954 ["Boots" => CFClient::Pickup::PU_BOOTS],
955 ["Gloves" => CFClient::Pickup::PU_GLOVES],
956 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
957 ],
958 1567
959 ["Readables", 2, 2, 1568 # create dialog
960 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1569 my $dialog;
961 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
962 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
963 ],
964 ["Misc", 2, 7,
965 ["Food" => CFClient::Pickup::PU_FOOD],
966 ["Drinks" => CFClient::Pickup::PU_DRINK],
967 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
968 ["Keys" => CFClient::Pickup::PU_KEY],
969 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
970 ["Potions" => CFClient::Pickup::PU_POTION],
971 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
972 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
973 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
974 ],
975 )
976 {
977 my ($title, $x, $y, @bits) = @$_;
978 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
979 1570
980 for (@bits) { 1571 my $close = sub {
981 ++$y; 1572 $dialog->destroy;
982
983 my $mask = $_->[1];
984 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
985 $table->add ($x+1, $y, new CFClient::UI::CheckBox
986 state => $CFG->{pickup} & $mask,
987 on_changed => sub {
988 my ($box, $value) = @_;
989 if ($value) {
990 $::CFG->{pickup} |= $mask;
991 } else {
992 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
993 }
994 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
995 if defined $::CONN;
996 });
997 }
998 } 1573 };
999 1574
1000 $table 1575 $dialog = new CFPlus::UI::Toplevel
1001}
1002
1003sub make_inventory_window {
1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center", 1576 x => "center",
1006 y => "center", 1577 y => "center",
1578 z => 3,
1579 name => 'tip_of_the_day',
1007 force_w => $WIDTH * 9/10, 1580 force_w => int $WIDTH * 4/9,
1008 force_h => $HEIGHT * 9/10, 1581 force_h => int $WIDTH * 2/9,
1009 title => "Inventory", 1582 title => "Tip of the day #" . (1 + $todindex),
1583 child => my $vbox = new CFPlus::UI::VBox,
1584 has_close_button => 1,
1585 on_delete => $close,
1010 ; 1586 ;
1011 1587
1012 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1588 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1589 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1590 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1013 1591
1014 $hb->add (my $vb1 = new CFClient::UI::VBox); 1592 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1015 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1016 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
1017 1593
1018 $hb->add (my $vb2 = new CFClient::UI::VBox); 1594 $table->add (0, 0, new CFPlus::UI::Button
1019 1595 text => "Close",
1020 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1596 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>.",
1021 1597 on_activate => $close,
1022 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1023
1024 # XXX: Call after $INVR = ... because set_opencont sets the items
1025 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1026
1027 $invwin
1028}
1029
1030sub spell_setup {
1031 new CFClient::UI::SpellList
1032}
1033
1034sub keyboard_setup {
1035 my $binding_list = new CFClient::UI::VBox;
1036
1037 my $refresh;
1038 $refresh = sub {
1039 $binding_list->clear ();
1040
1041 for my $mod (keys %{$::CFG->{bindings}}) {
1042 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1043 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1044 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1045
1046 my $lbl = join "; ", @$cmds;
1047 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1048 $binding_list->add (my $hb = new CFClient::UI::HBox);
1049 $hb->add (new CFClient::UI::Button
1050 text => "delete",
1051 tooltip => "Deletes the binding",
1052 on_activate => sub {
1053 $binding_list->remove ($hb);
1054 delete $::CFG->{bindings}->{$mod}->{$sym};
1055 });
1056
1057 $hb->add (new CFClient::UI::Button
1058 text => "edit",
1059 tooltip => "Edits the binding",
1060 on_activate => sub {
1061 $::BIND_EDITOR->set_binding (
1062 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1063 sub {
1064 my ($nmod, $nsym, $ncmds) = @_;
1065 delete $::CFG->{bindings}->{$mod}->{$sym};
1066 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1067 $refresh->();
1068 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1069 $SETUP_DIALOG->show;
1070 },
1071 sub {
1072 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1073 $SETUP_DIALOG->show;
1074 });
1075 $::BIND_EDITOR->show;
1076 $SETUP_DIALOG->hide;
1077 });
1078
1079 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1080 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1081 }
1082 }
1083 }; 1598 );
1084 1599
1085 my $vb = new CFClient::UI::VBox;
1086 $vb->add ($binding_list);
1087 $vb->add (my $hb = new CFClient::UI::HBox);
1088
1089 $hb->add (new CFClient::UI::Button 1600 $table->add (2, 0, new CFPlus::UI::Button
1090 text => "record new", 1601 text => "Next",
1091 expand => 1, 1602 tooltip => "Show the next <b>Tip of the day</b>.",
1092 tooltip => "This button opens the binding editor with an empty binding.",
1093 on_activate => sub { 1603 on_activate => sub {
1094 $::BIND_EDITOR->set_binding (undef, undef, [], 1604 $close->();
1095 sub { 1605 &show_tip_of_the_day;
1096 my ($mod, $sym, $cmds) = @_;
1097 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1098 $refresh->();
1099 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1100 $SETUP_DIALOG->show;
1101 },
1102 sub {
1103 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1104 $SETUP_DIALOG->show;
1105 });
1106 $SETUP_DIALOG->hide;
1107 $::BIND_EDITOR->show;
1108 }, 1606 },
1109 ); 1607 );
1110 1608
1111 $hb->add (new CFClient::UI::Button 1609 $dialog->show;
1112 text => "close",
1113 tooltip => "Closes the binding window",
1114 expand => 1,
1115 on_activate => sub {
1116 $SETUP_DIALOG->hide;
1117 }
1118 );
1119
1120 $refresh->();
1121
1122 $vb
1123}
1124
1125sub make_help_window {
1126 my $win = new CFClient::UI::FancyFrame
1127 x => 'center',
1128 y => 'center',
1129 name => 'doc_browser',
1130 force_w => int $WIDTH * 7/8,
1131 force_h => int $HEIGHT * 7/8,
1132 title => "Documentation";
1133
1134 $win->add (my $vbox = new CFClient::UI::VBox);
1135
1136 $vbox->add (my $buttons = new CFClient::UI::HBox);
1137 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1138
1139 for (
1140 [intro => "Introduction"],
1141 [manual => "Manual"],
1142 [command_help => "Commands"],
1143 [skill_help => "Skills"],
1144 ) {
1145 my ($pod, $label) = @$_;
1146
1147 $buttons->add (new CFClient::UI::Button
1148 text => $label,
1149 on_activate => sub {
1150 my $parser = new Pod::POM;
1151 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1152
1153 $viewer->clear;
1154
1155 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1156 for @{ CFClient::pod_to_pango_list $pom };
1157
1158 $viewer->set_offset (0);
1159 },
1160 );
1161 }
1162
1163 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1164
1165 $win
1166} 1610}
1167 1611
1168sub sdl_init { 1612sub sdl_init {
1169 CFClient::SDL_Init 1613 CFPlus::SDL_Init
1170 and die "SDL::Init failed!\n"; 1614 and die "SDL::Init failed!\n";
1171} 1615}
1172 1616
1173sub video_init { 1617sub video_init {
1174 sdl_init; 1618 sdl_init;
… …
1179 1623
1180 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1624 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1181 $FULLSCREEN = $CFG->{fullscreen}; 1625 $FULLSCREEN = $CFG->{fullscreen};
1182 $FAST = $CFG->{fast}; 1626 $FAST = $CFG->{fast};
1183 1627
1184 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1628 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1185 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1629 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1186 1630
1187 $SDL_ACTIVE = 1; 1631 $SDL_ACTIVE = 1;
1188 $LAST_REFRESH = time - 0.01; 1632 $LAST_REFRESH = time - 0.01;
1189 1633
1190 CFClient::OpenGL::init; 1634 CFPlus::OpenGL::init;
1191 1635
1192 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1636 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1193 1637
1194 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1638 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1195 1639
1196 ############################################################################# 1640 #############################################################################
1197 1641
1198 if ($DEBUG_STATUS) { 1642 if ($DEBUG_STATUS) {
1199 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1643 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1200 } else { 1644 } else {
1201 # create the widgets 1645 # create the widgets
1202 1646
1203 $DEBUG_STATUS = new CFClient::UI::Label 1647 $DEBUG_STATUS = new CFPlus::UI::Label
1204 padding => 0, 1648 padding => 0,
1205 z => 100, 1649 z => 100,
1206 force_x => "max", 1650 force_x => "max",
1207 force_y => 0; 1651 force_y => 0;
1208 $DEBUG_STATUS->show; 1652 $DEBUG_STATUS->show;
1209 1653
1210 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1211
1212 $STATUSBOX = new CFClient::UI::Statusbox; 1654 $STATUSBOX = new CFPlus::UI::Statusbox;
1213 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1655 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1214 1656
1215 (new CFClient::UI::Frame 1657 (new CFPlus::UI::Frame
1216 bg => [0, 0, 0, 0.4], 1658 bg => [0, 0, 0, 0.4],
1217 force_x => 0, 1659 force_x => 0,
1218 force_y => "max", 1660 force_y => "max",
1219 child => $STATUSBOX, 1661 child => $STATUSBOX,
1220 )->show; 1662 )->show;
1221 1663
1222 CFClient::UI::FancyFrame->new ( 1664 CFPlus::UI::Toplevel->new (
1223 title => "Map", 1665 title => "Map",
1224 name => "mapmap", 1666 name => "mapmap",
1225 x => 0, 1667 x => 0,
1226 y => $FONTSIZE + 8, 1668 y => $FONTSIZE + 8,
1227 border_bg => [1, 1, 1, 192/255], 1669 border_bg => [1, 1, 1, 192/255],
1228 bg => [1, 1, 1, 0], 1670 bg => [1, 1, 1, 0],
1229 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1671 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1230 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1672 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1231 ), 1673 ),
1232 )->show; 1674 )->show;
1233 1675
1234 $MAPWIDGET = new CFClient::MapWidget; 1676 $MAPWIDGET = new CFPlus::MapWidget;
1235 $MAPWIDGET->connect (activate_console => sub { 1677 $MAPWIDGET->connect (activate_console => sub {
1236 my ($mapwidget, $preset) = @_; 1678 my ($mapwidget, $preset) = @_;
1237 1679
1238 if ($CONSOLE) { 1680 if ($CONSOLE) {
1239 $CONSOLE->{input}->{auto_activated} = 1; 1681 $CONSOLE->{input}->{auto_activated} = 1;
1240 $CONSOLE->{input}->focus_in; 1682 $CONSOLE->{input}->grab_focus;
1241 1683
1242 if ($preset && $CONSOLE->{input}->get_text eq '') { 1684 if ($preset && $CONSOLE->{input}->get_text eq '') {
1243 $CONSOLE->{input}->set_text ($preset); 1685 $CONSOLE->{input}->set_text ($preset);
1244 } 1686 }
1245 } 1687 }
1246 }); 1688 });
1247 $MAPWIDGET->show; 1689 $MAPWIDGET->show;
1248 $MAPWIDGET->focus_in; 1690 $MAPWIDGET->grab_focus;
1249 1691
1250 $LOGVIEW = new CFClient::UI::TextView 1692 $LOGVIEW = new CFPlus::UI::TextScroller
1251 expand => 1, 1693 expand => 1,
1252 font => $FONT_FIXED, 1694 font => $FONT_FIXED,
1253 fontsize => $::CFG->{log_fontsize}, 1695 fontsize => $::CFG->{log_fontsize},
1696 indent => -4,
1254 can_hover => 1, 1697 can_hover => 1,
1255 can_events => 1, 1698 can_events => 1,
1256 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1699 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1257 ; 1700 ;
1258 1701
1259 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1260 title => "Setup", 1703 title => "Setup",
1261 name => "setup_dialog", 1704 name => "setup_dialog",
1262 x => 'center', 1705 x => 'center',
1263 y => 'center', 1706 y => 'center',
1707 z => 2,
1264 force_w => $::WIDTH * 0.6, 1708 force_w => $::WIDTH * 0.6,
1265 force_h => $::HEIGHT * 0.6, 1709 force_h => $::HEIGHT * 0.6,
1710 has_close_button => 1,
1266 ; 1711 ;
1267 1712
1713 $METASERVER = metaserver_dialog;
1714
1268 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1715 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1269 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1716 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1270 1717
1271 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1718 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1272 "Configure the server to play on, your username, password and other server-related options."); 1719 "Configure the server to play on, your username, password and other server-related options.");
1273 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1720 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1274 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1721 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1275 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1722 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1276 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1723 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1277 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1724 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1278 "Configure the use of audio, sound effects and background music."); 1725 "Configure the use of audio, sound effects and background music.");
1279 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1726 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1280 "Lets you define, edit and delete bindings." 1727 "Lets you define, edit and delete key bindings."
1281 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor " 1728 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1282 . "with nothing set and the recording started. After doing the actions you " 1729 . "with nothing set and the recording started. After doing the actions you "
1283 . "want to record press Insert and you will be asked to press a key-combo." 1730 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1284 . "After pressing the combo the binding will be saved automatically and the " 1731 . "After pressing the combo the binding will be saved automatically and the "
1285 . "binding editor closes"); 1732 . "binding editor closes");
1286 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1733 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1287 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1734 "Some debuggin' options. Do not ask.");
1288 1735
1289 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1736 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1290 1737
1291 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1738 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1292 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1739 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1293 1740
1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1741 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1295 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1742 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1296 1743
1297 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 1744 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
1298 1745
1299 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1300 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1746 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1302 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1747 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1303 ."You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1304 1748
1305 $BUTTONBAR->add (new CFClient::UI::Button 1749 $BUTTONBAR->add (new CFPlus::UI::Button
1306 text => "Save Config", 1750 text => "Save Config",
1307 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1751 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1308 on_activate => sub { 1752 on_activate => sub {
1309 $::CFG->{layout} = CFClient::UI::get_layout; 1753 $::CFG->{layout} = CFPlus::UI::get_layout;
1310 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1754 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1311 status "Configuration Saved"; 1755 status "Configuration Saved";
1756 0
1312 }, 1757 },
1313 ); 1758 );
1314 1759
1315 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1760 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1316 tooltip => "View Documentation"); 1761 tooltip => "View Documentation");
1317 1762
1763
1318 $BUTTONBAR->add (new CFClient::UI::Button 1764 $BUTTONBAR->add (new CFPlus::UI::Button
1319 text => "Quit", 1765 text => "Quit",
1320 tooltip => "Terminates the program", 1766 tooltip => "Terminates the program",
1321 on_activate => sub { 1767 on_activate => sub {
1322 if ($CONN) { 1768 if ($CONN) {
1323 open_quit_dialog; 1769 open_quit_dialog;
1324 } else { 1770 } else {
1325 exit; 1771 exit;
1326 } 1772 }
1773 0
1327 }, 1774 },
1328 ); 1775 );
1329 1776
1330 $BUTTONBAR->show; 1777 $BUTTONBAR->show;
1331 $SETUP_DIALOG->show; 1778 $SETUP_DIALOG->show;
1332 } 1779 }
1333 1780
1334 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1781 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1335} 1782}
1336 1783
1784sub setup_build_button {
1785 my ($enabled) = @_;
1786 if ($enabled) {
1787 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1788 $BUILD_BUTTON ||= new CFPlus::UI::Button
1789 text => "Build",
1790 tooltip => "Opens the ingame builder",
1791 on_activate => sub {
1792 if ($CONN) {
1793 $CONN->send_ext_req (builder_player_items => sub {
1794 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1795 });
1796 }
1797 0
1798 };
1799 $BUTTONBAR->add ($BUILD_BUTTON);
1800 } else {
1801 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1802 }
1803}
1804
1805sub open_ingame_editor {
1806 my ($msg) = @_;
1807
1808 my $win = new CFPlus::UI::Toplevel
1809 x => 0,
1810 y => 'center',
1811 z => 4,
1812 name => 'builder_window',
1813 force_w => int $WIDTH * 1/4,
1814 force_h => int $HEIGHT * 3/4,
1815 title => "In game builder",
1816 has_close_button => 1;
1817
1818 my $r = new CFPlus::UI::ScrolledWindow (
1819 expand => 1,
1820 scroll_y => 1
1821 );
1822 $r->add (my $vb = new CFPlus::UI::VBox);
1823 $win->add ($r);
1824
1825
1826 $vb->add (
1827 new CFPlus::UI::Button
1828 text => "Disable build mode",
1829 on_activate => sub { $::IN_BUILD_MODE = undef }
1830 );
1831 $vb->add (
1832 new CFPlus::UI::Button
1833 text => "ERASE",
1834 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1835 );
1836
1837 for my $itemarchname (
1838 sort {
1839 $msg->{items}->{$a}->{build_arch_name}
1840 cmp $msg->{items}->{$b}->{build_arch_name}
1841 } keys %{$msg->{items}}
1842 ) {
1843 my $info = $msg->{items}->{$itemarchname};
1844 $vb->add (
1845 new CFPlus::UI::Button text => $info->{build_arch_name},
1846 on_activate => sub {
1847 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1848
1849 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1850 build_mode_query_arch_info ();
1851 }
1852 }
1853 );
1854 }
1855
1856 $win->show;
1857}
1858
1859sub build_mode_query_arch_info {
1860 my ($iteminfo) = $::IN_BUILD_MODE;
1861 my $itemarchname = $iteminfo->{item};
1862 my $info = $iteminfo->{info};
1863
1864 my $dialog = new CFPlus::UI::Toplevel
1865 x => "center",
1866 y => "center",
1867 z => 50,
1868 force_w => int $WIDTH * 1/2,
1869 title => "Enter information for placement of '$itemarchname'",
1870 has_close_button => 1;
1871
1872 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1873
1874 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1875 my $row = 0;
1876 if ($info->{has_name}) {
1877 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1878 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1879 }
1880 if ($info->{has_text}) {
1881 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1882 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1883 }
1884 if ($info->{has_connection}) {
1885 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1886 $table->add (1, $row++,
1887 new CFPlus::UI::Entry
1888 expand => 1,
1889 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1890 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1891 );
1892 }
1893
1894 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1895 $hb->add (new CFPlus::UI::Button
1896 text => "Close",
1897 expand => 1,
1898 on_activate => sub { $dialog->hide; 0 },
1899 );
1900 $dialog->show;
1901}
1902
1337sub video_shutdown { 1903sub video_shutdown {
1904 CFPlus::OpenGL::shutdown;
1905
1338 undef $SDL_ACTIVE; 1906 undef $SDL_ACTIVE;
1339} 1907}
1340 1908
1341my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1909my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1342my $bgmusic;#TODO#hack#d# 1910my $bgmusic;#TODO#hack#d#
… …
1349 1917
1350sub audio_music_finished { 1918sub audio_music_finished {
1351 return unless $CFG->{bgm_enable}; 1919 return unless $CFG->{bgm_enable};
1352 1920
1353 # TODO: hack, do play loop and mood music 1921 # TODO: hack, do play loop and mood music
1354 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1922 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1355 $bgmusic->play (0); 1923 $bgmusic->play (0);
1356 1924
1357 push @bgmusic, shift @bgmusic; 1925 push @bgmusic, shift @bgmusic;
1358} 1926}
1359 1927
1360sub audio_init { 1928sub audio_init {
1361 if ($CFG->{audio_enable}) { 1929 if ($CFG->{audio_enable}) {
1362 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1930 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1363 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1931 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1364 1932
1365 unless ($SDL_MIXER) { 1933 unless ($SDL_MIXER) {
1366 status "Unable to open sound device: there will be no sound"; 1934 status "Unable to open sound device: there will be no sound";
1367 return; 1935 return;
1368 } 1936 }
1369 1937
1370 CFClient::Mix_AllocateChannels 8; 1938 CFPlus::Mix_AllocateChannels 8;
1371 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1939 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1372 1940
1373 audio_music_finished; 1941 audio_music_finished;
1374 1942
1943 local $_;
1375 while (<$fh>) { 1944 while (<$fh>) {
1376 next if /^\s*#/; 1945 next if /^\s*#/;
1377 next if /^\s*$/; 1946 next if /^\s*$/;
1378 1947
1379 my ($file, $volume, $event) = split /\s+/, $_, 3; 1948 my ($file, $volume, $event) = split /\s+/, $_, 3;
1380 1949
1381 push @SOUNDS, "$volume,$file"; 1950 push @SOUNDS, "$volume,$file";
1382 1951
1383 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1952 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1384 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1953 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1385 $chunk->volume ($volume * 128 / 100); 1954 $chunk->volume ($volume * 128 / 100);
1386 $chunk 1955 $chunk
1387 }; 1956 };
1388 } 1957 }
1389 } else { 1958 } else {
… …
1391 } 1960 }
1392 } 1961 }
1393} 1962}
1394 1963
1395sub audio_shutdown { 1964sub audio_shutdown {
1396 CFClient::Mix_CloseAudio if $SDL_MIXER; 1965 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1397 undef $SDL_MIXER; 1966 undef $SDL_MIXER;
1398 @SOUNDS = (); 1967 @SOUNDS = ();
1399 %AUDIO_CHUNKS = (); 1968 %AUDIO_CHUNKS = ();
1400} 1969}
1401 1970
… …
1408 1977
1409sub force_refresh { 1978sub force_refresh {
1410 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1979 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1411 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1980 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1412 1981
1413 $CFClient::UI::ROOT->draw; 1982 $CFPlus::UI::ROOT->draw;
1414 1983
1415 $WANT_REFRESH = 0; 1984 $WANT_REFRESH = 0;
1416 $CAN_REFRESH = 0; 1985 $CAN_REFRESH = 0;
1417 $LAST_REFRESH = $NOW; 1986 $LAST_REFRESH = $NOW;
1418 1987
14190 && do {
1420 # some weird model-drawing code, just a joke right now
1421 use CFClient::OpenGL;
1422
1423 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1424 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1425 $demo{r} ||= do {
1426 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1427 $mod->{v} = pack "f*", @{$mod->{v}};
1428 $_ = [scalar @$_, pack "S!*", @$_]
1429 for values %{$mod->{g}};
1430 $mod
1431 };
1432
1433 my $r = $demo{r} or die;
1434
1435 glDepthMask 1;
1436 glClear GL_DEPTH_BUFFER_BIT;
1437 glEnable GL_TEXTURE_2D;
1438 glEnable GL_DEPTH_TEST;
1439 glEnable GL_CULL_FACE;
1440 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1441
1442 glMatrixMode GL_PROJECTION;
1443 glLoadIdentity;
1444 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1445 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1446 glMatrixMode GL_MODELVIEW;
1447 glLoadIdentity;
1448
1449 glPushMatrix;
1450 glTranslate 0, 0, -800;
1451 glScale 1, -1, 1;
1452 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1453 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1454 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1455 glScale 50, 50, 50;
1456
1457 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1458 while (my ($k, $v) = each %{$r->{g}}) {
1459 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1460 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1461 }
1462
1463 glPopMatrix;
1464
1465 glShadeModel GL_FLAT;
1466 glDisable GL_DEPTH_TEST;
1467 glDisable GL_TEXTURE_2D;
1468 glDepthMask 0;
1469
1470 $WANT_REFRESH++;
1471};
1472
1473 CFClient::SDL_GL_SwapBuffers; 1988 CFPlus::SDL_GL_SwapBuffers;
1474} 1989}
1475 1990
1476my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1991my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1477 $NOW = time; 1992 $NOW = time;
1478 1993
1479 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1994 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1480 for CFClient::SDL_PollEvent; 1995 for CFPlus::SDL_PollEvent;
1481 1996
1482 if (%animate_object) { 1997 if (%animate_object) {
1483 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1998 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1484 $WANT_REFRESH++; 1999 $WANT_REFRESH++;
1485 } 2000 }
… …
1509 $CONN->face_prefetch 2024 $CONN->face_prefetch
1510 if $CONN; 2025 if $CONN;
1511}); 2026});
1512 2027
1513%SDL_CB = ( 2028%SDL_CB = (
1514 CFClient::SDL_QUIT => sub { 2029 CFPlus::SDL_QUIT => sub {
1515 Event::unloop -1; 2030 Event::unloop -1;
1516 }, 2031 },
1517 CFClient::SDL_VIDEORESIZE => sub { 2032 CFPlus::SDL_VIDEORESIZE => sub {
1518 }, 2033 },
1519 CFClient::SDL_VIDEOEXPOSE => sub { 2034 CFPlus::SDL_VIDEOEXPOSE => sub {
1520 CFClient::UI::full_refresh; 2035 CFPlus::UI::full_refresh;
1521 }, 2036 },
1522 CFClient::SDL_ACTIVEEVENT => sub { 2037 CFPlus::SDL_ACTIVEEVENT => sub {
1523# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2038# not useful, as APPACTIVE include sonly iconified state, not unmapped
2039# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2040# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2041# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2042# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1524 }, 2043 },
1525 CFClient::SDL_KEYDOWN => sub { 2044 CFPlus::SDL_KEYDOWN => sub {
1526 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2045 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1527 # alt-enter 2046 # alt-enter
2047 $FULLSCREEN_ENABLE->toggle;
1528 video_shutdown; 2048 video_shutdown;
1529 $CFG->{fullscreen} = !$CFG->{fullscreen};
1530 video_init; 2049 video_init;
1531 } else { 2050 } else {
1532 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2051 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1533 } 2052 }
1534 }, 2053 },
1535 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2054 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1536 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2055 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1537 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2056 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1538 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2057 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1539 CFClient::SDL_USEREVENT => sub { 2058 CFPlus::SDL_USEREVENT => sub {
1540 if ($_[0]{code} == 1) { 2059 if ($_[0]{code} == 1) {
1541 audio_channel_finished $_[0]{data1}; 2060 audio_channel_finished $_[0]{data1};
1542 } elsif ($_[0]{code} == 0) { 2061 } elsif ($_[0]{code} == 0) {
1543 audio_music_finished; 2062 audio_music_finished;
1544 } 2063 }
… …
1548############################################################################# 2067#############################################################################
1549 2068
1550$SIG{INT} = $SIG{TERM} = sub { exit }; 2069$SIG{INT} = $SIG{TERM} = sub { exit };
1551 2070
1552{ 2071{
1553 local $SIG{__DIE__} = sub {
1554 return unless defined $^S && !$^S;
1555 Carp::confess $_[1];#d#TODO: remove when stable
1556 CFClient::fatal $_[0];
1557 };
1558
1559 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2072 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1560 CFClient::UI::set_layout ($::CFG->{layout}); 2073 CFPlus::UI::set_layout ($::CFG->{layout});
1561 2074
1562 my %DEF_CFG = ( 2075 my %DEF_CFG = (
1563 sdl_mode => 0, 2076 sdl_mode => 0,
1564 width => 640, 2077 width => 640,
1565 height => 480, 2078 height => 480,
1566 fullscreen => 0, 2079 fullscreen => 0,
1567 fast => 0, 2080 fast => 0,
1568 map_scale => 1, 2081 map_scale => 1,
1569 fow_enable => 1, 2082 fow_enable => 1,
1570 fow_intensity => 0.45, 2083 fow_intensity => 0.45,
1571 fow_smooth => 0, 2084 fow_smooth => 0,
1572 gui_fontsize => 1, 2085 gui_fontsize => 1,
1573 log_fontsize => 1, 2086 log_fontsize => 0.7,
1574 gauge_fontsize=> 1, 2087 gauge_fontsize => 1,
1575 gauge_size => 0.35, 2088 gauge_size => 0.35,
1576 stat_fontsize => 1, 2089 stat_fontsize => 0.7,
1577 mapsize => 100, 2090 mapsize => 100,
1578 host => "crossfire.schmorp.de",
1579 say_command => 'say', 2091 say_command => 'chat',
1580 audio_enable => 1, 2092 audio_enable => 1,
1581 bgm_enable => 1, 2093 bgm_enable => 1,
1582 bgm_volume => 0.25, 2094 bgm_volume => 0.25,
1583 face_prefetch => 0, 2095 face_prefetch => 0,
1584 output_sync => 1, 2096 output_sync => 1,
1585 output_count => 1, 2097 output_count => 1,
2098 pickup => 0,
2099 inv_sort => "mtime",
2100 default => "profile", # default profile
2101 show_tips => 1,
2102 );
1586 ); 2103
1587
1588 while (my ($k, $v) = each %DEF_CFG) { 2104 while (my ($k, $v) = each %DEF_CFG) {
1589 $CFG->{$k} = $v unless exists $CFG->{$k}; 2105 $CFG->{$k} = $v unless exists $CFG->{$k};
1590 } 2106 }
1591 2107
2108 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2109 $PROFILE = $CFG->{profile}{default};
2110
2111 # convert old bindings (only default profile matters)
2112 if (my $bindings = delete $PROFILE->{bindings}) {
2113 while (my ($mod, $syms) = each %$bindings) {
2114 while (my ($sym, $cmds) = each %$syms) {
2115 push @{ $PROFILE->{macro} }, {
2116 accelkey => [$mod*1, $sym*1],
2117 action => $cmds,
2118 };
2119 }
2120 }
2121 }
2122
1592 sdl_init; 2123 sdl_init;
1593 2124
1594 @SDL_MODES = reverse 2125 @SDL_MODES = reverse
1595 grep $_->[0] >= 640 && $_->[1] >= 480, 2126 grep $_->[0] >= 640 && $_->[1] >= 480,
1596 CFClient::SDL_ListModes; 2127 CFPlus::SDL_ListModes;
1597 2128
1598 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2129 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1599 2130
1600 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2131 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1601 2132
1602 { 2133 {
1603 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2134 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1604 DejaVuSans.ttf 2135 DejaVuSans.ttf
1605 DejaVuSansMono.ttf 2136 DejaVuSansMono.ttf
1606 DejaVuSans-Bold.ttf 2137 DejaVuSans-Bold.ttf
1607 DejaVuSansMono-Bold.ttf 2138 DejaVuSansMono-Bold.ttf
1608 DejaVuSans-Oblique.ttf 2139 DejaVuSans-Oblique.ttf
1609 DejaVuSansMono-Oblique.ttf 2140 DejaVuSansMono-Oblique.ttf
1610 DejaVuSans-BoldOblique.ttf 2141 DejaVuSans-BoldOblique.ttf
1611 DejaVuSansMono-BoldOblique.ttf 2142 DejaVuSansMono-BoldOblique.ttf
1612 ); 2143 );
1613 2144
1614 CFClient::add_font $_ for @fonts; 2145 CFPlus::add_font $_ for @fonts;
1615 2146
1616 CFClient::pango_init; 2147 CFPlus::pango_init;
1617 2148
1618 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2149 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1619 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2150 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1620 2151
1621 $FONT_PROP->make_default; 2152 $FONT_PROP->make_default;
1622 } 2153 }
1623 2154
1624# compare mono (ft) vs. rgba (cairo) 2155# compare mono (ft) vs. rgba (cairo)
1625# ft - 1.8s, cairo 3s, even in alpha-only mode 2156# ft - 1.8s, cairo 3s, even in alpha-only mode
1626# for my $rgba (0..1) { 2157# for my $rgba (0..1) {
1627# my $t1 = Time::HiRes::time; 2158# my $t1 = Time::HiRes::time;
1628# for (1..1000) { 2159# for (1..1000) {
1629# my $layout = CFClient::Layout->new ($rgba); 2160# my $layout = CFPlus::Layout->new ($rgba);
1630# $layout->set_text ("hallo" x 100); 2161# $layout->set_text ("hallo" x 100);
1631# $layout->render; 2162# $layout->render;
1632# } 2163# }
1633# my $t2 = Time::HiRes::time; 2164# my $t2 = Time::HiRes::time;
1634# warn $t2-$t1; 2165# warn $t2-$t1;
1635# } 2166# }
1636 2167
2168 $startup_done->();
2169
1637 video_init; 2170 video_init;
1638 audio_init; 2171 audio_init;
1639} 2172}
1640 2173
2174show_tip_of_the_day if $CFG->{show_tips};
2175
1641Event::loop; 2176Event::loop;
2177#CFPlus::SDL_Quit;
2178#CFPlus::_exit 0;
1642 2179
1643END { CFClient::SDL_Quit } 2180END { CFPlus::SDL_Quit }
1644 2181
1645=head1 NAME 2182=head1 NAME
1646 2183
1647cfplus - A Crossfire+ and Crossfire game client 2184cfplus - A Crossfire+ and Crossfire game client
1648 2185

Diff Legend

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