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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines