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.81 by elmex, Wed Jun 28 09:42:40 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines