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.59 by root, Mon Jun 5 22:30:35 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
32use Crossfire; 55use Crossfire;
33use Crossfire::Protocol::Constants; 56use Crossfire::Protocol::Constants;
34 57
35use Compress::LZF; 58use Compress::LZF;
36 59
37use CFClient; 60use CFPlus;
38use CFClient::OpenGL (); 61use CFPlus::OpenGL ();
39use CFClient::Protocol; 62use CFPlus::Protocol;
40use CFClient::UI; 63use CFPlus::UI;
64use CFPlus::Pod;
65use CFPlus::BindingEditor;
41use CFClient::MapWidget; 66use CFPlus::MapWidget;
42 67
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 68$SIG{QUIT} = sub { Carp::cluck "QUIT" };
69$SIG{PIPE} = 'IGNORE';
44 70
71$Event::Eval = 0;
45$Event::DIED = sub { 72$Event::DIED = sub {
46 # TODO: display dialog box or so 73 CFPlus::fatal Carp::longmess $_[1]
47 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1];
49}; 74};
50
51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
52
53our $VERSION = '0.1';
54 75
55my $MAX_FPS = 60; 76my $MAX_FPS = 60;
56my $MIN_FPS = 5; # unused as of yet 77my $MIN_FPS = 5; # unused as of yet
57 78
58our $META_SERVER = "crossfire.real-time.com:13326"; 79our $META_SERVER = "http://metaserver.schmorp.de/current.json";
59 80
60our $LAST_REFRESH; 81our $LAST_REFRESH;
61our $NOW; 82our $NOW;
62 83
63our $CFG; 84our $CFG;
64our $CONN; 85our $CONN;
86our $PROFILE; # current profile
65our $FAST; # fast, low-quality mode, possibly useful for software-rendering 87our $FAST; # fast, low-quality mode, possibly useful for software-rendering
66 88
67our $WANT_REFRESH; 89our $WANT_REFRESH;
68our $CAN_REFRESH; 90our $CAN_REFRESH;
69 91
84our $CONSOLE; 106our $CONSOLE;
85our $METASERVER; 107our $METASERVER;
86our $LOGIN_BUTTON; 108our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 109our $QUIT_DIALOG;
88our $HOST_ENTRY; 110our $HOST_ENTRY;
111our $FULLSCREEN_ENABLE;
112our $PICKUP_ENABLE;
113our $SERVER_INFO;
89 114
90our $SETUP_DIALOG; 115our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 116our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 117our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 118our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95 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;
96our $FLOORBOX; 131our $FLOORBOX;
97our $GAUGES; 132our $GAUGES;
98our $STATWIDS; 133our $STATWIDS;
99 134
100our $SDL_ACTIVE; 135our $SDL_ACTIVE;
106 141
107our $ALT_ENTER_MESSAGE; 142our $ALT_ENTER_MESSAGE;
108our $STATUSBOX; 143our $STATUSBOX;
109our $DEBUG_STATUS; 144our $DEBUG_STATUS;
110 145
111our $INV_WINDOW;
112our $INV; 146our $INV;
113our $INVR; 147our $INVR;
114our $INV_RIGHT_HB; 148our $INV_RIGHT_HB;
115 149
116our $BIND_EDITOR; 150our $BIND_EDITOR;
151our $BIND_UPD_CB;
117 152
118our $PICKUP_CFG; 153our $PICKUP_CFG;
119 154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157
120sub status { 158sub status {
121 $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]);
122} 160}
123 161
124sub debug { 162sub debug {
125 $DEBUG_STATUS->set_text ($_[0]); 163 $DEBUG_STATUS->set_text ($_[0]);
126} 164}
127 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
128sub start_game { 377sub start_game {
129 status "logging in..."; 378 status "logging in...";
130 379
131 $LOGIN_BUTTON->set_text ("Logout"); 380 $LOGIN_BUTTON->set_text ("Logout");
132 $SETUP_DIALOG->hide; 381 $SETUP_DIALOG->hide;
133 382
383 $PROFILE = $CFG->{profile}{default};
384
134 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;
135 386
136 my ($host, $port) = split /:/, $CFG->{host}; 387 my ($host, $port) = split /:/, $PROFILE->{host};
137 388
138 $MAP = new CFClient::Map $mapsize, $mapsize; 389 $MAP = new CFPlus::Map;
139 390
140 $CONN = eval { 391 $CONN = eval {
141 new CFClient::Protocol 392 new CFPlus::Protocol
142 host => $host, 393 host => $host,
143 port => $port || 13327, 394 port => $port || 13327,
144 user => $CFG->{user}, 395 user => $PROFILE->{user},
145 pass => $CFG->{password}, 396 pass => $PROFILE->{password},
146 mapw => $mapsize, 397 mapw => $mapsize,
147 maph => $mapsize, 398 maph => $mapsize,
399
400 client => "cfplus $CFPlus::VERSION $] $^O",
148 401
149 map_widget => $MAPWIDGET, 402 map_widget => $MAPWIDGET,
150 logview => $LOGVIEW, 403 logview => $LOGVIEW,
151 statusbox => $STATUSBOX, 404 statusbox => $STATUSBOX,
152 map => $MAP, 405 map => $MAP,
153 mapmap => $MAPMAP, 406 mapmap => $MAPMAP,
407 query => \&server_query,
154 408
155 sound_play => sub { 409 sound_play => sub {
156 my ($x, $y, $soundnum, $type) = @_; 410 my ($x, $y, $soundnum, $type) = @_;
157 411
158 $SDL_MIXER 412 $SDL_MIXER
164 $chunk->play; 418 $chunk->play;
165 }, 419 },
166 }; 420 };
167 421
168 if ($CONN) { 422 if ($CONN) {
169 CFClient::lowdelay fileno $CONN->{fh}; 423 CFPlus::lowdelay fileno $CONN->{fh};
170 424
171 status "login successful"; 425 status "login successful";
172 } else { 426 } else {
173 status "unable to connect"; 427 status "unable to connect";
174 stop_game(); 428 stop_game();
177 431
178sub stop_game { 432sub stop_game {
179 $LOGIN_BUTTON->set_text ("Login"); 433 $LOGIN_BUTTON->set_text ("Login");
180 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 434 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
181 $SETUP_DIALOG->show; 435 $SETUP_DIALOG->show;
182 $INV_WINDOW->hide; 436 $PL_WINDOW->hide;
437 $SPELL_LIST->clear_spells;
183 438
184 return unless $CONN; 439 return unless $CONN;
185 440
186 status "connection closed"; 441 status "connection closed";
187 442
443 destroy_query_dialog $CONN;
188 $CONN->destroy; 444 $CONN->destroy;
189 $CONN = 0; # false, does not autovivify 445 $CONN = 0; # false, does not autovivify
446
447 undef $MAP;
190} 448}
191 449
192sub graphics_setup { 450sub graphics_setup {
193 my $vbox = new CFClient::UI::VBox; 451 my $vbox = new CFPlus::UI::VBox;
194 452
195 $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]);
196 454
197 $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");
198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 456 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
199 457
200 $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]);
201 $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");
202 460
203 $mode_slider->connect (changed => sub { 461 $mode_slider->connect (changed => sub {
204 my ($self, $value) = @_; 462 my ($self, $value) = @_;
205 463
206 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 464 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
208 }); 466 });
209 $mode_slider->emit (changed => $mode_slider->{range}[0]); 467 $mode_slider->emit (changed => $mode_slider->{range}[0]);
210 468
211 my $row = 1; 469 my $row = 1;
212 470
213 $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");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 472 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
215 state => $CFG->{fullscreen}, 473 state => $CFG->{fullscreen},
216 tooltip => "Bring the client into fullscreen mode.", 474 tooltip => "Bring the client into fullscreen mode.",
217 on_changed => sub { 475 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
218 my ($self, $value) = @_;
219 $CFG->{fullscreen} = $value;
220 }
221 ); 476 );
222 477
223 $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");
224 $table->add (1, $row++, new CFClient::UI::CheckBox 479 $table->add (1, $row++, new CFPlus::UI::CheckBox
225 state => $CFG->{fast}, 480 state => $CFG->{fast},
226 tooltip => "Lower the visual quality considerably to speed up rendering.", 481 tooltip => "Lower the visual quality considerably to speed up rendering.",
227 on_changed => sub { 482 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
228 my ($self, $value) = @_;
229 $CFG->{fast} = $value;
230 }
231 ); 483 );
232 484
233 $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");
234 $table->add (1, $row++, new CFClient::UI::Slider 486 $table->add (1, $row++, new CFPlus::UI::Slider
235 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 487 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
236 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 488 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
237 on_changed => sub { 489 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
238 my ($self, $value) = @_;
239 $CFG->{map_scale} = 2 ** $value;
240 }
241 ); 490 );
242 491
243 $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");
244 $table->add (1, $row++, new CFClient::UI::CheckBox 493 $table->add (1, $row++, new CFPlus::UI::CheckBox
245 state => $CFG->{fow_enable}, 494 state => $CFG->{fow_enable},
246 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.",
247 on_changed => sub { 496 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
248 my ($self, $value) = @_;
249 $CFG->{fow_enable} = $value;
250 }
251 ); 497 );
252 498
253 $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");
254 $table->add (1, $row++, new CFClient::UI::Slider 500 $table->add (1, $row++, new CFPlus::UI::Slider
255 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 501 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
256 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.",
257 on_changed => sub { 503 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
258 my ($self, $value) = @_;
259 $CFG->{fow_intensity} = $value;
260 }
261 ); 504 );
262 505
263 $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");
264 $table->add (1, $row++, new CFClient::UI::CheckBox 507 $table->add (1, $row++, new CFPlus::UI::CheckBox
265 state => $CFG->{fow_smooth}, 508 state => $CFG->{fow_smooth},
266 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.",
267 on_changed => sub { 510 on_changed => sub {
268 my ($self, $value) = @_; 511 my ($self, $value) = @_;
269 $CFG->{fow_smooth} = $value; 512 $CFG->{fow_smooth} = $value;
270 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
271 } 515 }
272 ); 516 );
273 517
274 $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");
275 $table->add (1, $row++, new CFClient::UI::Slider 519 $table->add (1, $row++, new CFPlus::UI::Slider
276 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 520 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
277 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.",
278 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 522 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
279 ); 523 );
280 524
281 $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");
282 $table->add (1, $row++, new CFClient::UI::Slider 526 $table->add (1, $row++, new CFPlus::UI::Slider
283 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 527 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
284 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.",
285 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 529 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
286 ); 530 );
287 531
288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
289
290 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
292 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
293 on_changed => sub {
294 $CFG->{stat_fontsize} = $_[1];
295 &set_stats_window_fontsize;
296 }
297 );
298
299 $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");
300 $table->add (1, $row++, new CFClient::UI::Slider 533 $table->add (1, $row++, new CFPlus::UI::Slider
301 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 534 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
302 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.",
303 on_changed => sub { 536 on_changed => sub {
304 $CFG->{gauge_fontsize} = $_[1]; 537 $CFG->{gauge_fontsize} = $_[1];
305 &set_gauge_window_fontsize; 538 &set_gauge_window_fontsize;
539 0
306 } 540 }
307 ); 541 );
308 542
309 $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");
310 $table->add (1, $row++, new CFClient::UI::Slider 544 $table->add (1, $row++, new CFPlus::UI::Slider
311 range => [$CFG->{gauge_size}, 0.2, 0.8], 545 range => [$CFG->{gauge_size}, 0.2, 0.8],
312 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.",
313 on_changed => sub { 547 on_changed => sub {
314 $CFG->{gauge_size} = $_[1]; 548 $CFG->{gauge_size} = $_[1];
315 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 549 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
550 0
316 } 551 }
317 ); 552 );
318 553
319 $table->add (1, $row++, new CFClient::UI::Button 554 $table->add (1, $row++, new CFPlus::UI::Button
320 expand => 1, align => 0, text => "Apply", 555 expand => 1, align => 0, text => "Apply",
321 tooltip => "Apply the video settings", 556 tooltip => "Apply the video settings",
322 on_activate => sub { 557 on_activate => sub {
323 video_shutdown (); 558 video_shutdown ();
324 video_init (); 559 video_init ();
560 0
325 } 561 }
326 ); 562 );
327 563
328 $vbox 564 $vbox
329} 565}
330 566
331sub audio_setup { 567sub audio_setup {
332 my $vbox = new CFClient::UI::VBox; 568 my $vbox = new CFPlus::UI::VBox;
333 569
334 $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]);
335 571
336 my $row = 0; 572 my $row = 0;
337 573
338 $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");
339 $table->add (1, $row++, new CFClient::UI::CheckBox 575 $table->add (1, $row++, new CFPlus::UI::CheckBox
340 state => $CFG->{audio_enable}, 576 state => $CFG->{audio_enable},
341 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.",
342 on_changed => sub { 578 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
343 $CFG->{audio_enable} = $_[1];
344 }
345 ); 579 );
346# $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");
347# $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 {
348# $CFG->{effects_volume} = $_[1]; 582# $CFG->{effects_volume} = $_[1];
349# }); 583# });
350 $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");
351 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 585 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
352 $hbox->add (new CFClient::UI::CheckBox 586 $hbox->add (new CFPlus::UI::CheckBox
353 expand => 1, state => $CFG->{bgm_enable}, 587 expand => 1, state => $CFG->{bgm_enable},
354 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.",
355 on_changed => sub { 589 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
356 $CFG->{bgm_enable} = $_[1];
357 }
358 ); 590 );
359 $hbox->add (new CFClient::UI::Slider 591 $hbox->add (new CFPlus::UI::Slider
360 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 592 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
361 tooltip => "The volume of the background music. Changes are instant.", 593 tooltip => "The volume of the background music. Changes are instant.",
362 on_changed => sub { 594 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
363 $CFG->{bgm_volume} = $_[1];
364 CFClient::MixMusic::volume $_[1] * 128;
365 }
366 ); 595 );
367 596
368 $table->add (1, $row++, new CFClient::UI::Button 597 $table->add (1, $row++, new CFPlus::UI::Button
369 expand => 1, align => 0, text => "Apply", 598 expand => 1, align => 0, text => "Apply",
370 tooltip => "Apply the audio settings", 599 tooltip => "Apply the audio settings",
371 on_activate => sub { 600 on_activate => sub {
372 audio_shutdown (); 601 audio_shutdown ();
373 audio_init (); 602 audio_init ();
603 0
374 } 604 }
375 ); 605 );
376 606
377 $vbox 607 $vbox
378}
379
380sub set_stats_window_fontsize {
381 for (values %{$STATWIDS}) {
382 $_->set_fontsize ($::CFG->{stat_fontsize});
383 }
384} 608}
385 609
386sub set_gauge_window_fontsize { 610sub set_gauge_window_fontsize {
387 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 611 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
388 $_->set_fontsize ($::CFG->{gauge_fontsize}); 612 $_->set_fontsize ($::CFG->{gauge_fontsize});
390} 614}
391 615
392sub make_gauge_window { 616sub make_gauge_window {
393 my $gh = int $HEIGHT * $CFG->{gauge_size}; 617 my $gh = int $HEIGHT * $CFG->{gauge_size};
394 618
395 my $win = new CFClient::UI::Frame ( 619 my $win = new CFPlus::UI::Frame (
396 force_x => 0, 620 force_x => 0,
397 force_y => "max", 621 force_y => "max",
398 force_w => $WIDTH, 622 force_w => $WIDTH,
399 force_h => $gh, 623 force_h => $gh,
400 ); 624 );
401 625
402 $win->add (my $hbox = new CFClient::UI::HBox 626 $win->add (my $hbox = new CFPlus::UI::HBox
403 children => [ 627 children => [
404 (new CFClient::UI::HBox expand => 1), 628 (new CFPlus::UI::HBox expand => 1),
405 (new CFClient::UI::VBox children => [ 629 (new CFPlus::UI::VBox children => [
406 (new CFClient::UI::Empty expand => 1), 630 (new CFPlus::UI::Empty expand => 1),
407 (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)),
408 ]), 632 ]),
409 (my $vbox = new CFClient::UI::VBox), 633 (my $vbox = new CFPlus::UI::VBox),
410 ], 634 ],
411 ); 635 );
412 636
413 $vbox->add (new CFClient::UI::HBox 637 $vbox->add (new CFPlus::UI::HBox
414 expand => 1, 638 expand => 1,
415 children => [ 639 children => [
416 (new CFClient::UI::Empty expand => 1), 640 (new CFPlus::UI::Empty expand => 1),
417 (my $hb = new CFClient::UI::HBox), 641 (my $hb = new CFPlus::UI::HBox),
418 ], 642 ],
419 ); 643 );
420 644
421 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 645 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
422 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.");
423 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 646 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
424 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.");
425 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 647 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
426 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.");
427 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 648 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
428 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.");
429 649
430 $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");
431 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.");
432 $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");
433 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
434 652
435 $GAUGES = { 653 $GAUGES = {
436 exp => $exp, win => $win, range => $rng, 654 exp => $exp, win => $win, range => $rng,
437 food => $fg, mana => $mg, hp => $hg, grace => $gg 655 food => $fg, mana => $mg, hp => $hg, grace => $gg
438 }; 656 };
440 &set_gauge_window_fontsize; 658 &set_gauge_window_fontsize;
441 659
442 $win 660 $win
443} 661}
444 662
663sub debug_setup {
664 my $table = new CFPlus::UI::Table;
445 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
446sub make_stats_window { 693sub stats_window {
447 my $tgw = new CFClient::UI::FancyFrame 694 my $r = new CFPlus::UI::ScrolledWindow (
448 y => $HEIGHT * (2/8), 695 expand => 1,
449 x => "max", 696 scroll_y => 1
450 title => "Stats", 697 );
451 name => "stats_window"; 698 $r->add (my $vb = new CFPlus::UI::VBox);
452 699
453 $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
454 $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,
455 can_hover => 1, can_events => 1, 706 can_hover => 1, can_events => 1,
456 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.");
457 $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,
458 can_hover => 1, can_events => 1, 709 can_hover => 1, can_events => 1,
459 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).");
460 711
461 $vb->add (my $hb0 = new CFClient::UI::HBox); 712 $pi->add (my $hb0 = new CFPlus::UI::HBox);
462 $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,
463 can_hover => 1, can_events => 1, 714 can_hover => 1, can_events => 1,
464 tooltip => "The weight of the player including all inventory items."); 715 tooltip => "The weight of the player including all inventory items.");
465 $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,
466 can_hover => 1, can_events => 1, 717 can_hover => 1, can_events => 1,
467 tooltip => "The weight limit: you cannot carry more than this."); 718 tooltip => "The weight limit: you cannot carry more than this.");
468 719
469 720 $vb->add (new CFPlus::UI::FancyFrame
721 label => "Primary/Secondary Statistics",
470 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 722 child => (my $hb = new CFPlus::UI::HBox expand => 1),
723 );
471 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 724 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
472 725
473 my $color2 = [1, 1, 0]; 726 my $color2 = [1, 1, 0];
474 727
475 for ( 728 for (
476 [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],
477 [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],
478 [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],
479 [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],
480 [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],
481 [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],
482 [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],
483 736
484 [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],
485 [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],
486 [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],
487 [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],
488 [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],
489 [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],
490 ) { 743 ) {
491 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 744 my ($col, $row, $id, $label, $template) = @$_;
492 745
493 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 746 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
494 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");
495 $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
496 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");
497 } 752 }
498 753
754 $vb->add (new CFPlus::UI::FancyFrame
755 label => "Resistancies",
499 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 756 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
757 );
500 758
501 my $row = 0; 759 my $row = 0;
502 my $col = 0; 760 my $col = 0;
503 761
504 my %resist_names = ( 762 my %resist_names = (
763 slow => ["Slow",
505 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",
506 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",
507 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",
508 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",
509 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",
510 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",
511 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",
512 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",
513 pois => "<b>Poison</b> (resistance to getting poisoned)", 780 "<b>Poison</b> (resistance to getting poisoned)"],
781 para => ["Paralysation",
514 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",
515 deat => "<b>Death</b> (resistance against death spells)", 784 "<b>Death</b> (resistance against death spells)"],
516 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",
517 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",
518 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",
519 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",
520 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",
521 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",
522 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)"],
523 ); 799 );
524 for (qw/slow holyw conf fire depl magic 800 for (qw/slow holyw conf fire depl magic
525 drain acid pois para deat phys 801 drain acid pois para deat phys
526 blind fear tund elec cold ghit/) 802 blind fear tund elec cold ghit/)
527 { 803 {
528 $tbl2->add ($col, $row, 804 $tbl2->add ($col, $row,
529 $STATWIDS->{"res_$_"} = 805 $STATWIDS->{"res_$_"} =
530 new CFClient::UI::Label 806 new CFPlus::UI::Label
531 font => $FONT_FIXED, 807 font => $FONT_FIXED,
532 template => "-100%", 808 template => "-100%",
533 align => +1, 809 align => +1,
534 valign => 0, 810 valign => 0,
535 can_events => 1, 811 can_events => 1,
536 can_hover => 1, 812 can_hover => 1,
537 tooltip => $resist_names{$_}, 813 tooltip => $resist_names{$_}->[1],
538 ); 814 );
539 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 815 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
540 font => $FONT_FIXED, 816 font => $FONT_FIXED,
541 can_hover => 1, 817 can_hover => 1,
542 can_events => 1, 818 can_events => 1,
543 image => "ui/resist/resist_$_.png", 819 path => "ui/resist/resist_$_.png",
544 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],
545 ); 828 );
546 829
547 $row++; 830 $row++;
548 if ($row % 6 == 0) { 831 if ($row % 6 == 0) {
549 $col += 2; 832 $col += 3;
550 $row = 0; 833 $row = 0;
551 } 834 }
552 } 835 }
553 836
554 &set_stats_window_fontsize;
555 update_stats_window ({}); 837 #update_stats_window ({});
556 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]);
557 $tgw 845 $sw
558} 846}
559 847
560sub formsep($) { 848sub formsep($) {
561 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 849 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
562} 850}
563 851
564sub update_stats_window {
565 my ($stats) = @_;
566
567 # I love text protocols...
568
569 my $hp = $stats->{+CS_STAT_HP} * 1;
570 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
571 my $sp = $stats->{+CS_STAT_SP} * 1;
572 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
573 my $fo = $stats->{+CS_STAT_FOOD} * 1;
574 my $fo_m = 999;
575 my $gr = $stats->{+CS_STAT_GRACE} * 1;
576 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
577
578 $GAUGES->{hp} ->set_value ($hp, $hp_m);
579 $GAUGES->{mana} ->set_value ($sp, $sp_m);
580 $GAUGES->{food} ->set_value ($fo, $fo_m);
581 $GAUGES->{grace} ->set_value ($gr, $gr_m);
582 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
583 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
584 my $rng = $stats->{+CS_STAT_RANGE};
585 $rng =~ s/^Range: //; # thank you so much dear server
586 $GAUGES->{range} ->set_text ("Rng: " . $rng);
587 my $title = $stats->{+CS_STAT_TITLE};
588 $title =~ s/^Player: //;
589 $STATWIDS->{title} ->set_text ("Title: " . $title);
590
591 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
592 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
593 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
594 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
595 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
596 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
597 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
598 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
599 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
600 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
601 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
602 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
603 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
604
605 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
606
607 # TODO: replace by CS_STAT_RES_xxx constants
608 my %tbl = (
609 phys => 100,
610 magic => 101,
611 fire => 102,
612 elec => 103,
613 cold => 104,
614 conf => 105,
615 acid => 106,
616 drain => 107,
617 ghit => 108,
618 pois => 109,
619 slow => 110,
620 para => 111,
621 tund => 112,
622 fear => 113,
623 depl => 113,
624 deat => 115,
625 holyw => 116,
626 blind => 117,
627 );
628
629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
630 for keys %tbl;
631}
632
633my $METASERVER_ATIME; 852my $METASERVER_ATIME;
634 853
635sub update_metaserver { 854sub update_metaserver {
855 my ($metaserver_dialog) = @_;
856
857 $METASERVER = $metaserver_dialog
858 if defined $metaserver_dialog;
859
636 return if $METASERVER_ATIME > time; 860 return if $METASERVER_ATIME > time;
637 $METASERVER_ATIME = time + 60; 861 $METASERVER_ATIME = time + 60;
638 862
639 my $table = $METASERVER->{table}; 863 my $table = $METASERVER->{table};
640 $table->clear; 864 $table->clear;
641 $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...");
642 866
643 my $buf; 867 my $ok = 0;
644 868
645 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 869 CFPlus::background {
870 my $ua = CFPlus::lwp_useragent;
646 871
647 unless ($fh) { 872 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
648 $label->set_text ("unable to contact metaserver: $!"); 873 } sub {
649 return; 874 my ($msg) = @_;
650 } 875 if ($msg) {
651
652 Event->io (fd => $fh, poll => 'r', cb => sub {
653 my $res = sysread $fh, $buf, 8192, length $buf;
654
655 if (!defined $res) {
656 $_[0]->w->cancel;
657 $label->set_text ("error while retrieving server list: $!");
658 } elsif ($res == 0) {
659 $_[0]->w->cancel;
660 status "server list retrieved";
661
662 utf8::decode $buf if utf8::valid $buf;
663
664 $table->clear; 876 $table->clear;
665 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 );
666 my @col = qw(Use #Users Host Uptime Version Description); 885 my @col = qw(#Users Host Uptime Version Description);
667 $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[$_])
668 for 0 .. $#col; 890 for 0 .. $#col;
669 891
670 my @align = qw(1 0 1 1 -1); 892 my @align = qw(1 0 1 1 -1);
671 893
672 my $y = 0; 894 my $y = 0;
673 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 ) {
674 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)};
675 904
676 for ($desc) { 905 for ($desc) {
677 s/<br>/\n/gi; 906 s/<br>/\n/gi;
678 s/<li>/\n· /gi; 907 s/<li>/\n· /gi;
679 s/<.*?>//sgi; 908 s/<.*?>//sgi;
680 s/&/&amp;/g; 909 s/&amp;/&/g;
681 s/</&lt;/g; 910 s/&lt;/</g;
682 s/>/&gt;/g; 911 s/&gt;/>/g;
683 } 912 }
684 913
685 $uptime = sprintf "%dd %02d:%02d:%02d", 914 $uptime = sprintf "%dd %02d:%02d:%02d",
686 (int $m->[8] / 86400), 915 (int $uptime / 86400),
687 (int $m->[8] / 3600) % 24, 916 (int $uptime / 3600) % 24,
688 (int $m->[8] / 60) % 60, 917 (int $uptime / 60) % 60,
689 $m->[8] % 60; 918 $uptime % 60;
690 919
691 $m = [$users, $host, $uptime, $version, $desc]; 920 $m = [$users, $host, $uptime, $version, $desc];
692 921
693 $y++; 922 $y++;
694 923
695 $table->add (0, $y, new CFClient::UI::VBox children => [ 924 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
696 (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 {
697 $HOST_ENTRY->set_text ($CFG->{host} = $host); 929 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
698 $METASERVER->toggle_visibility; 930 $METASERVER->hide;
931 0
932 },
699 }), 933 ),
700 (new CFClient::UI::Empty expand => 1), 934 (new CFPlus::UI::Empty expand => 1),
701 ]); 935 ]);
702 936
703 $table->add ($_ + 1, $y, new CFClient::UI::Label 937 $table->add ($_, $y, new CFPlus::UI::Label
704 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)
705 for 0 .. $#$m; 947 for 0 .. $#$m;
706 } 948 }
949 } else {
950 $ok or $label->set_text ("error while contacting metaserver");
707 } 951 }
708 }); 952 };
953
709} 954}
710 955
711sub metaserver_dialog { 956sub metaserver_dialog {
712 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
713 title => "Server List", 962 title => "Server List",
714 name => 'metaserver_dialog', 963 name => 'metaserver_dialog',
715 x => 'center', 964 x => 'center',
716 y => 'center', 965 y => 'center',
717 z => 3, 966 z => 3,
718 child => (my $vbox = new CFClient::UI::VBox), 967 force_w => $::WIDTH * 0.9,
968 force_h => $::HEIGHT * 0.7,
969 child => $vbox,
970 has_close_button => 1,
971 table => $table,
719 on_visibility_change => sub { 972 on_visibility_change => sub {
720 update_metaserver if $_[1]; 973 update_metaserver ($_[0]) if $_[1];
974 0
721 }, 975 },
722 ; 976 ;
723 977
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
725
726 $dialog 978 $dialog
727} 979}
728 980
729sub server_setup { 981sub server_setup {
730 my $vbox = new CFClient::UI::VBox; 982 my $vbox = new CFPlus::UI::VBox;
731 983
984 $vbox->add (new CFPlus::UI::FancyFrame
985 label => "Connection Settings",
732 $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 );
733 $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");
734 989
735 { 990 {
736 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 991 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
737 992
738 $vbox->add ( 993 $vbox->add (
739 $HOST_ENTRY = new CFClient::UI::Entry 994 $HOST_ENTRY = new CFPlus::UI::Entry
740 expand => 1, 995 expand => 1,
741 text => $CFG->{host}, 996 text => $CFG->{profile}{default}{host},
742 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",
743 on_changed => sub { 998 on_changed => sub {
744 my ($self, $value) = @_; 999 my ($self, $value) = @_;
745 $CFG->{host} = $value; 1000 $CFG->{profile}{default}{host} = $value;
1001 0
746 } 1002 }
747 ); 1003 );
748 1004
749 $METASERVER = metaserver_dialog;
750
751 $vbox->add (new CFClient::UI::Button 1005 $vbox->add (new CFPlus::UI::Button
752 expand => 1, 1006 expand => 1,
753 text => "Server List", 1007 text => "Server List",
754 other => $METASERVER, 1008 other => $METASERVER,
755 tooltip => "Show a list of available crossfire servers", 1009 tooltip => "Show a list of available crossfire servers",
756 on_activate => sub { $METASERVER->toggle_visibility }, 1010 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1011 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
757 ); 1012 );
758 } 1013 }
759 1014
760 $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");
761 $table->add (1, 4, new CFClient::UI::Entry 1016 $table->add (1, 4, new CFPlus::UI::Entry
762 text => $CFG->{user}, 1017 text => $CFG->{profile}{default}{user},
763 tooltip => "The name of your character on the server", 1018 tooltip => "The name of your character on the server",
764 on_changed => sub { 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
765 my ($self, $value) = @_;
766 $CFG->{user} = $value;
767 }
768 ); 1020 );
769 1021
770 $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");
771 $table->add (1, 5, new CFClient::UI::Entry 1023 $table->add (1, 5, new CFPlus::UI::Entry
772 text => $CFG->{password}, 1024 text => $CFG->{profile}{default}{password},
773 hidden => 1, 1025 hidden => 1,
774 tooltip => "The password for your character", 1026 tooltip => "The password for your character",
775 on_changed => sub { 1027 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
776 my ($self, $value) = @_;
777 $CFG->{password} = $value;
778 }
779 ); 1028 );
780 1029
781 $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");
782 $table->add (1, 7, new CFClient::UI::Slider 1031 $table->add (1, 7, new CFPlus::UI::Slider
783 force_w => 100, 1032 force_w => 100,
784 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1033 range => [$CFG->{mapsize}, 10, 100, 0, 1],
785 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. "
786 . "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, "
787 . "but you also increase bandwidth requirements and latency. " 1036 . "but you also increase bandwidth requirements and latency. "
788 . "This option is only used once at log-in.", 1037 . "This option is only used once at log-in.",
789 on_changed => sub { 1038 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
790 my ($self, $value) = @_;
791
792 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
793 },
794 ); 1039 );
795 1040
796 $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");
797 $table->add (1, 8, new CFClient::UI::CheckBox 1042 $table->add (1, 8, new CFPlus::UI::CheckBox
798 state => $CFG->{face_prefetch}, 1043 state => $CFG->{face_prefetch},
799 tooltip => "<b>Background Image Prefetch</b>\n\n" 1044 tooltip => "<b>Background Image Prefetch</b>\n\n"
800 . "If enabled, the client automatically pre-fetches images from the server. " 1045 . "If enabled, the client automatically pre-fetches images from the server. "
801 . "This might increase or create lag, but increases the chances " 1046 . "This might increase or create lag, but increases the chances "
802 . "of faces being ready for display when you encounter them. " 1047 . "of faces being ready for display when you encounter them. "
803 . "It also uses up server bandwidth on every connect, " 1048 . "It also uses up server bandwidth on every connect, "
804 . "so only set it if you really need to prefetch images. " 1049 . "so only set it if you really need to prefetch images. "
805 . "This option can be set and unset any time.", 1050 . "This option can be set and unset any time.",
806 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1051 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
807 ); 1052 );
808 1053
809 $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");
810 $table->add (1, 9, new CFClient::UI::Entry 1055 $table->add (1, 9, new CFPlus::UI::Entry
811 text => $CFG->{output_count}, 1056 text => $CFG->{output_count},
812 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.",
813 on_changed => sub { $CFG->{output_count} = $_[1] }, 1058 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
814 ); 1059 );
815 1060
816 $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");
817 $table->add (1, 10, new CFClient::UI::Entry 1062 $table->add (1, 10, new CFPlus::UI::Entry
818 text => $CFG->{output_sync}, 1063 text => $CFG->{output_sync},
819 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.",
820 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1065 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
821 ); 1066 );
822 1067
823 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1068 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
824 expand => 1, 1069 expand => 1,
825 align => 0, 1070 align => 0,
826 text => "Login", 1071 text => "Login",
827 on_activate => sub { 1072 on_activate => sub {
828 $CONN ? stop_game 1073 $CONN ? stop_game
829 : start_game; 1074 : start_game;
1075 0
830 }, 1076 },
831 ); 1077 );
832 1078
833 $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");
834 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1080 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
835 text => $CFG->{say_command}, 1081 text => $CFG->{say_command},
836 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. "
837 . "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. "
838 . "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.",
839 on_changed => sub { 1085 on_changed => sub {
840 my ($self, $value) = @_; 1086 my ($self, $value) = @_;
841 $CFG->{say_command} = $value; 1087 $CFG->{say_command} = $value;
1088 0
842 } 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),
843 ); 1106 );
844 1107
845 $vbox 1108 $vbox
846} 1109}
847 1110
848sub message_window { 1111sub message_window {
849 my $window = new CFClient::UI::FancyFrame 1112 my $window = new CFPlus::UI::Toplevel
850 name => "message_window", 1113 name => "message_window",
851 title => "Messages", 1114 title => "Messages",
852 border_bg => [1, 1, 1, 1], 1115 border_bg => [1, 1, 1, 1],
853 bg => [0, 0, 0, 0.75],
854 x => "max", 1116 x => "max",
855 y => 0, 1117 y => 0,
856 force_w => $::WIDTH / 3, 1118 force_w => $::WIDTH * 0.4,
857 force_h => $::HEIGHT / 5, 1119 force_h => $::HEIGHT * 0.5,
858 child => (my $vbox = new CFClient::UI::VBox); 1120 child => (my $vbox = new CFPlus::UI::VBox),
1121 has_close_button => 1;
859 1122
860 $vbox->add ($LOGVIEW); 1123 $vbox->add ($LOGVIEW);
861 1124
862 $vbox->add (my $input = new CFClient::UI::Entry 1125 $vbox->add (my $input = new CFPlus::UI::Entry
863 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> "
864 . "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>...). "
865 . "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). "
866 . "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.",
867 on_focus_in => sub { 1130 on_focus_in => sub {
871 1134
872 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1135 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
873 $input->{refocus_map} = 1; 1136 $input->{refocus_map} = 1;
874 } 1137 }
875 delete $input->{auto_activated}; 1138 delete $input->{auto_activated};
1139
1140 0
876 }, 1141 },
877 on_activate => sub { 1142 on_activate => sub {
878 my ($input, $text) = @_; 1143 my ($input, $text) = @_;
879 $input->set_text (''); 1144 $input->set_text ('');
880 1145
886 } 1151 }
887 if ($input->{refocus_map}) { 1152 if ($input->{refocus_map}) {
888 delete $input->{refocus_map}; 1153 delete $input->{refocus_map};
889 $MAPWIDGET->focus_in 1154 $MAPWIDGET->focus_in
890 } 1155 }
1156
1157 0
891 }, 1158 },
892 on_escape => sub { 1159 on_escape => sub {
893 $MAPWIDGET->focus_in 1160 $MAPWIDGET->grab_focus;
1161
1162 0
894 }, 1163 },
895 ); 1164 );
896 1165
897 $CONSOLE = { 1166 $CONSOLE = {
898 window => $window, 1167 window => $window,
900 }; 1169 };
901 1170
902 $window 1171 $window
903} 1172}
904 1173
905sub open_quit_dialog {
906 unless ($QUIT_DIALOG) {
907 $QUIT_DIALOG = new CFClient::UI::FancyFrame
908 x => "center",
909 y => "center",
910 z => 50,
911 title => "Really Quit?",
912 ;
913
914 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
915
916 $vb->add (new CFClient::UI::Label
917 text => "You should find a savebed and apply it first!",
918 max_w => $WIDTH * 0.25,
919 ellipsize => 0,
920 );
921 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
922 $hb->add (new CFClient::UI::Button
923 text => "Ok",
924 expand => 1,
925 on_activate => sub { $QUIT_DIALOG->hide },
926 );
927 $hb->add (new CFClient::UI::Button
928 text => "Quit anyway",
929 expand => 1,
930 on_activate => sub { exit },
931 );
932 }
933
934 $QUIT_DIALOG->show;
935}
936
937sub autopickup_setup { 1174sub autopickup_setup {
938 my $table = new CFClient::UI::Table; 1175 my $table = new CFPlus::UI::Table;
939 1176
940 for ( 1177 for (
941 ["General", 0, 0, 1178 ["General", 0, 0,
942 ["Enable autopickup" => PICKUP_NEWMODE], 1179 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
943 ["Inhibit autopickup" => PICKUP_INHIBIT], 1180 ["Inhibit autopickup" => PICKUP_INHIBIT],
944 ["Stop before pickup" => PICKUP_STOP], 1181 ["Stop before pickup" => PICKUP_STOP],
945 ["Debug autopickup" => PICKUP_DEBUG], 1182 ["Debug autopickup" => PICKUP_DEBUG],
946 ], 1183 ],
947 ["Weapons", 0, 6, 1184 ["Weapons", 0, 6,
957 ["Boots" => PICKUP_BOOTS], 1194 ["Boots" => PICKUP_BOOTS],
958 ["Gloves" => PICKUP_GLOVES], 1195 ["Gloves" => PICKUP_GLOVES],
959 ["Cloaks" => PICKUP_CLOAK], 1196 ["Cloaks" => PICKUP_CLOAK],
960 ], 1197 ],
961 1198
962 ["Readables", 2, 2, 1199 ["Readables", 2, 0,
963 ["Spellbooks" => PICKUP_SPELLBOOK], 1200 ["Spellbooks" => PICKUP_SPELLBOOK],
964 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1201 ["Skillscrolls" => PICKUP_SKILLSCROLL],
965 ["Normal Books/Scrolls" => PICKUP_READABLES], 1202 ["Normal Books/Scrolls" => PICKUP_READABLES],
966 ], 1203 ],
967 ["Misc", 2, 7, 1204 ["Misc", 2, 5,
968 ["Food" => PICKUP_FOOD], 1205 ["Food" => PICKUP_FOOD],
969 ["Drinks" => PICKUP_DRINK], 1206 ["Drinks" => PICKUP_DRINK],
970 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1207 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
971 ["Keys" => PICKUP_KEY], 1208 ["Keys" => PICKUP_KEY],
972 ["Magical Items" => PICKUP_MAGICAL], 1209 ["Magical Items" => PICKUP_MAGICAL],
973 ["Potions" => PICKUP_POTION], 1210 ["Potions" => PICKUP_POTION],
974 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1211 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
975 ["Ignore cursed" => PICKUP_NOT_CURSED], 1212 ["Ignore cursed" => PICKUP_NOT_CURSED],
976 ["Jewelery" => PICKUP_JEWELS], 1213 ["Jewelery" => PICKUP_JEWELS],
1214 ["Flesh" => PICKUP_FLESH],
977 ], 1215 ],
1216 ["Weight/Value ratio", 2, 17]
978 ) 1217 )
979 { 1218 {
980 my ($title, $x, $y, @bits) = @$_; 1219 my ($title, $x, $y, @bits) = @$_;
981 $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]);
982 1221
983 for (@bits) { 1222 for (@bits) {
984 ++$y; 1223 ++$y;
985 1224
986 my $mask = $_->[1]; 1225 my $mask = $_->[1];
987 $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);
988 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1227 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
989 state => $CFG->{pickup} & $mask, 1228 state => $::CFG->{pickup} & $mask,
990 on_changed => sub { 1229 on_changed => sub {
991 my ($box, $value) = @_; 1230 my ($box, $value) = @_;
1231
992 if ($value) { 1232 if ($value) {
993 $::CFG->{pickup} |= $mask; 1233 $::CFG->{pickup} |= $mask;
994 } else { 1234 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1235 $::CFG->{pickup} &= ~$mask;
996 } 1236 }
1237
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1238 $::CONN->send_command ("pickup $::CFG->{pickup}")
998 if defined $::CONN; 1239 if defined $::CONN;
1240
1241 0
999 }); 1242 });
1243
1244 ${$_->[2]} = $checkbox if $_->[2];
1000 } 1245 }
1001 } 1246 }
1002 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
1003 $table 1269 $table
1004} 1270}
1005 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
1006sub make_inventory_window { 1291sub inventory_widget {
1007 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
1008 x => "center", 1347 x => "center",
1009 y => "center", 1348 y => "center",
1010 force_w => $WIDTH * 9/10, 1349 force_w => $WIDTH * 9/10,
1011 force_h => $HEIGHT * 9/10, 1350 force_h => $HEIGHT * 9/10,
1012 title => "Inventory", 1351 title => "Player",
1352 name => "playerbook",
1353 has_close_button => 1
1013 ; 1354 ;
1014 1355
1015 $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;
1016 1359
1017 $hb->add (my $vb1 = new CFClient::UI::VBox); 1360 $ntb->add (
1018 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1361 "Statistics (F2)" => $STATS_PAGE = stats_window,
1019 $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 );
1020 1368
1021 $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 );
1022 1380
1023 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1381 $ntb->set_current_page ($INVENTORY_PAGE);
1024 1382
1025 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1383 $plwin->add ($ntb);
1026 1384 $plwin
1027 # XXX: Call after $INVR = ... because set_opencont sets the items
1028 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1029
1030 $invwin
1031} 1385}
1032 1386
1033sub spell_setup { 1387sub update_bindings {
1034 new CFClient::UI::SpellList 1388 $BIND_UPD_CB->() if $BIND_UPD_CB;
1035} 1389}
1036 1390
1037sub keyboard_setup { 1391sub keyboard_setup {
1038 my $binding_list = new CFClient::UI::VBox; 1392 my $binding_list = new CFPlus::UI::VBox;
1039 1393
1040 my $refresh; 1394 my $refresh;
1041 $refresh = sub { 1395 $refresh = $BIND_UPD_CB = sub {
1042 $binding_list->clear (); 1396 $binding_list->clear ();
1043 1397
1398 return unless $PROFILE;
1399
1044 for my $mod (keys %{$::CFG->{bindings}}) { 1400 for my $mod (keys %{$PROFILE->{bindings}}) {
1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1401 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1402 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1403 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1048 1404
1049 my $lbl = join "; ", @$cmds; 1405 my $lbl = join "; ", @$cmds;
1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1406 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1051 $binding_list->add (my $hb = new CFClient::UI::HBox); 1407 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1052 $hb->add (new CFClient::UI::Button 1408 $hb->add (new CFPlus::UI::Button
1053 text => "delete", 1409 text => "delete",
1054 tooltip => "Deletes the binding", 1410 tooltip => "Deletes the binding",
1055 on_activate => sub { 1411 on_activate => sub {
1056 $binding_list->remove ($hb); 1412 $binding_list->remove ($hb);
1057 delete $::CFG->{bindings}->{$mod}->{$sym}; 1413 delete $PROFILE->{bindings}{$mod}{$sym};
1414 0
1058 }); 1415 });
1059 1416
1060 $hb->add (new CFClient::UI::Button 1417 $hb->add (new CFPlus::UI::Button
1061 text => "edit", 1418 text => "edit",
1062 tooltip => "Edits the binding", 1419 tooltip => "Edits the binding",
1063 on_activate => sub { 1420 on_activate => sub {
1064 $::BIND_EDITOR->set_binding ( 1421 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1422 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1066 sub { 1423 sub {
1067 my ($nmod, $nsym, $ncmds) = @_; 1424 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym}; 1425 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1426 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1070 $refresh->(); 1427 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1428 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1072 $SETUP_DIALOG->show; 1429 $SETUP_DIALOG->show;
1073 }, 1430 },
1074 sub { 1431 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1432 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1076 $SETUP_DIALOG->show; 1433 $SETUP_DIALOG->show;
1077 }); 1434 });
1078 $::BIND_EDITOR->show; 1435 $::BIND_EDITOR->show;
1079 $SETUP_DIALOG->hide; 1436 $SETUP_DIALOG->hide;
1437 0
1080 }); 1438 });
1081 1439
1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1440 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1441 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1084 } 1442 }
1085 } 1443 }
1086 }; 1444 };
1087 1445
1088 my $vb = new CFClient::UI::VBox; 1446 my $vb = new CFPlus::UI::VBox;
1089 $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);
1090 $vb->add (my $hb = new CFClient::UI::HBox); 1465 $vb->add (my $hb = new CFPlus::UI::HBox);
1091 1466
1092 $hb->add (new CFClient::UI::Button 1467 $hb->add (new CFPlus::UI::Button
1093 text => "record new", 1468 text => "record new",
1094 expand => 1, 1469 expand => 1,
1095 tooltip => "This button opens the binding editor with an empty binding.", 1470 tooltip => "This button opens the binding editor with an empty binding.",
1096 on_activate => sub { 1471 on_activate => sub {
1097 $::BIND_EDITOR->set_binding (undef, undef, [], 1472 $::BIND_EDITOR->set_binding (undef, undef, [],
1098 sub { 1473 sub {
1099 my ($mod, $sym, $cmds) = @_; 1474 my ($mod, $sym, $cmds) = @_;
1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1475 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1101 $refresh->(); 1476 $refresh->();
1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1477 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show; 1478 $SETUP_DIALOG->show;
1104 }, 1479 },
1105 sub { 1480 sub {
1107 $SETUP_DIALOG->show; 1482 $SETUP_DIALOG->show;
1108 }, 1483 },
1109 ); 1484 );
1110 $SETUP_DIALOG->hide; 1485 $SETUP_DIALOG->hide;
1111 $::BIND_EDITOR->show; 1486 $::BIND_EDITOR->show;
1487 0
1112 }, 1488 },
1113 ); 1489 );
1114 1490
1115 $hb->add (new CFClient::UI::Button 1491 $hb->add (new CFPlus::UI::Button
1116 text => "close", 1492 text => "close",
1117 tooltip => "Closes the binding window", 1493 tooltip => "Closes the binding window",
1118 expand => 1, 1494 expand => 1,
1119 on_activate => sub { 1495 on_activate => sub {
1120 $SETUP_DIALOG->hide; 1496 $SETUP_DIALOG->hide;
1497 0
1121 } 1498 }
1122 ); 1499 );
1123 1500
1124 $refresh->(); 1501 $refresh->();
1125 1502
1126 $vb 1503 $vb
1127} 1504}
1128 1505
1129sub make_help_window { 1506sub help_window {
1130 my $win = new CFClient::UI::FancyFrame 1507 my $win = new CFPlus::UI::Toplevel
1131 x => 'center', 1508 x => 'center',
1132 y => 'center', 1509 y => 'center',
1133 z => 2, 1510 z => 4,
1134 name => 'doc_browser', 1511 name => 'doc_browser',
1135 force_w => int $WIDTH * 7/8, 1512 force_w => int $WIDTH * 7/8,
1136 force_h => int $HEIGHT * 7/8, 1513 force_h => int $HEIGHT * 7/8,
1137 title => "Documentation"; 1514 title => "Help Browser",
1515 has_close_button => 1;
1138 1516
1139 $win->add (my $vbox = new CFClient::UI::VBox); 1517 $win->add (my $vbox = new CFPlus::UI::VBox);
1140 1518
1141 $vbox->add (my $buttons = new CFClient::UI::HBox); 1519 $vbox->add (new CFPlus::UI::FancyFrame
1142 $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);
1143 1525
1144 for ( 1526 my @history;
1145 [intro => "Introduction"], 1527 my @future;
1146 [manual => "Manual"], 1528 my $curnode;
1147 [command_help => "Commands"], 1529
1148 [skill_help => "Skills"], 1530 my $load_node; $load_node = sub {
1149 ) {
1150 my ($pod, $label) = @$_; 1531 my ($node, $para) = @_;
1151 1532
1533 $buttons->clear;
1534
1152 $buttons->add (new CFClient::UI::Button 1535 $buttons->add (new CFPlus::UI::Button
1153 text => $label, 1536 text => "⇤",
1537 tooltip => "back to the starting page",
1154 on_activate => sub { 1538 on_activate => sub {
1155 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1539 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1156 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1540 unshift @future, @history;
1157 1541 @history = ();
1158 $viewer->clear; 1542 $load_node->(@{shift @future});
1159
1160 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1161 for @$pom;
1162
1163 $viewer->set_offset (0);
1164 }, 1543 },
1165 ); 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 );
1166 } 1660 }
1167 1661
1168 $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}
1169 1665
1170 $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;
1171} 1716}
1172 1717
1173sub sdl_init { 1718sub sdl_init {
1174 CFClient::SDL_Init 1719 CFPlus::SDL_Init
1175 and die "SDL::Init failed!\n"; 1720 and die "SDL::Init failed!\n";
1176} 1721}
1177 1722
1178sub video_init { 1723sub video_init {
1179 sdl_init; 1724 sdl_init;
1184 1729
1185 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1730 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1186 $FULLSCREEN = $CFG->{fullscreen}; 1731 $FULLSCREEN = $CFG->{fullscreen};
1187 $FAST = $CFG->{fast}; 1732 $FAST = $CFG->{fast};
1188 1733
1189 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1734 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1190 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1735 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1191 1736
1192 $SDL_ACTIVE = 1; 1737 $SDL_ACTIVE = 1;
1193 $LAST_REFRESH = time - 0.01; 1738 $LAST_REFRESH = time - 0.01;
1194 1739
1195 CFClient::OpenGL::init; 1740 CFPlus::OpenGL::init;
1196 1741
1197 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1742 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1198 1743
1199 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1744 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1200 1745
1201 ############################################################################# 1746 #############################################################################
1202 1747
1203 if ($DEBUG_STATUS) { 1748 if ($DEBUG_STATUS) {
1204 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1749 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1205 } else { 1750 } else {
1206 # create the widgets 1751 # create the widgets
1207 1752
1208 $DEBUG_STATUS = new CFClient::UI::Label 1753 $DEBUG_STATUS = new CFPlus::UI::Label
1209 padding => 0, 1754 padding => 0,
1210 z => 100, 1755 z => 100,
1211 force_x => "max", 1756 force_x => "max",
1212 force_y => 0; 1757 force_y => 0;
1213 $DEBUG_STATUS->show; 1758 $DEBUG_STATUS->show;
1214 1759
1215 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1760 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1216 1761
1217 $STATUSBOX = new CFClient::UI::Statusbox; 1762 $STATUSBOX = new CFPlus::UI::Statusbox;
1218 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, 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]);
1219 1764
1220 (new CFClient::UI::Frame 1765 (new CFPlus::UI::Frame
1221 bg => [0, 0, 0, 0.4], 1766 bg => [0, 0, 0, 0.4],
1222 force_x => 0, 1767 force_x => 0,
1223 force_y => "max", 1768 force_y => "max",
1224 child => $STATUSBOX, 1769 child => $STATUSBOX,
1225 )->show; 1770 )->show;
1226 1771
1227 CFClient::UI::FancyFrame->new ( 1772 CFPlus::UI::Toplevel->new (
1228 title => "Map", 1773 title => "Map",
1229 name => "mapmap", 1774 name => "mapmap",
1230 x => 0, 1775 x => 0,
1231 y => $FONTSIZE + 8, 1776 y => $FONTSIZE + 8,
1232 border_bg => [1, 1, 1, 192/255], 1777 border_bg => [1, 1, 1, 192/255],
1233 bg => [1, 1, 1, 0], 1778 bg => [1, 1, 1, 0],
1234 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1779 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1235 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.",
1236 ), 1781 ),
1237 )->show; 1782 )->show;
1238 1783
1239 $MAPWIDGET = new CFClient::MapWidget; 1784 $MAPWIDGET = new CFPlus::MapWidget;
1240 $MAPWIDGET->connect (activate_console => sub { 1785 $MAPWIDGET->connect (activate_console => sub {
1241 my ($mapwidget, $preset) = @_; 1786 my ($mapwidget, $preset) = @_;
1242 1787
1243 if ($CONSOLE) { 1788 if ($CONSOLE) {
1244 $CONSOLE->{input}->{auto_activated} = 1; 1789 $CONSOLE->{input}->{auto_activated} = 1;
1245 $CONSOLE->{input}->focus_in; 1790 $CONSOLE->{input}->grab_focus;
1246 1791
1247 if ($preset && $CONSOLE->{input}->get_text eq '') { 1792 if ($preset && $CONSOLE->{input}->get_text eq '') {
1248 $CONSOLE->{input}->set_text ($preset); 1793 $CONSOLE->{input}->set_text ($preset);
1249 } 1794 }
1250 } 1795 }
1251 }); 1796 });
1252 $MAPWIDGET->show; 1797 $MAPWIDGET->show;
1253 $MAPWIDGET->focus_in; 1798 $MAPWIDGET->grab_focus;
1254 1799
1255 $LOGVIEW = new CFClient::UI::TextView 1800 $LOGVIEW = new CFPlus::UI::TextScroller
1256 expand => 1, 1801 expand => 1,
1257 font => $FONT_FIXED, 1802 font => $FONT_FIXED,
1258 fontsize => $::CFG->{log_fontsize}, 1803 fontsize => $::CFG->{log_fontsize},
1804 indent => -4,
1259 can_hover => 1, 1805 can_hover => 1,
1260 can_events => 1, 1806 can_events => 1,
1261 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.",
1262 ; 1808 ;
1263 1809
1264 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1810 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1265 title => "Setup", 1811 title => "Setup",
1266 name => "setup_dialog", 1812 name => "setup_dialog",
1267 x => 'center', 1813 x => 'center',
1268 y => 'center', 1814 y => 'center',
1269 z => 2, 1815 z => 2,
1270 force_w => $::WIDTH * 0.6, 1816 force_w => $::WIDTH * 0.6,
1271 force_h => $::HEIGHT * 0.6, 1817 force_h => $::HEIGHT * 0.6,
1818 has_close_button => 1,
1272 ; 1819 ;
1273 1820
1821 $METASERVER = metaserver_dialog;
1822
1274 $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,
1275 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1824 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1276 1825
1277 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1826 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1278 "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.");
1279 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1828 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1280 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1829 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1281 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1830 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1282 "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.");
1283 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1832 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1284 "Configure the use of audio, sound effects and background music."); 1833 "Configure the use of audio, sound effects and background music.");
1285 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1834 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1286 "Lets you define, edit and delete bindings." 1835 "Lets you define, edit and delete key bindings."
1287 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1836 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1288 . "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 "
1289 . "want to record press <b>Insert</b> 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. "
1290 . "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 "
1291 . "binding editor closes"); 1840 . "binding editor closes");
1292 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1841 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1293 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1842 "Some debuggin' options. Do not ask.");
1294 1843
1295 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1844 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1296 1845
1297 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1846 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1298 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.");
1299 1848
1300 $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,
1301 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.");
1302 1851
1303 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
1304 1853
1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1306 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1307 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1308 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.");
1309 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1310 1856
1311 $BUTTONBAR->add (new CFClient::UI::Button 1857 $BUTTONBAR->add (new CFPlus::UI::Button
1312 text => "Save Config", 1858 text => "Save Config",
1313 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.",
1314 on_activate => sub { 1860 on_activate => sub {
1315 $::CFG->{layout} = CFClient::UI::get_layout; 1861 $::CFG->{layout} = CFPlus::UI::get_layout;
1316 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1862 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1317 status "Configuration Saved"; 1863 status "Configuration Saved";
1864 0
1318 }, 1865 },
1319 ); 1866 );
1320 1867
1321 $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,
1322 tooltip => "View Documentation"); 1869 tooltip => "View Documentation");
1323 1870
1871
1324 $BUTTONBAR->add (new CFClient::UI::Button 1872 $BUTTONBAR->add (new CFPlus::UI::Button
1325 text => "Quit", 1873 text => "Quit",
1326 tooltip => "Terminates the program", 1874 tooltip => "Terminates the program",
1327 on_activate => sub { 1875 on_activate => sub {
1328 if ($CONN) { 1876 if ($CONN) {
1329 open_quit_dialog; 1877 open_quit_dialog;
1330 } else { 1878 } else {
1331 exit; 1879 exit;
1332 } 1880 }
1881 0
1333 }, 1882 },
1334 ); 1883 );
1335 1884
1336 $BUTTONBAR->show; 1885 $BUTTONBAR->show;
1337 $SETUP_DIALOG->show; 1886 $SETUP_DIALOG->show;
1338 } 1887 }
1339 1888
1340 $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]);
1341} 1890}
1342 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
1343sub video_shutdown { 2010sub video_shutdown {
2011 CFPlus::OpenGL::shutdown;
2012
1344 undef $SDL_ACTIVE; 2013 undef $SDL_ACTIVE;
1345} 2014}
1346 2015
1347my @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#
1348my $bgmusic;#TODO#hack#d# 2017my $bgmusic;#TODO#hack#d#
1355 2024
1356sub audio_music_finished { 2025sub audio_music_finished {
1357 return unless $CFG->{bgm_enable}; 2026 return unless $CFG->{bgm_enable};
1358 2027
1359 # TODO: hack, do play loop and mood music 2028 # TODO: hack, do play loop and mood music
1360 $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]";
1361 $bgmusic->play (0); 2030 $bgmusic->play (0);
1362 2031
1363 push @bgmusic, shift @bgmusic; 2032 push @bgmusic, shift @bgmusic;
1364} 2033}
1365 2034
1366sub audio_init { 2035sub audio_init {
1367 if ($CFG->{audio_enable}) { 2036 if ($CFG->{audio_enable}) {
1368 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2037 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1369 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2038 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1370 2039
1371 unless ($SDL_MIXER) { 2040 unless ($SDL_MIXER) {
1372 status "Unable to open sound device: there will be no sound"; 2041 status "Unable to open sound device: there will be no sound";
1373 return; 2042 return;
1374 } 2043 }
1375 2044
1376 CFClient::Mix_AllocateChannels 8; 2045 CFPlus::Mix_AllocateChannels 8;
1377 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2046 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1378 2047
1379 audio_music_finished; 2048 audio_music_finished;
1380 2049
2050 local $_;
1381 while (<$fh>) { 2051 while (<$fh>) {
1382 next if /^\s*#/; 2052 next if /^\s*#/;
1383 next if /^\s*$/; 2053 next if /^\s*$/;
1384 2054
1385 my ($file, $volume, $event) = split /\s+/, $_, 3; 2055 my ($file, $volume, $event) = split /\s+/, $_, 3;
1386 2056
1387 push @SOUNDS, "$volume,$file"; 2057 push @SOUNDS, "$volume,$file";
1388 2058
1389 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2059 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1390 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";
1391 $chunk->volume ($volume * 128 / 100); 2061 $chunk->volume ($volume * 128 / 100);
1392 $chunk 2062 $chunk
1393 }; 2063 };
1394 } 2064 }
1395 } else { 2065 } else {
1397 } 2067 }
1398 } 2068 }
1399} 2069}
1400 2070
1401sub audio_shutdown { 2071sub audio_shutdown {
1402 CFClient::Mix_CloseAudio if $SDL_MIXER; 2072 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1403 undef $SDL_MIXER; 2073 undef $SDL_MIXER;
1404 @SOUNDS = (); 2074 @SOUNDS = ();
1405 %AUDIO_CHUNKS = (); 2075 %AUDIO_CHUNKS = ();
1406} 2076}
1407 2077
1414 2084
1415sub force_refresh { 2085sub force_refresh {
1416 $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;
1417 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2087 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1418 2088
1419 $CFClient::UI::ROOT->draw; 2089 $CFPlus::UI::ROOT->draw;
1420 2090
1421 $WANT_REFRESH = 0; 2091 $WANT_REFRESH = 0;
1422 $CAN_REFRESH = 0; 2092 $CAN_REFRESH = 0;
1423 $LAST_REFRESH = $NOW; 2093 $LAST_REFRESH = $NOW;
1424 2094
14250 && do {
1426 # some weird model-drawing code, just a joke right now
1427 use CFClient::OpenGL;
1428
1429 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1430 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1431 $demo{r} ||= do {
1432 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1433 $mod->{v} = pack "f*", @{$mod->{v}};
1434 $_ = [scalar @$_, pack "S!*", @$_]
1435 for values %{$mod->{g}};
1436 $mod
1437 };
1438
1439 my $r = $demo{r} or die;
1440
1441 glDepthMask 1;
1442 glClear GL_DEPTH_BUFFER_BIT;
1443 glEnable GL_TEXTURE_2D;
1444 glEnable GL_DEPTH_TEST;
1445 glEnable GL_CULL_FACE;
1446 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1447
1448 glMatrixMode GL_PROJECTION;
1449 glLoadIdentity;
1450 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1451 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1452 glMatrixMode GL_MODELVIEW;
1453 glLoadIdentity;
1454
1455 glPushMatrix;
1456 glTranslate 0, 0, -800;
1457 glScale 1, -1, 1;
1458 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1459 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1460 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1461 glScale 50, 50, 50;
1462
1463 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1464 while (my ($k, $v) = each %{$r->{g}}) {
1465 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1466 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1467 }
1468
1469 glPopMatrix;
1470
1471 glShadeModel GL_FLAT;
1472 glDisable GL_DEPTH_TEST;
1473 glDisable GL_TEXTURE_2D;
1474 glDepthMask 0;
1475
1476 $WANT_REFRESH++;
1477};
1478
1479 CFClient::SDL_GL_SwapBuffers; 2095 CFPlus::SDL_GL_SwapBuffers;
1480} 2096}
1481 2097
1482my $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 {
1483 $NOW = time; 2099 $NOW = time;
1484 2100
1485 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2101 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1486 for CFClient::SDL_PollEvent; 2102 for CFPlus::SDL_PollEvent;
1487 2103
1488 if (%animate_object) { 2104 if (%animate_object) {
1489 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2105 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1490 $WANT_REFRESH++; 2106 $WANT_REFRESH++;
1491 } 2107 }
1515 $CONN->face_prefetch 2131 $CONN->face_prefetch
1516 if $CONN; 2132 if $CONN;
1517}); 2133});
1518 2134
1519%SDL_CB = ( 2135%SDL_CB = (
1520 CFClient::SDL_QUIT => sub { 2136 CFPlus::SDL_QUIT => sub {
1521 Event::unloop -1; 2137 Event::unloop -1;
1522 }, 2138 },
1523 CFClient::SDL_VIDEORESIZE => sub { 2139 CFPlus::SDL_VIDEORESIZE => sub {
1524 }, 2140 },
1525 CFClient::SDL_VIDEOEXPOSE => sub { 2141 CFPlus::SDL_VIDEOEXPOSE => sub {
1526 CFClient::UI::full_refresh; 2142 CFPlus::UI::full_refresh;
1527 }, 2143 },
1528 CFClient::SDL_ACTIVEEVENT => sub { 2144 CFPlus::SDL_ACTIVEEVENT => sub {
1529# 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#
1530 }, 2146 },
1531 CFClient::SDL_KEYDOWN => sub { 2147 CFPlus::SDL_KEYDOWN => sub {
1532 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2148 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1533 # alt-enter 2149 # alt-enter
2150 $FULLSCREEN_ENABLE->toggle;
1534 video_shutdown; 2151 video_shutdown;
1535 $CFG->{fullscreen} = !$CFG->{fullscreen};
1536 video_init; 2152 video_init;
1537 } else { 2153 } else {
1538 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2154 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1539 } 2155 }
1540 }, 2156 },
1541 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2157 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1542 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2158 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1543 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2159 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1544 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2160 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1545 CFClient::SDL_USEREVENT => sub { 2161 CFPlus::SDL_USEREVENT => sub {
1546 if ($_[0]{code} == 1) { 2162 if ($_[0]{code} == 1) {
1547 audio_channel_finished $_[0]{data1}; 2163 audio_channel_finished $_[0]{data1};
1548 } elsif ($_[0]{code} == 0) { 2164 } elsif ($_[0]{code} == 0) {
1549 audio_music_finished; 2165 audio_music_finished;
1550 } 2166 }
1554############################################################################# 2170#############################################################################
1555 2171
1556$SIG{INT} = $SIG{TERM} = sub { exit }; 2172$SIG{INT} = $SIG{TERM} = sub { exit };
1557 2173
1558{ 2174{
1559 local $SIG{__DIE__} = sub {
1560 return unless defined $^S && !$^S;
1561 Carp::confess $_[1];#d#TODO: remove when stable
1562 CFClient::fatal $_[0];
1563 };
1564
1565 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2175 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1566 CFClient::UI::set_layout ($::CFG->{layout}); 2176 CFPlus::UI::set_layout ($::CFG->{layout});
1567 2177
1568 my %DEF_CFG = ( 2178 my %DEF_CFG = (
1569 sdl_mode => 0, 2179 sdl_mode => 0,
1570 width => 640, 2180 width => 640,
1571 height => 480, 2181 height => 480,
1572 fullscreen => 0, 2182 fullscreen => 0,
1573 fast => 0, 2183 fast => 0,
1574 map_scale => 1, 2184 map_scale => 1,
1575 fow_enable => 1, 2185 fow_enable => 1,
1576 fow_intensity => 0.45, 2186 fow_intensity => 0.45,
1577 fow_smooth => 0, 2187 fow_smooth => 0,
1578 gui_fontsize => 1, 2188 gui_fontsize => 1,
1579 log_fontsize => 1, 2189 log_fontsize => 0.7,
1580 gauge_fontsize=> 1, 2190 gauge_fontsize => 1,
1581 gauge_size => 0.35, 2191 gauge_size => 0.35,
1582 stat_fontsize => 1, 2192 stat_fontsize => 0.7,
1583 mapsize => 100, 2193 mapsize => 100,
1584 host => "crossfire.schmorp.de",
1585 say_command => 'say', 2194 say_command => 'chat',
1586 audio_enable => 1, 2195 audio_enable => 1,
1587 bgm_enable => 1, 2196 bgm_enable => 1,
1588 bgm_volume => 0.25, 2197 bgm_volume => 0.25,
1589 face_prefetch => 0, 2198 face_prefetch => 0,
1590 output_sync => 1, 2199 output_sync => 1,
1591 output_count => 1, 2200 output_count => 1,
2201 pickup => 0,
2202 inv_sort => "mtime",
2203 default => "profile", # default profile
2204 show_tips => 1,
2205 );
1592 ); 2206
1593
1594 while (my ($k, $v) = each %DEF_CFG) { 2207 while (my ($k, $v) = each %DEF_CFG) {
1595 $CFG->{$k} = $v unless exists $CFG->{$k}; 2208 $CFG->{$k} = $v unless exists $CFG->{$k};
1596 } 2209 }
1597 2210
2211 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2212
1598 sdl_init; 2213 sdl_init;
1599 2214
1600 @SDL_MODES = reverse 2215 @SDL_MODES = reverse
1601 grep $_->[0] >= 640 && $_->[1] >= 480, 2216 grep $_->[0] >= 640 && $_->[1] >= 480,
1602 CFClient::SDL_ListModes; 2217 CFPlus::SDL_ListModes;
1603 2218
1604 @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)";
1605 2220
1606 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2221 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1607 2222
1608 { 2223 {
1609 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2224 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1610 DejaVuSans.ttf 2225 DejaVuSans.ttf
1611 DejaVuSansMono.ttf 2226 DejaVuSansMono.ttf
1612 DejaVuSans-Bold.ttf 2227 DejaVuSans-Bold.ttf
1613 DejaVuSansMono-Bold.ttf 2228 DejaVuSansMono-Bold.ttf
1614 DejaVuSans-Oblique.ttf 2229 DejaVuSans-Oblique.ttf
1615 DejaVuSansMono-Oblique.ttf 2230 DejaVuSansMono-Oblique.ttf
1616 DejaVuSans-BoldOblique.ttf 2231 DejaVuSans-BoldOblique.ttf
1617 DejaVuSansMono-BoldOblique.ttf 2232 DejaVuSansMono-BoldOblique.ttf
1618 ); 2233 );
1619 2234
1620 CFClient::add_font $_ for @fonts; 2235 CFPlus::add_font $_ for @fonts;
1621 2236
1622 CFClient::pango_init; 2237 CFPlus::pango_init;
1623 2238
1624 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2239 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1625 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2240 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1626 2241
1627 $FONT_PROP->make_default; 2242 $FONT_PROP->make_default;
1628 } 2243 }
1629 2244
1630# compare mono (ft) vs. rgba (cairo) 2245# compare mono (ft) vs. rgba (cairo)
1631# ft - 1.8s, cairo 3s, even in alpha-only mode 2246# ft - 1.8s, cairo 3s, even in alpha-only mode
1632# for my $rgba (0..1) { 2247# for my $rgba (0..1) {
1633# my $t1 = Time::HiRes::time; 2248# my $t1 = Time::HiRes::time;
1634# for (1..1000) { 2249# for (1..1000) {
1635# my $layout = CFClient::Layout->new ($rgba); 2250# my $layout = CFPlus::Layout->new ($rgba);
1636# $layout->set_text ("hallo" x 100); 2251# $layout->set_text ("hallo" x 100);
1637# $layout->render; 2252# $layout->render;
1638# } 2253# }
1639# my $t2 = Time::HiRes::time; 2254# my $t2 = Time::HiRes::time;
1640# warn $t2-$t1; 2255# warn $t2-$t1;
1641# } 2256# }
1642 2257
2258 $startup_done->();
2259
1643 video_init; 2260 video_init;
1644 audio_init; 2261 audio_init;
1645} 2262}
1646 2263
2264show_tip_of_the_day if $CFG->{show_tips};
2265
1647Event::loop; 2266Event::loop;
2267#CFPlus::SDL_Quit;
2268#CFPlus::_exit 0;
1648 2269
1649END { CFClient::SDL_Quit } 2270END { CFPlus::SDL_Quit }
1650 2271
1651=head1 NAME 2272=head1 NAME
1652 2273
1653cfplus - A Crossfire+ and Crossfire game client 2274cfplus - A Crossfire+ and Crossfire game client
1654 2275

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines