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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines