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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines