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

Diff Legend

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