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.54 by root, Mon Jun 5 01:59:59 2006 UTC vs.
Revision 1.133 by root, Sun Dec 3 01:03:49 2006 UTC

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

Diff Legend

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