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.90 by elmex, Mon Jul 10 06:59:14 2006 UTC vs.
Revision 1.143 by root, Fri Mar 16 02:33:50 2007 UTC

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

Diff Legend

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