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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines