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.69 by root, Mon Jun 12 13:26:15 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
26
27use Carp 'verbose';
5 28
6# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
7BEGIN { 30BEGIN {
8 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 33
11 while (my ($filename, $zip) = each %PAR::LibCache) { 34 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 35 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 36 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 38 unless -e "$ENV{PAR_TEMP}/$1";
16 } 39 }
17 } 40 }
18 41
32use Crossfire; 55use Crossfire;
33use Crossfire::Protocol::Constants; 56use Crossfire::Protocol::Constants;
34 57
35use Compress::LZF; 58use Compress::LZF;
36 59
37use CFClient; 60use CFPlus;
38use CFClient::OpenGL (); 61use CFPlus::OpenGL ();
39use CFClient::Protocol; 62use CFPlus::Protocol;
40use CFClient::UI; 63use CFPlus::UI;
64use CFPlus::Pod;
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 }
655 687
688 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
656 689
657 $table 690 $table
658} 691}
659 692
660sub stats_window { 693sub stats_window {
661 my $tgw = new CFClient::UI::FancyFrame 694 my $r = new CFPlus::UI::ScrolledWindow (
662 y => $HEIGHT * (2/8), 695 expand => 1,
663 x => "max", 696 scroll_y => 1
664 title => "Stats", 697 );
665 name => "stats_window"; 698 $r->add (my $vb = new CFPlus::UI::VBox);
666 699
667 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 700 $vb->add (new CFPlus::UI::FancyFrame
701 label => "Player",
702 child => (my $pi = new CFPlus::UI::VBox),
703 );
704
668 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 705 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 706 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."); 707 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, 708 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 709 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 710 tooltip => "The map you are currently on (if supported by the server).");
674 711
675 $vb->add (my $hb0 = new CFClient::UI::HBox); 712 $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, 713 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 714 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 715 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, 716 $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, 717 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 718 tooltip => "The weight limit: you cannot carry more than this.");
682 719
683 720 $vb->add (new CFPlus::UI::FancyFrame
721 label => "Primary/Secondary Statistics",
684 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 722 child => (my $hb = new CFPlus::UI::HBox expand => 1),
723 );
685 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 724 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
686 725
687 my $color2 = [1, 1, 0]; 726 my $color2 = [1, 1, 0];
688 727
689 for ( 728 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"], 729 [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"], 730 [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"], 731 [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"], 732 [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"], 733 [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"], 734 [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."], 735 [0, 6, st_cha => "Cha", 30],
697 736
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."], 737 [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."], 738 [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."], 739 [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."], 740 [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."], 741 [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."], 742 [2, 5, st_wspd => "WSp", 10.54],
704 ) { 743 ) {
705 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 744 my ($col, $row, $id, $label, $template) = @$_;
706 745
707 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 746 $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); 747 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
748 align => +1, template => $template, tooltip => "#stat_$label");
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 749 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 750 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
751 align => -1, text => $label, tooltip => "#stat_$label");
711 } 752 }
712 753
754 $vb->add (new CFPlus::UI::FancyFrame
755 label => "Resistancies",
713 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 756 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
757 );
714 758
715 my $row = 0; 759 my $row = 0;
716 my $col = 0; 760 my $col = 0;
717 761
718 my %resist_names = ( 762 my %resist_names = (
763 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.)", 764 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
765 holyw => ["Holy Word",
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.)", 766 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
767 conf => ["Confusion",
721 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 768 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
769 fire => ["Fire",
722 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 770 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
771 depl => ["Depletion",
723 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 772 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
773 magic => ["Magic",
724 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 774 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
775 drain => ["Draining",
725 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 776 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
777 acid => ["Acid",
726 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 778 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
779 pois => ["Poison",
727 pois => "<b>Poison</b> (resistance to getting poisoned)", 780 "<b>Poison</b> (resistance to getting poisoned)"],
781 para => ["Paralysation",
728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 782 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
783 deat => ["Death",
729 deat => "<b>Death</b> (resistance against death spells)", 784 "<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)", 785 phys => ["Physical",
786 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
787 blind => ["Blind",
731 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 788 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
789 fear => ["Fear",
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)", 790 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
791 tund => ["Turn undead",
733 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 792 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
793 elec => ["Electricity",
734 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 794 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
795 cold => ["Cold",
735 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 796 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
797 ghit => ["Ghost hit",
736 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 798 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
737 ); 799 );
738 for (qw/slow holyw conf fire depl magic 800 for (qw/slow holyw conf fire depl magic
739 drain acid pois para deat phys 801 drain acid pois para deat phys
740 blind fear tund elec cold ghit/) 802 blind fear tund elec cold ghit/)
741 { 803 {
742 $tbl2->add ($col, $row, 804 $tbl2->add ($col, $row,
743 $STATWIDS->{"res_$_"} = 805 $STATWIDS->{"res_$_"} =
744 new CFClient::UI::Label 806 new CFPlus::UI::Label
745 font => $FONT_FIXED, 807 font => $FONT_FIXED,
746 template => "-100%", 808 template => "-100%",
747 align => +1, 809 align => +1,
748 valign => 0, 810 valign => 0,
749 can_events => 1, 811 can_events => 1,
750 can_hover => 1, 812 can_hover => 1,
751 tooltip => $resist_names{$_}, 813 tooltip => $resist_names{$_}->[1],
752 ); 814 );
753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 815 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
754 font => $FONT_FIXED, 816 font => $FONT_FIXED,
755 can_hover => 1, 817 can_hover => 1,
756 can_events => 1, 818 can_events => 1,
757 image => "ui/resist/resist_$_.png", 819 path => "ui/resist/resist_$_.png",
758 tooltip => $resist_names{$_}, 820 tooltip => $resist_names{$_}->[1],
821 );
822 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
823 text => $resist_names{$_}->[0],
824 font => $FONT_FIXED,
825 can_hover => 1,
826 can_events => 1,
827 tooltip => $resist_names{$_}->[1],
759 ); 828 );
760 829
761 $row++; 830 $row++;
762 if ($row % 6 == 0) { 831 if ($row % 6 == 0) {
763 $col += 2; 832 $col += 3;
764 $row = 0; 833 $row = 0;
765 } 834 }
766 } 835 }
767 836
768 &set_stats_window_fontsize;
769 update_stats_window ({}); 837 #update_stats_window ({});
770 838
839 $r
840}
841
842sub skill_window {
843 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
844 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
771 $tgw 845 $sw
772} 846}
773 847
774sub formsep($) { 848sub formsep($) {
775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 849 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
776} 850}
777 851
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 # TODO: replace by CS_STAT_RES_xxx constants
822 my %tbl = (
823 phys => 100,
824 magic => 101,
825 fire => 102,
826 elec => 103,
827 cold => 104,
828 conf => 105,
829 acid => 106,
830 drain => 107,
831 ghit => 108,
832 pois => 109,
833 slow => 110,
834 para => 111,
835 tund => 112,
836 fear => 113,
837 depl => 113,
838 deat => 115,
839 holyw => 116,
840 blind => 117,
841 );
842
843 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
844 for keys %tbl;
845}
846
847my $METASERVER_ATIME; 852my $METASERVER_ATIME;
848 853
849sub update_metaserver { 854sub update_metaserver {
855 my ($metaserver_dialog) = @_;
856
857 $METASERVER = $metaserver_dialog
858 if defined $metaserver_dialog;
859
850 return if $METASERVER_ATIME > time; 860 return if $METASERVER_ATIME > time;
851 $METASERVER_ATIME = time + 60; 861 $METASERVER_ATIME = time + 60;
852 862
853 my $table = $METASERVER->{table}; 863 my $table = $METASERVER->{table};
854 $table->clear; 864 $table->clear;
855 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 865 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
856 866
857 my $buf; 867 my $ok = 0;
858 868
859 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 869 CFPlus::background {
870 my $ua = CFPlus::lwp_useragent;
860 871
861 unless ($fh) { 872 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
862 $label->set_text ("unable to contact metaserver: $!"); 873 } sub {
863 return; 874 my ($msg) = @_;
864 } 875 if ($msg) {
865
866 Event->io (fd => $fh, poll => 'r', cb => sub {
867 my $res = sysread $fh, $buf, 8192, length $buf;
868
869 if (!defined $res) {
870 $_[0]->w->cancel;
871 $label->set_text ("error while retrieving server list: $!");
872 } elsif ($res == 0) {
873 $_[0]->w->cancel;
874 status "server list retrieved";
875
876 utf8::decode $buf if utf8::valid $buf;
877
878 $table->clear; 876 $table->clear;
879 877
880 my @tip = ( 878 my @tip = (
881 "The current number of users logged in on the server.", 879 "The current number of users logged in on the server.",
882 "The hostname of the server.", 880 "The hostname of the server.",
883 "The time this server has been running without being restarted.", 881 "The time this server has been running without being restarted.",
884 "The server software version - a '+' indicates a Crossfire+ server.", 882 "The server software version - a '+' indicates a Crossfire+ server.",
885 "Short information about this server provided by its admins.", 883 "Short information about this server provided by its admins.",
886 ); 884 );
887 my @col = qw(#Users Host Uptime Version Description); 885 my @col = qw(#Users Host Uptime Version Description);
888 $table->add ($_, 0, new CFClient::UI::Label 886 $table->add ($_, 0, new CFPlus::UI::Label
889 can_hover => 1, can_events => 1, 887 can_hover => 1, can_events => 1,
890 align => 0, fg => [1, 1, 0], 888 align => 0, fg => [1, 1, 0],
891 text => $col[$_], tooltip => $tip[$_]) 889 text => $col[$_], tooltip => $tip[$_])
892 for 0 .. $#col; 890 for 0 .. $#col;
893 891
894 my @align = qw(1 0 1 1 -1); 892 my @align = qw(1 0 1 1 -1);
895 893
896 my $y = 0; 894 my $y = 0;
897 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 895 for my $m (
896 sort {
897 $b->{version} <=> $a->{version}
898 or $b->{users} <=> $a->{users}
899 }
900 @{ $msg->{servers} }
901 ) {
898 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 902 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
903 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
899 904
900 for ($desc) { 905 for ($desc) {
901 s/<br>/\n/gi; 906 s/<br>/\n/gi;
902 s/<li>/\n· /gi; 907 s/<li>/\n· /gi;
903 s/<.*?>//sgi; 908 s/<.*?>//sgi;
904 s/&/&amp;/g; 909 s/&amp;/&/g;
905 s/</&lt;/g; 910 s/&lt;/</g;
906 s/>/&gt;/g; 911 s/&gt;/>/g;
907 } 912 }
908 913
909 $uptime = sprintf "%dd %02d:%02d:%02d", 914 $uptime = sprintf "%dd %02d:%02d:%02d",
910 (int $m->[8] / 86400), 915 (int $uptime / 86400),
911 (int $m->[8] / 3600) % 24, 916 (int $uptime / 3600) % 24,
912 (int $m->[8] / 60) % 60, 917 (int $uptime / 60) % 60,
913 $m->[8] % 60; 918 $uptime % 60;
914 919
915 $m = [$users, $host, $uptime, $version, $desc]; 920 $m = [$users, $host, $uptime, $version, $desc];
916 921
917 $y++; 922 $y++;
918 923
919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 924 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
920 (new CFClient::UI::Button 925 (new CFPlus::UI::Button
921 text => "Use", 926 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field", 927 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub { 928 on_activate => sub {
924 $HOST_ENTRY->set_text ($CFG->{host} = $host); 929 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
925 $METASERVER->hide; 930 $METASERVER->hide;
931 0
926 }, 932 },
927 ), 933 ),
928 (new CFClient::UI::Empty expand => 1), 934 (new CFPlus::UI::Empty expand => 1),
929 ]); 935 ]);
930 936
931 $table->add ($_, $y, new CFClient::UI::Label 937 $table->add ($_, $y, new CFPlus::UI::Label
938 max_w => $::WIDTH * 0.4,
932 ellipsise => 0, 939 ellipsise => 0,
933 align => $align[$_], 940 align => $align[$_],
934 text => $m->[$_], 941 text => $m->[$_],
935 tooltip => $tip[$_], 942 tooltip => $tip[$_],
943 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
936 can_hover => 1, 944 can_hover => 1,
937 can_events => 1, 945 can_events => 1,
938 fontsize => 0.8) 946 fontsize => 0.8)
939 for 0 .. $#$m; 947 for 0 .. $#$m;
940 } 948 }
949 } else {
950 $ok or $label->set_text ("error while contacting metaserver");
941 } 951 }
942 }); 952 };
953
943} 954}
944 955
945sub metaserver_dialog { 956sub metaserver_dialog {
946 my $dialog = new CFClient::UI::FancyFrame 957 my $vbox = new CFPlus::UI::VBox;
958 my $table = new CFPlus::UI::Table;
959 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
960
961 my $dialog = new CFPlus::UI::Toplevel
947 title => "Server List", 962 title => "Server List",
948 name => 'metaserver_dialog', 963 name => 'metaserver_dialog',
949 x => 'center', 964 x => 'center',
950 y => 'center', 965 y => 'center',
951 z => 3, 966 z => 3,
967 force_w => $::WIDTH * 0.9,
952 force_h => $::HEIGHT * 0.4, 968 force_h => $::HEIGHT * 0.7,
953 child => (my $vbox = new CFClient::UI::VBox), 969 child => $vbox,
970 has_close_button => 1,
971 table => $table,
954 on_visibility_change => sub { 972 on_visibility_change => sub {
955 update_metaserver if $_[1]; 973 update_metaserver ($_[0]) if $_[1];
974 0
956 }, 975 },
957 ; 976 ;
958 977
959 $dialog->{table} = new CFClient::UI::Table;
960
961 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
962
963 $dialog 978 $dialog
964} 979}
965 980
966sub server_setup { 981sub server_setup {
967 my $vbox = new CFClient::UI::VBox; 982 my $vbox = new CFPlus::UI::VBox;
968 983
984 $vbox->add (new CFPlus::UI::FancyFrame
985 label => "Connection Settings",
969 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 986 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
987 );
970 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 988 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
971 989
972 { 990 {
973 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 991 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
974 992
975 $vbox->add ( 993 $vbox->add (
976 $HOST_ENTRY = new CFClient::UI::Entry 994 $HOST_ENTRY = new CFPlus::UI::Entry
977 expand => 1, 995 expand => 1,
978 text => $CFG->{host}, 996 text => $CFG->{profile}{default}{host},
979 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 997 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
980 on_changed => sub { 998 on_changed => sub {
981 my ($self, $value) = @_; 999 my ($self, $value) = @_;
982 $CFG->{host} = $value; 1000 $CFG->{profile}{default}{host} = $value;
1001 0
983 } 1002 }
984 ); 1003 );
985 1004
986 $METASERVER = metaserver_dialog;
987
988 $vbox->add (new CFClient::UI::Button 1005 $vbox->add (new CFPlus::UI::Button
989 expand => 1, 1006 expand => 1,
990 text => "Server List", 1007 text => "Server List",
991 other => $METASERVER, 1008 other => $METASERVER,
992 tooltip => "Show a list of available crossfire servers", 1009 tooltip => "Show a list of available crossfire servers",
993 on_activate => sub { $METASERVER->toggle_visibility }, 1010 on_activate => sub { $METASERVER->toggle_visibility; 0 },
994 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 1011 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
995 ); 1012 );
996 } 1013 }
997 1014
998 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1015 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
999 $table->add (1, 4, new CFClient::UI::Entry 1016 $table->add (1, 4, new CFPlus::UI::Entry
1000 text => $CFG->{user}, 1017 text => $CFG->{profile}{default}{user},
1001 tooltip => "The name of your character on the server", 1018 tooltip => "The name of your character on the server",
1002 on_changed => sub { 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1003 my ($self, $value) = @_;
1004 $CFG->{user} = $value;
1005 }
1006 ); 1020 );
1007 1021
1008 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1022 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1009 $table->add (1, 5, new CFClient::UI::Entry 1023 $table->add (1, 5, new CFPlus::UI::Entry
1010 text => $CFG->{password}, 1024 text => $CFG->{profile}{default}{password},
1011 hidden => 1, 1025 hidden => 1,
1012 tooltip => "The password for your character", 1026 tooltip => "The password for your character",
1013 on_changed => sub { 1027 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1014 my ($self, $value) = @_;
1015 $CFG->{password} = $value;
1016 }
1017 ); 1028 );
1018 1029
1019 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1030 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1020 $table->add (1, 7, new CFClient::UI::Slider 1031 $table->add (1, 7, new CFPlus::UI::Slider
1021 force_w => 100, 1032 force_w => 100,
1022 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1033 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1023 tooltip => "This is the size of the portion of the map update the server sends you. " 1034 tooltip => "This is the size of the portion of the map update the server sends you. "
1024 . "If you set this to a high value you will be able to see further, " 1035 . "If you set this to a high value you will be able to see further, "
1025 . "but you also increase bandwidth requirements and latency. " 1036 . "but you also increase bandwidth requirements and latency. "
1026 . "This option is only used once at log-in.", 1037 . "This option is only used once at log-in.",
1027 on_changed => sub { 1038 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1028 my ($self, $value) = @_;
1029
1030 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1031 },
1032 ); 1039 );
1033 1040
1034 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1041 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1035 $table->add (1, 8, new CFClient::UI::CheckBox 1042 $table->add (1, 8, new CFPlus::UI::CheckBox
1036 state => $CFG->{face_prefetch}, 1043 state => $CFG->{face_prefetch},
1037 tooltip => "<b>Background Image Prefetch</b>\n\n" 1044 tooltip => "<b>Background Image Prefetch</b>\n\n"
1038 . "If enabled, the client automatically pre-fetches images from the server. " 1045 . "If enabled, the client automatically pre-fetches images from the server. "
1039 . "This might increase or create lag, but increases the chances " 1046 . "This might increase or create lag, but increases the chances "
1040 . "of faces being ready for display when you encounter them. " 1047 . "of faces being ready for display when you encounter them. "
1041 . "It also uses up server bandwidth on every connect, " 1048 . "It also uses up server bandwidth on every connect, "
1042 . "so only set it if you really need to prefetch images. " 1049 . "so only set it if you really need to prefetch images. "
1043 . "This option can be set and unset any time.", 1050 . "This option can be set and unset any time.",
1044 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1051 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1045 ); 1052 );
1046 1053
1047 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1054 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1048 $table->add (1, 9, new CFClient::UI::Entry 1055 $table->add (1, 9, new CFPlus::UI::Entry
1049 text => $CFG->{output_count}, 1056 text => $CFG->{output_count},
1050 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1057 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1051 on_changed => sub { $CFG->{output_count} = $_[1] }, 1058 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1052 ); 1059 );
1053 1060
1054 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1061 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1055 $table->add (1, 10, new CFClient::UI::Entry 1062 $table->add (1, 10, new CFPlus::UI::Entry
1056 text => $CFG->{output_sync}, 1063 text => $CFG->{output_sync},
1057 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1064 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1058 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1065 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1059 ); 1066 );
1060 1067
1061 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1068 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1062 expand => 1, 1069 expand => 1,
1063 align => 0, 1070 align => 0,
1064 text => "Login", 1071 text => "Login",
1065 on_activate => sub { 1072 on_activate => sub {
1066 $CONN ? stop_game 1073 $CONN ? stop_game
1067 : start_game; 1074 : start_game;
1075 0
1068 }, 1076 },
1069 ); 1077 );
1070 1078
1071 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1079 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1072 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1080 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1073 text => $CFG->{say_command}, 1081 text => $CFG->{say_command},
1074 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1082 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1075 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1083 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1076 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1084 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1077 on_changed => sub { 1085 on_changed => sub {
1078 my ($self, $value) = @_; 1086 my ($self, $value) = @_;
1079 $CFG->{say_command} = $value; 1087 $CFG->{say_command} = $value;
1088 0
1080 } 1089 }
1081 ); 1090 );
1082 1091
1092 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1093 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1094 state => $CFG->{show_tips},
1095 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1096 on_changed => sub {
1097 my ($self, $value) = @_;
1098 $CFG->{show_tips} = $value;
1099 0
1100 }
1101 );
1102
1083 $vbox->add (new CFClient::UI::Label 1103 $vbox->add (new CFPlus::UI::FancyFrame
1084 text => "Server Info", 1104 label => "Server Info",
1085 fontsize => 1.2,
1086 padding_y => 8,
1087 fg => [1, 1, 0, 1],
1088 );
1089
1090 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1105 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1106 );
1091 1107
1092 $vbox 1108 $vbox
1093} 1109}
1094 1110
1095sub message_window { 1111sub message_window {
1096 my $window = new CFClient::UI::FancyFrame 1112 my $window = new CFPlus::UI::Toplevel
1097 name => "message_window", 1113 name => "message_window",
1098 title => "Messages", 1114 title => "Messages",
1099 border_bg => [1, 1, 1, 1], 1115 border_bg => [1, 1, 1, 1],
1100 bg => [0, 0, 0, 0.75],
1101 x => "max", 1116 x => "max",
1102 y => 0, 1117 y => 0,
1103 force_w => $::WIDTH * 0.4, 1118 force_w => $::WIDTH * 0.4,
1104 force_h => $::HEIGHT * 0.5, 1119 force_h => $::HEIGHT * 0.5,
1105 child => (my $vbox = new CFClient::UI::VBox); 1120 child => (my $vbox = new CFPlus::UI::VBox),
1121 has_close_button => 1;
1106 1122
1107 $vbox->add ($LOGVIEW); 1123 $vbox->add ($LOGVIEW);
1108 1124
1109 $vbox->add (my $input = new CFClient::UI::Entry 1125 $vbox->add (my $input = new CFPlus::UI::Entry
1110 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1126 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1111 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1127 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1112 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1128 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1113 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1129 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1114 on_focus_in => sub { 1130 on_focus_in => sub {
1118 1134
1119 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1135 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1120 $input->{refocus_map} = 1; 1136 $input->{refocus_map} = 1;
1121 } 1137 }
1122 delete $input->{auto_activated}; 1138 delete $input->{auto_activated};
1139
1140 0
1123 }, 1141 },
1124 on_activate => sub { 1142 on_activate => sub {
1125 my ($input, $text) = @_; 1143 my ($input, $text) = @_;
1126 $input->set_text (''); 1144 $input->set_text ('');
1127 1145
1133 } 1151 }
1134 if ($input->{refocus_map}) { 1152 if ($input->{refocus_map}) {
1135 delete $input->{refocus_map}; 1153 delete $input->{refocus_map};
1136 $MAPWIDGET->focus_in 1154 $MAPWIDGET->focus_in
1137 } 1155 }
1156
1157 0
1138 }, 1158 },
1139 on_escape => sub { 1159 on_escape => sub {
1140 $MAPWIDGET->focus_in 1160 $MAPWIDGET->grab_focus;
1161
1162 0
1141 }, 1163 },
1142 ); 1164 );
1143 1165
1144 $CONSOLE = { 1166 $CONSOLE = {
1145 window => $window, 1167 window => $window,
1147 }; 1169 };
1148 1170
1149 $window 1171 $window
1150} 1172}
1151 1173
1152sub open_quit_dialog {
1153 unless ($QUIT_DIALOG) {
1154 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1155 x => "center",
1156 y => "center",
1157 z => 50,
1158 title => "Really Quit?",
1159 ;
1160
1161 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1162
1163 $vb->add (new CFClient::UI::Label
1164 text => "You should find a savebed and apply it first!",
1165 max_w => $WIDTH * 0.25,
1166 ellipsize => 0,
1167 );
1168 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1169 $hb->add (new CFClient::UI::Button
1170 text => "Ok",
1171 expand => 1,
1172 on_activate => sub { $QUIT_DIALOG->hide },
1173 );
1174 $hb->add (new CFClient::UI::Button
1175 text => "Quit anyway",
1176 expand => 1,
1177 on_activate => sub { exit },
1178 );
1179 }
1180
1181 $QUIT_DIALOG->show;
1182}
1183
1184sub autopickup_setup { 1174sub autopickup_setup {
1185 my $table = new CFClient::UI::Table; 1175 my $table = new CFPlus::UI::Table;
1186 1176
1187 for ( 1177 for (
1188 ["General", 0, 0, 1178 ["General", 0, 0,
1189 ["Enable autopickup" => PICKUP_NEWMODE], 1179 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1190 ["Inhibit autopickup" => PICKUP_INHIBIT], 1180 ["Inhibit autopickup" => PICKUP_INHIBIT],
1191 ["Stop before pickup" => PICKUP_STOP], 1181 ["Stop before pickup" => PICKUP_STOP],
1192 ["Debug autopickup" => PICKUP_DEBUG], 1182 ["Debug autopickup" => PICKUP_DEBUG],
1193 ], 1183 ],
1194 ["Weapons", 0, 6, 1184 ["Weapons", 0, 6,
1204 ["Boots" => PICKUP_BOOTS], 1194 ["Boots" => PICKUP_BOOTS],
1205 ["Gloves" => PICKUP_GLOVES], 1195 ["Gloves" => PICKUP_GLOVES],
1206 ["Cloaks" => PICKUP_CLOAK], 1196 ["Cloaks" => PICKUP_CLOAK],
1207 ], 1197 ],
1208 1198
1209 ["Readables", 2, 2, 1199 ["Readables", 2, 0,
1210 ["Spellbooks" => PICKUP_SPELLBOOK], 1200 ["Spellbooks" => PICKUP_SPELLBOOK],
1211 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1201 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1212 ["Normal Books/Scrolls" => PICKUP_READABLES], 1202 ["Normal Books/Scrolls" => PICKUP_READABLES],
1213 ], 1203 ],
1214 ["Misc", 2, 7, 1204 ["Misc", 2, 5,
1215 ["Food" => PICKUP_FOOD], 1205 ["Food" => PICKUP_FOOD],
1216 ["Drinks" => PICKUP_DRINK], 1206 ["Drinks" => PICKUP_DRINK],
1217 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1207 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1218 ["Keys" => PICKUP_KEY], 1208 ["Keys" => PICKUP_KEY],
1219 ["Magical Items" => PICKUP_MAGICAL], 1209 ["Magical Items" => PICKUP_MAGICAL],
1220 ["Potions" => PICKUP_POTION], 1210 ["Potions" => PICKUP_POTION],
1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1211 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1222 ["Ignore cursed" => PICKUP_NOT_CURSED], 1212 ["Ignore cursed" => PICKUP_NOT_CURSED],
1223 ["Jewelery" => PICKUP_JEWELS], 1213 ["Jewelery" => PICKUP_JEWELS],
1214 ["Flesh" => PICKUP_FLESH],
1224 ], 1215 ],
1225 ["Weight/Value ratio", 2, 17] 1216 ["Weight/Value ratio", 2, 17]
1226 ) 1217 )
1227 { 1218 {
1228 my ($title, $x, $y, @bits) = @$_; 1219 my ($title, $x, $y, @bits) = @$_;
1229 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1220 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1230 1221
1231 for (@bits) { 1222 for (@bits) {
1232 ++$y; 1223 ++$y;
1233 1224
1234 my $mask = $_->[1]; 1225 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1226 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1227 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1237 state => $CFG->{pickup} & $mask, 1228 state => $::CFG->{pickup} & $mask,
1238 on_changed => sub { 1229 on_changed => sub {
1239 my ($box, $value) = @_; 1230 my ($box, $value) = @_;
1240 1231
1241 if ($value) { 1232 if ($value) {
1242 $::CFG->{pickup} |= $mask; 1233 $::CFG->{pickup} |= $mask;
1244 $::CFG->{pickup} &= ~$mask; 1235 $::CFG->{pickup} &= ~$mask;
1245 } 1236 }
1246 1237
1247 $::CONN->send_command ("pickup $::CFG->{pickup}") 1238 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN; 1239 if defined $::CONN;
1240
1241 0
1249 }); 1242 });
1243
1244 ${$_->[2]} = $checkbox if $_->[2];
1250 } 1245 }
1251 } 1246 }
1252 1247
1253 $table->add (2, 18, new CFClient::UI::ValSlider 1248 $table->add (2, 18, new CFPlus::UI::ValSlider
1254 range => [0, 0, 16, 1, 1], 1249 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1250 template => ">= 99",
1255 to_value => sub { ">= " . 5 * $_[0] }, 1251 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub { 1252 on_changed => sub {
1257 my ($slider, $value) = @_; 1253 my ($slider, $value) = @_;
1258 1254
1259 $::CFG->{pickup} &= ~0x7; 1255 $::CFG->{pickup} &= ~0xF;
1260 $::CFG->{pickup} |= int $value 1256 $::CFG->{pickup} |= int $value
1261 if $value; 1257 if $value;
1262 1; 1258 1;
1263 }); 1259 });
1260
1264 $table->add (3, 18, new CFClient::UI::Button 1261 $table->add (3, 18, new CFPlus::UI::Button
1265 text => "set", 1262 text => "set",
1266 on_activate => sub { 1263 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}") 1264 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN; 1265 if defined $::CONN;
1269 1; 1266 0
1270 }); 1267 });
1271 1268
1272 $table 1269 $table
1273} 1270}
1274 1271
1272my %SORT_ORDER = (
1273 type => undef,
1274 mtime => sub {
1275 my $NOW = time;
1276 sort {
1277 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1278 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1279
1280 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1281 or $btime <=> $atime
1282 or $a->{type} <=> $b->{type}
1283 } @_
1284 },
1285 weight => sub { sort {
1286 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1287 or $a->{type} <=> $b->{type}
1288 } @_ },
1289);
1290
1275sub inventory_window { 1291sub inventory_widget {
1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1292 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1293
1294 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1295 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1296
1297 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1298
1299 use sort 'stable';
1300
1301 $hb1->add (new CFPlus::UI::Selector
1302 value => $::CFG->{inv_sort},
1303 options => [
1304 [type => "Type/Name"],
1305 [mtime => "Recent/Normal/Locked"],
1306 [weight => "Weight/Type"],
1307 ],
1308 on_changed => sub {
1309 $::CFG->{inv_sort} = $_[1];
1310 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1311 },
1312 );
1313 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1314 #TODO# update to weigh/maxweight
1315 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1316
1317 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1318 $sw1->add ($INV = new CFPlus::UI::Inventory);
1319 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1320
1321 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1322
1323 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1324
1325 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1326 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1327
1328 # XXX: Call after $INVR = ... because set_opencont sets the items
1329 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1330
1331 $hb
1332}
1333
1334sub toggle_player_page {
1335 my ($widget) = @_;
1336
1337 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1338 $PL_WINDOW->hide;
1339 } else {
1340 $PL_NOTEBOOK->set_current_page ($widget);
1341 $PL_WINDOW->show;
1342 }
1343}
1344
1345sub player_window {
1346 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1277 x => "center", 1347 x => "center",
1278 y => "center", 1348 y => "center",
1279 force_w => $WIDTH * 9/10, 1349 force_w => $WIDTH * 9/10,
1280 force_h => $HEIGHT * 9/10, 1350 force_h => $HEIGHT * 9/10,
1281 title => "Inventory", 1351 title => "Player",
1352 name => "playerbook",
1353 has_close_button => 1
1282 ; 1354 ;
1283 1355
1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1356 my $ntb =
1357 $PL_NOTEBOOK =
1358 new CFPlus::UI::Notebook expand => 1, debug => 1;
1285 1359
1286 $hb->add (my $vb1 = new CFClient::UI::VBox); 1360 $ntb->add (
1287 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1361 "Statistics (F2)" => $STATS_PAGE = stats_window,
1288 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1362 "Shows statistics, where all your Stats and Resistances are shown."
1363 );
1364 $ntb->add (
1365 "Skills (F3)" => $SKILL_PAGE = skill_window,
1366 "Shows all your Skills."
1367 );
1289 1368
1290 $hb->add (my $vb2 = new CFClient::UI::VBox); 1369 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1370 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1371 $ntb->add (
1372 "Spellbook (F4)" => $spellsw,
1373 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1374 );
1375 $ntb->add (
1376 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1377 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1378 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1379 );
1291 1380
1292 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1381 $ntb->set_current_page ($INVENTORY_PAGE);
1293 1382
1294 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1383 $plwin->add ($ntb);
1295 1384 $plwin
1296 # XXX: Call after $INVR = ... because set_opencont sets the items
1297 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1298
1299 $invwin
1300} 1385}
1301 1386
1302sub spell_setup { 1387sub update_bindings {
1303 new CFClient::UI::SpellList 1388 $BIND_UPD_CB->() if $BIND_UPD_CB;
1304} 1389}
1305 1390
1306sub keyboard_setup { 1391sub keyboard_setup {
1307 my $binding_list = new CFClient::UI::VBox; 1392 my $binding_list = new CFPlus::UI::VBox;
1308 1393
1309 my $refresh; 1394 my $refresh;
1310 $refresh = sub { 1395 $refresh = $BIND_UPD_CB = sub {
1311 $binding_list->clear (); 1396 $binding_list->clear ();
1312 1397
1398 return unless $PROFILE;
1399
1313 for my $mod (keys %{$::CFG->{bindings}}) { 1400 for my $mod (keys %{$PROFILE->{bindings}}) {
1314 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1401 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1315 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1402 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1403 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317 1404
1318 my $lbl = join "; ", @$cmds; 1405 my $lbl = join "; ", @$cmds;
1319 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1406 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1320 $binding_list->add (my $hb = new CFClient::UI::HBox); 1407 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1321 $hb->add (new CFClient::UI::Button 1408 $hb->add (new CFPlus::UI::Button
1322 text => "delete", 1409 text => "delete",
1323 tooltip => "Deletes the binding", 1410 tooltip => "Deletes the binding",
1324 on_activate => sub { 1411 on_activate => sub {
1325 $binding_list->remove ($hb); 1412 $binding_list->remove ($hb);
1326 delete $::CFG->{bindings}->{$mod}->{$sym}; 1413 delete $PROFILE->{bindings}{$mod}{$sym};
1414 0
1327 }); 1415 });
1328 1416
1329 $hb->add (new CFClient::UI::Button 1417 $hb->add (new CFPlus::UI::Button
1330 text => "edit", 1418 text => "edit",
1331 tooltip => "Edits the binding", 1419 tooltip => "Edits the binding",
1332 on_activate => sub { 1420 on_activate => sub {
1333 $::BIND_EDITOR->set_binding ( 1421 $::BIND_EDITOR->set_binding (
1334 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1422 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1335 sub { 1423 sub {
1336 my ($nmod, $nsym, $ncmds) = @_; 1424 my ($nmod, $nsym, $ncmds) = @_;
1337 delete $::CFG->{bindings}->{$mod}->{$sym}; 1425 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1338 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1426 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1339 $refresh->(); 1427 $refresh->();
1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1428 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1341 $SETUP_DIALOG->show; 1429 $SETUP_DIALOG->show;
1342 }, 1430 },
1343 sub { 1431 sub {
1344 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1432 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1345 $SETUP_DIALOG->show; 1433 $SETUP_DIALOG->show;
1346 }); 1434 });
1347 $::BIND_EDITOR->show; 1435 $::BIND_EDITOR->show;
1348 $SETUP_DIALOG->hide; 1436 $SETUP_DIALOG->hide;
1437 0
1349 }); 1438 });
1350 1439
1351 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1440 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1352 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1441 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1353 } 1442 }
1354 } 1443 }
1355 }; 1444 };
1356 1445
1357 my $vb = new CFClient::UI::VBox; 1446 my $vb = new CFPlus::UI::VBox;
1358 $vb->add ($binding_list); 1447 $vb->add (new CFPlus::UI::FancyFrame
1448 label => "Options",
1449 child => (my $hb = new CFPlus::UI::HBox),
1450 );
1451 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1452 $hb->add (new CFPlus::UI::CheckBox
1453 expand => 1,
1454 state => $CFG->{shift_fire_stop},
1455 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1456 on_changed => sub {
1457 my ($cbox, $value) = @_;
1458 $CFG->{shift_fire_stop} = $value;
1459 0
1460 });
1461
1462 $vb->add (new CFPlus::UI::FancyFrame
1463 label => "Bindings",
1464 child => $binding_list);
1359 $vb->add (my $hb = new CFClient::UI::HBox); 1465 $vb->add (my $hb = new CFPlus::UI::HBox);
1360 1466
1361 $hb->add (new CFClient::UI::Button 1467 $hb->add (new CFPlus::UI::Button
1362 text => "record new", 1468 text => "record new",
1363 expand => 1, 1469 expand => 1,
1364 tooltip => "This button opens the binding editor with an empty binding.", 1470 tooltip => "This button opens the binding editor with an empty binding.",
1365 on_activate => sub { 1471 on_activate => sub {
1366 $::BIND_EDITOR->set_binding (undef, undef, [], 1472 $::BIND_EDITOR->set_binding (undef, undef, [],
1367 sub { 1473 sub {
1368 my ($mod, $sym, $cmds) = @_; 1474 my ($mod, $sym, $cmds) = @_;
1369 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1475 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1370 $refresh->(); 1476 $refresh->();
1371 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1477 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1372 $SETUP_DIALOG->show; 1478 $SETUP_DIALOG->show;
1373 }, 1479 },
1374 sub { 1480 sub {
1376 $SETUP_DIALOG->show; 1482 $SETUP_DIALOG->show;
1377 }, 1483 },
1378 ); 1484 );
1379 $SETUP_DIALOG->hide; 1485 $SETUP_DIALOG->hide;
1380 $::BIND_EDITOR->show; 1486 $::BIND_EDITOR->show;
1487 0
1381 }, 1488 },
1382 ); 1489 );
1383 1490
1384 $hb->add (new CFClient::UI::Button 1491 $hb->add (new CFPlus::UI::Button
1385 text => "close", 1492 text => "close",
1386 tooltip => "Closes the binding window", 1493 tooltip => "Closes the binding window",
1387 expand => 1, 1494 expand => 1,
1388 on_activate => sub { 1495 on_activate => sub {
1389 $SETUP_DIALOG->hide; 1496 $SETUP_DIALOG->hide;
1497 0
1390 } 1498 }
1391 ); 1499 );
1392 1500
1393 $refresh->(); 1501 $refresh->();
1394 1502
1395 $vb 1503 $vb
1396} 1504}
1397 1505
1398sub help_window { 1506sub help_window {
1399 my $win = new CFClient::UI::FancyFrame 1507 my $win = new CFPlus::UI::Toplevel
1400 x => 'center', 1508 x => 'center',
1401 y => 'center', 1509 y => 'center',
1402 z => 2, 1510 z => 4,
1403 name => 'doc_browser', 1511 name => 'doc_browser',
1404 force_w => int $WIDTH * 7/8, 1512 force_w => int $WIDTH * 7/8,
1405 force_h => int $HEIGHT * 7/8, 1513 force_h => int $HEIGHT * 7/8,
1406 title => "Documentation"; 1514 title => "Help Browser",
1515 has_close_button => 1;
1407 1516
1408 $win->add (my $vbox = new CFClient::UI::VBox); 1517 $win->add (my $vbox = new CFPlus::UI::VBox);
1409 1518
1410 $vbox->add (my $buttons = new CFClient::UI::HBox); 1519 $vbox->add (new CFPlus::UI::FancyFrame
1520 label => "Navigation",
1521 child => (my $buttons = new CFPlus::UI::HBox),
1522 );
1411 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1523 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1412 expand => 1, fontsize => 0.8, padding_x => 4); 1524 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1413 1525
1414 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1526 my @history;
1415 $buttons->add (my $combo = new CFClient::UI::Combobox 1527 my @future;
1416 value => undef, 1528 my $curnode;
1417 options => [ 1529
1418 [intro => "Introduction"], 1530 my $load_node; $load_node = sub {
1419 [manual => "Manual"], 1531 my ($node, $para) = @_;
1420 [skill_help => "Skills"], 1532
1421 [command_help => "Commands"], 1533 $buttons->clear;
1422 [dmcommand_help => "DM Commands"], 1534
1423 [COPYING => "License Terms"], 1535 $buttons->add (new CFPlus::UI::Button
1536 text => "⇤",
1537 tooltip => "back to the starting page",
1538 on_activate => sub {
1539 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1540 unshift @future, @history;
1541 @history = ();
1542 $load_node->(@{shift @future});
1543 },
1544 );
1545
1546 if (@history) {
1547 $buttons->add (new CFPlus::UI::Button
1548 text => "⋘",
1549 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1550 on_activate => sub {
1551 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1552 $load_node->(@{pop @history});
1553 },
1554 );
1424 ], 1555 }
1425 on_changed => sub {
1426 my ($self, $pod) = @_;
1427 1556
1428 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1557 if (@future) {
1429 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1558 $buttons->add (new CFPlus::UI::Button
1559 text => "⋙",
1560 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1561 on_activate => sub {
1562 push @history, [$curnode, $viewer->current_paragraph];
1563 $load_node->(@{shift @future});
1564 },
1565 );
1566 }
1430 1567
1568 $buttons->add (new CFPlus::UI::Label text => " ");
1569
1570 my @path = CFPlus::Pod::full_path_of $node;
1571 pop @path; # drop current node
1572
1573 for my $node (@path) {
1574 $buttons->add (new CFPlus::UI::Button
1575 text => $node->{kw}[0],
1576 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1577 on_activate => sub {
1578 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1579 $load_node->($node);
1580 },
1581 );
1582 $buttons->add (new CFPlus::UI::Label text => "/");
1583 }
1584
1585 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1586
1587 $curnode = $node;
1588
1431 $viewer->clear; 1589 $viewer->clear;
1590 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1591 $viewer->scroll_to ($para);
1592 };
1593
1594 $load_node->(CFPlus::Pod::find pod => "mainpage");
1595
1596 $CFPlus::Pod::goto_document = sub {
1597 my (@path) = @_;
1598
1599 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1600
1601 $load_node->((CFPlus::Pod::find @path)[0]);
1602 $win->show;
1603 };
1604
1605 $win
1606}
1607
1608sub open_string_query {
1609 my ($title, $cb, $txt, $tooltip) = @_;
1610 my $dialog = new CFPlus::UI::Toplevel
1611 x => "center",
1612 y => "center",
1613 z => 50,
1614 force_w => $WIDTH * 4/5,
1615 title => $title;
1616
1617 $dialog->add (
1618 my $e = new CFPlus::UI::Entry
1619 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1620 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1621 tooltip => $tooltip
1622 );
1623
1624 $e->grab_focus;
1625 $e->set_text ($txt) if $txt;
1626 $dialog->show;
1627}
1628
1629sub open_quit_dialog {
1630 unless ($QUIT_DIALOG) {
1631 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1632 x => "center",
1633 y => "center",
1634 z => 50,
1635 title => "Really Quit?",
1636 on_key_down => sub {
1637 my ($dialog, $ev) = @_;
1638 $ev->{sym} == 27 and $dialog->hide;
1432 1639 }
1433 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1640 ;
1434 for @$pom;
1435 1641
1436 $viewer->set_offset (0); 1642 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1643
1644 $vb->add (new CFPlus::UI::Label
1645 text => "You should find a savebed and apply it first!",
1646 max_w => $WIDTH * 0.25,
1647 ellipsize => 0,
1648 );
1649 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1650 $hb->add (new CFPlus::UI::Button
1651 text => "Ok",
1652 expand => 1,
1653 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1654 );
1655 $hb->add (new CFPlus::UI::Button
1656 text => "Quit anyway",
1657 expand => 1,
1658 on_activate => sub { exit },
1659 );
1660 }
1661
1662 $QUIT_DIALOG->show;
1663 $QUIT_DIALOG->grab_focus;
1664}
1665
1666sub show_tip_of_the_day {
1667 # find all tips
1668 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1669
1670 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1671 $todindex = 0 if $todindex >= @tod;
1672 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1673
1674 # create dialog
1675 my $dialog;
1676
1677 my $close = sub {
1678 $dialog->destroy;
1679 };
1680
1681 $dialog = new CFPlus::UI::Toplevel
1682 x => "center",
1683 y => "center",
1684 z => 3,
1685 name => 'tip_of_the_day',
1686 force_w => int $WIDTH * 4/9,
1687 force_h => int $WIDTH * 2/9,
1688 title => "Tip of the day #" . (1 + $todindex),
1689 child => my $vbox = new CFPlus::UI::VBox,
1690 has_close_button => 1,
1691 on_delete => $close,
1692 ;
1693
1694 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1696 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697
1698 $vbox->add (my $table = new CFPlus::UI::Table);
1699
1700 $table->add (0, 0, new CFPlus::UI::Button
1701 text => "Close",
1702 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1703 on_activate => $close,
1704 );
1705
1706 $table->add (2, 0, new CFPlus::UI::Button
1707 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub {
1710 $close->();
1711 &show_tip_of_the_day;
1437 }, 1712 },
1438 on_visibility_change => sub {
1439 my ($self, $visible) = @_;
1440 return unless $visible;
1441 return if $self->{value};
1442 $self->set_value ("intro");
1443 },
1444 ); 1713 );
1445 1714
1446 $win 1715 $dialog->show;
1447} 1716}
1448 1717
1449sub sdl_init { 1718sub sdl_init {
1450 CFClient::SDL_Init 1719 CFPlus::SDL_Init
1451 and die "SDL::Init failed!\n"; 1720 and die "SDL::Init failed!\n";
1452} 1721}
1453 1722
1454sub video_init { 1723sub video_init {
1455 sdl_init; 1724 sdl_init;
1460 1729
1461 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1730 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1462 $FULLSCREEN = $CFG->{fullscreen}; 1731 $FULLSCREEN = $CFG->{fullscreen};
1463 $FAST = $CFG->{fast}; 1732 $FAST = $CFG->{fast};
1464 1733
1465 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1734 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1466 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1735 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1467 1736
1468 $SDL_ACTIVE = 1; 1737 $SDL_ACTIVE = 1;
1469 $LAST_REFRESH = time - 0.01; 1738 $LAST_REFRESH = time - 0.01;
1470 1739
1471 CFClient::OpenGL::init; 1740 CFPlus::OpenGL::init;
1472 1741
1473 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1742 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1474 1743
1475 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1744 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1476 1745
1477 ############################################################################# 1746 #############################################################################
1478 1747
1479 if ($DEBUG_STATUS) { 1748 if ($DEBUG_STATUS) {
1480 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1749 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1481 } else { 1750 } else {
1482 # create the widgets 1751 # create the widgets
1483 1752
1484 $DEBUG_STATUS = new CFClient::UI::Label 1753 $DEBUG_STATUS = new CFPlus::UI::Label
1485 padding => 0, 1754 padding => 0,
1486 z => 100, 1755 z => 100,
1487 force_x => "max", 1756 force_x => "max",
1488 force_y => 0; 1757 force_y => 0;
1489 $DEBUG_STATUS->show; 1758 $DEBUG_STATUS->show;
1490 1759
1491 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1760 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1492 1761
1493 $STATUSBOX = new CFClient::UI::Statusbox; 1762 $STATUSBOX = new CFPlus::UI::Statusbox;
1494 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1763 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1495 1764
1496 (new CFClient::UI::Frame 1765 (new CFPlus::UI::Frame
1497 bg => [0, 0, 0, 0.4], 1766 bg => [0, 0, 0, 0.4],
1498 force_x => 0, 1767 force_x => 0,
1499 force_y => "max", 1768 force_y => "max",
1500 child => $STATUSBOX, 1769 child => $STATUSBOX,
1501 )->show; 1770 )->show;
1502 1771
1503 CFClient::UI::FancyFrame->new ( 1772 CFPlus::UI::Toplevel->new (
1504 title => "Map", 1773 title => "Map",
1505 name => "mapmap", 1774 name => "mapmap",
1506 x => 0, 1775 x => 0,
1507 y => $FONTSIZE + 8, 1776 y => $FONTSIZE + 8,
1508 border_bg => [1, 1, 1, 192/255], 1777 border_bg => [1, 1, 1, 192/255],
1509 bg => [1, 1, 1, 0], 1778 bg => [1, 1, 1, 0],
1510 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1779 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1511 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1780 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1512 ), 1781 ),
1513 )->show; 1782 )->show;
1514 1783
1515 $MAPWIDGET = new CFClient::MapWidget; 1784 $MAPWIDGET = new CFPlus::MapWidget;
1516 $MAPWIDGET->connect (activate_console => sub { 1785 $MAPWIDGET->connect (activate_console => sub {
1517 my ($mapwidget, $preset) = @_; 1786 my ($mapwidget, $preset) = @_;
1518 1787
1519 if ($CONSOLE) { 1788 if ($CONSOLE) {
1520 $CONSOLE->{input}->{auto_activated} = 1; 1789 $CONSOLE->{input}->{auto_activated} = 1;
1521 $CONSOLE->{input}->focus_in; 1790 $CONSOLE->{input}->grab_focus;
1522 1791
1523 if ($preset && $CONSOLE->{input}->get_text eq '') { 1792 if ($preset && $CONSOLE->{input}->get_text eq '') {
1524 $CONSOLE->{input}->set_text ($preset); 1793 $CONSOLE->{input}->set_text ($preset);
1525 } 1794 }
1526 } 1795 }
1527 }); 1796 });
1528 $MAPWIDGET->show; 1797 $MAPWIDGET->show;
1529 $MAPWIDGET->focus_in; 1798 $MAPWIDGET->grab_focus;
1530 1799
1531 $LOGVIEW = new CFClient::UI::TextScroller 1800 $LOGVIEW = new CFPlus::UI::TextScroller
1532 expand => 1, 1801 expand => 1,
1533 font => $FONT_FIXED, 1802 font => $FONT_FIXED,
1534 fontsize => $::CFG->{log_fontsize}, 1803 fontsize => $::CFG->{log_fontsize},
1535 indent => -4, 1804 indent => -4,
1536 can_hover => 1, 1805 can_hover => 1,
1537 can_events => 1, 1806 can_events => 1,
1538 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1807 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1539 ; 1808 ;
1540 1809
1541 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1810 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1542 title => "Setup", 1811 title => "Setup",
1543 name => "setup_dialog", 1812 name => "setup_dialog",
1544 x => 'center', 1813 x => 'center',
1545 y => 'center', 1814 y => 'center',
1546 z => 2, 1815 z => 2,
1547 force_w => $::WIDTH * 0.6, 1816 force_w => $::WIDTH * 0.6,
1548 force_h => $::HEIGHT * 0.6, 1817 force_h => $::HEIGHT * 0.6,
1818 has_close_button => 1,
1549 ; 1819 ;
1550 1820
1821 $METASERVER = metaserver_dialog;
1822
1551 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1823 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1552 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1824 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1553 1825
1554 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1826 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1555 "Configure the server to play on, your username, password and other server-related options."); 1827 "Configure the server to play on, your username, password and other server-related options.");
1556 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1828 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1557 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1829 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1558 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1830 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1559 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1831 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1560 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1832 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1561 "Configure the use of audio, sound effects and background music."); 1833 "Configure the use of audio, sound effects and background music.");
1562 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1834 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1563 "Lets you define, edit and delete bindings." 1835 "Lets you define, edit and delete key bindings."
1564 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1836 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1565 . "with nothing set and the recording started. After doing the actions you " 1837 . "with nothing set and the recording started. After doing the actions you "
1566 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1838 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1567 . "After pressing the combo the binding will be saved automatically and the " 1839 . "After pressing the combo the binding will be saved automatically and the "
1568 . "binding editor closes"); 1840 . "binding editor closes");
1569 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1570 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1571 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1841 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1572 "Some debuggign options. Do not ask."); 1842 "Some debuggin' options. Do not ask.");
1573 1843
1574 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1844 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1575 1845
1576 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1846 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1577 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1847 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1578 1848
1579 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1849 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1580 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1850 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1581 1851
1582 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1852 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1583 1853
1584 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1585 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1586 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1587 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1855 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1588 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1589 1856
1590 $BUTTONBAR->add (new CFClient::UI::Button 1857 $BUTTONBAR->add (new CFPlus::UI::Button
1591 text => "Save Config", 1858 text => "Save Config",
1592 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1859 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1593 on_activate => sub { 1860 on_activate => sub {
1594 $::CFG->{layout} = CFClient::UI::get_layout; 1861 $::CFG->{layout} = CFPlus::UI::get_layout;
1595 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1862 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1596 status "Configuration Saved"; 1863 status "Configuration Saved";
1864 0
1597 }, 1865 },
1598 ); 1866 );
1599 1867
1600 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1868 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1601 tooltip => "View Documentation"); 1869 tooltip => "View Documentation");
1602 1870
1871
1603 $BUTTONBAR->add (new CFClient::UI::Button 1872 $BUTTONBAR->add (new CFPlus::UI::Button
1604 text => "Quit", 1873 text => "Quit",
1605 tooltip => "Terminates the program", 1874 tooltip => "Terminates the program",
1606 on_activate => sub { 1875 on_activate => sub {
1607 if ($CONN) { 1876 if ($CONN) {
1608 open_quit_dialog; 1877 open_quit_dialog;
1609 } else { 1878 } else {
1610 exit; 1879 exit;
1611 } 1880 }
1881 0
1612 }, 1882 },
1613 ); 1883 );
1614 1884
1615 $BUTTONBAR->show; 1885 $BUTTONBAR->show;
1616 $SETUP_DIALOG->show; 1886 $SETUP_DIALOG->show;
1617 } 1887 }
1618 1888
1619 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1889 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1620} 1890}
1621 1891
1892sub setup_build_button {
1893 my ($enabled) = @_;
1894 if ($enabled) {
1895 $BUILD_BUTTON ||= new CFPlus::UI::Button
1896 text => "Build",
1897 tooltip => "Opens the ingame builder",
1898 on_activate => sub {
1899 if ($CONN) {
1900 $CONN->send_ext_req (builder_player_items => sub {
1901 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1902 });
1903 }
1904 0
1905 };
1906 $BUTTONBAR->add ($BUILD_BUTTON);
1907 } else {
1908 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1909 }
1910}
1911
1912sub open_ingame_editor {
1913 my ($msg) = @_;
1914
1915 my $win = new CFPlus::UI::Toplevel
1916 x => 0,
1917 y => 'center',
1918 z => 4,
1919 name => 'builder_window',
1920 force_w => int $WIDTH * 1/4,
1921 force_h => int $HEIGHT * 3/4,
1922 title => "In game builder",
1923 has_close_button => 1;
1924
1925 my $r = new CFPlus::UI::ScrolledWindow (
1926 expand => 1,
1927 scroll_y => 1
1928 );
1929 $r->add (my $vb = new CFPlus::UI::VBox);
1930 $win->add ($r);
1931
1932
1933 $vb->add (
1934 new CFPlus::UI::Button
1935 text => "Disable build mode",
1936 on_activate => sub { $::IN_BUILD_MODE = undef }
1937 );
1938 $vb->add (
1939 new CFPlus::UI::Button
1940 text => "ERASE",
1941 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1942 );
1943
1944 for my $itemarchname (
1945 sort {
1946 $msg->{items}->{$a}->{build_arch_name}
1947 cmp $msg->{items}->{$b}->{build_arch_name}
1948 } keys %{$msg->{items}}
1949 ) {
1950 my $info = $msg->{items}->{$itemarchname};
1951 $vb->add (
1952 new CFPlus::UI::Button text => $info->{build_arch_name},
1953 on_activate => sub {
1954 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1955
1956 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1957 build_mode_query_arch_info ();
1958 }
1959 }
1960 );
1961 }
1962
1963 $win->show;
1964}
1965
1966sub build_mode_query_arch_info {
1967 my ($iteminfo) = $::IN_BUILD_MODE;
1968 my $itemarchname = $iteminfo->{item};
1969 my $info = $iteminfo->{info};
1970
1971 my $dialog = new CFPlus::UI::Toplevel
1972 x => "center",
1973 y => "center",
1974 z => 50,
1975 force_w => int $WIDTH * 1/2,
1976 title => "Enter information for placement of '$itemarchname'",
1977 has_close_button => 1;
1978
1979 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1980
1981 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1982 my $row = 0;
1983 if ($info->{has_name}) {
1984 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1985 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1986 }
1987 if ($info->{has_text}) {
1988 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1989 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1990 }
1991 if ($info->{has_connection}) {
1992 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1993 $table->add (1, $row++,
1994 new CFPlus::UI::Entry
1995 expand => 1,
1996 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1997 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1998 );
1999 }
2000
2001 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2002 $hb->add (new CFPlus::UI::Button
2003 text => "Close",
2004 expand => 1,
2005 on_activate => sub { $dialog->hide; 0 },
2006 );
2007 $dialog->show;
2008}
2009
1622sub video_shutdown { 2010sub video_shutdown {
2011 CFPlus::OpenGL::shutdown;
2012
1623 undef $SDL_ACTIVE; 2013 undef $SDL_ACTIVE;
1624} 2014}
1625 2015
1626my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 2016my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1627my $bgmusic;#TODO#hack#d# 2017my $bgmusic;#TODO#hack#d#
1634 2024
1635sub audio_music_finished { 2025sub audio_music_finished {
1636 return unless $CFG->{bgm_enable}; 2026 return unless $CFG->{bgm_enable};
1637 2027
1638 # TODO: hack, do play loop and mood music 2028 # TODO: hack, do play loop and mood music
1639 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 2029 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1640 $bgmusic->play (0); 2030 $bgmusic->play (0);
1641 2031
1642 push @bgmusic, shift @bgmusic; 2032 push @bgmusic, shift @bgmusic;
1643} 2033}
1644 2034
1645sub audio_init { 2035sub audio_init {
1646 if ($CFG->{audio_enable}) { 2036 if ($CFG->{audio_enable}) {
1647 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2037 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1648 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2038 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1649 2039
1650 unless ($SDL_MIXER) { 2040 unless ($SDL_MIXER) {
1651 status "Unable to open sound device: there will be no sound"; 2041 status "Unable to open sound device: there will be no sound";
1652 return; 2042 return;
1653 } 2043 }
1654 2044
1655 CFClient::Mix_AllocateChannels 8; 2045 CFPlus::Mix_AllocateChannels 8;
1656 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2046 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1657 2047
1658 audio_music_finished; 2048 audio_music_finished;
1659 2049
2050 local $_;
1660 while (<$fh>) { 2051 while (<$fh>) {
1661 next if /^\s*#/; 2052 next if /^\s*#/;
1662 next if /^\s*$/; 2053 next if /^\s*$/;
1663 2054
1664 my ($file, $volume, $event) = split /\s+/, $_, 3; 2055 my ($file, $volume, $event) = split /\s+/, $_, 3;
1665 2056
1666 push @SOUNDS, "$volume,$file"; 2057 push @SOUNDS, "$volume,$file";
1667 2058
1668 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2059 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1669 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 2060 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1670 $chunk->volume ($volume * 128 / 100); 2061 $chunk->volume ($volume * 128 / 100);
1671 $chunk 2062 $chunk
1672 }; 2063 };
1673 } 2064 }
1674 } else { 2065 } else {
1676 } 2067 }
1677 } 2068 }
1678} 2069}
1679 2070
1680sub audio_shutdown { 2071sub audio_shutdown {
1681 CFClient::Mix_CloseAudio if $SDL_MIXER; 2072 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1682 undef $SDL_MIXER; 2073 undef $SDL_MIXER;
1683 @SOUNDS = (); 2074 @SOUNDS = ();
1684 %AUDIO_CHUNKS = (); 2075 %AUDIO_CHUNKS = ();
1685} 2076}
1686 2077
1693 2084
1694sub force_refresh { 2085sub force_refresh {
1695 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2086 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1696 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2087 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1697 2088
1698 $CFClient::UI::ROOT->draw; 2089 $CFPlus::UI::ROOT->draw;
1699 2090
1700 $WANT_REFRESH = 0; 2091 $WANT_REFRESH = 0;
1701 $CAN_REFRESH = 0; 2092 $CAN_REFRESH = 0;
1702 $LAST_REFRESH = $NOW; 2093 $LAST_REFRESH = $NOW;
1703 2094
17040 && do {
1705 # some weird model-drawing code, just a joke right now
1706 use CFClient::OpenGL;
1707
1708 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1709 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1710 $demo{r} ||= do {
1711 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1712 $mod->{v} = pack "f*", @{$mod->{v}};
1713 $_ = [scalar @$_, pack "S!*", @$_]
1714 for values %{$mod->{g}};
1715 $mod
1716 };
1717
1718 my $r = $demo{r} or die;
1719
1720 glDepthMask 1;
1721 glClear GL_DEPTH_BUFFER_BIT;
1722 glEnable GL_TEXTURE_2D;
1723 glEnable GL_DEPTH_TEST;
1724 glEnable GL_CULL_FACE;
1725 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1726
1727 glMatrixMode GL_PROJECTION;
1728 glLoadIdentity;
1729 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1730 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1731 glMatrixMode GL_MODELVIEW;
1732 glLoadIdentity;
1733
1734 glPushMatrix;
1735 glTranslate 0, 0, -800;
1736 glScale 1, -1, 1;
1737 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1738 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1739 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1740 glScale 50, 50, 50;
1741
1742 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1743 while (my ($k, $v) = each %{$r->{g}}) {
1744 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1745 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1746 }
1747
1748 glPopMatrix;
1749
1750 glShadeModel GL_FLAT;
1751 glDisable GL_DEPTH_TEST;
1752 glDisable GL_TEXTURE_2D;
1753 glDepthMask 0;
1754
1755 $WANT_REFRESH++;
1756};
1757
1758 CFClient::SDL_GL_SwapBuffers; 2095 CFPlus::SDL_GL_SwapBuffers;
1759} 2096}
1760 2097
1761my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2098my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1762 $NOW = time; 2099 $NOW = time;
1763 2100
1764 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2101 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1765 for CFClient::SDL_PollEvent; 2102 for CFPlus::SDL_PollEvent;
1766 2103
1767 if (%animate_object) { 2104 if (%animate_object) {
1768 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2105 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1769 $WANT_REFRESH++; 2106 $WANT_REFRESH++;
1770 } 2107 }
1794 $CONN->face_prefetch 2131 $CONN->face_prefetch
1795 if $CONN; 2132 if $CONN;
1796}); 2133});
1797 2134
1798%SDL_CB = ( 2135%SDL_CB = (
1799 CFClient::SDL_QUIT => sub { 2136 CFPlus::SDL_QUIT => sub {
1800 Event::unloop -1; 2137 Event::unloop -1;
1801 }, 2138 },
1802 CFClient::SDL_VIDEORESIZE => sub { 2139 CFPlus::SDL_VIDEORESIZE => sub {
1803 }, 2140 },
1804 CFClient::SDL_VIDEOEXPOSE => sub { 2141 CFPlus::SDL_VIDEOEXPOSE => sub {
1805 CFClient::UI::full_refresh; 2142 CFPlus::UI::full_refresh;
1806 }, 2143 },
1807 CFClient::SDL_ACTIVEEVENT => sub { 2144 CFPlus::SDL_ACTIVEEVENT => sub {
1808# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2145# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1809 }, 2146 },
1810 CFClient::SDL_KEYDOWN => sub { 2147 CFPlus::SDL_KEYDOWN => sub {
1811 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2148 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1812 # alt-enter 2149 # alt-enter
2150 $FULLSCREEN_ENABLE->toggle;
1813 video_shutdown; 2151 video_shutdown;
1814 $CFG->{fullscreen} = !$CFG->{fullscreen};
1815 video_init; 2152 video_init;
1816 } else { 2153 } else {
1817 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2154 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1818 } 2155 }
1819 }, 2156 },
1820 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2157 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1821 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2158 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1822 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2159 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1823 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2160 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1824 CFClient::SDL_USEREVENT => sub { 2161 CFPlus::SDL_USEREVENT => sub {
1825 if ($_[0]{code} == 1) { 2162 if ($_[0]{code} == 1) {
1826 audio_channel_finished $_[0]{data1}; 2163 audio_channel_finished $_[0]{data1};
1827 } elsif ($_[0]{code} == 0) { 2164 } elsif ($_[0]{code} == 0) {
1828 audio_music_finished; 2165 audio_music_finished;
1829 } 2166 }
1833############################################################################# 2170#############################################################################
1834 2171
1835$SIG{INT} = $SIG{TERM} = sub { exit }; 2172$SIG{INT} = $SIG{TERM} = sub { exit };
1836 2173
1837{ 2174{
1838 local $SIG{__DIE__} = sub {
1839 return unless defined $^S && !$^S;
1840 Carp::confess $_[1];#d#TODO: remove when stable
1841 CFClient::fatal $_[0];
1842 };
1843
1844 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2175 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1845 CFClient::UI::set_layout ($::CFG->{layout}); 2176 CFPlus::UI::set_layout ($::CFG->{layout});
1846 2177
1847 my %DEF_CFG = ( 2178 my %DEF_CFG = (
1848 sdl_mode => 0, 2179 sdl_mode => 0,
1849 width => 640, 2180 width => 640,
1850 height => 480, 2181 height => 480,
1851 fullscreen => 0, 2182 fullscreen => 0,
1852 fast => 0, 2183 fast => 0,
1853 map_scale => 1, 2184 map_scale => 1,
1854 fow_enable => 1, 2185 fow_enable => 1,
1855 fow_intensity => 0.45, 2186 fow_intensity => 0.45,
1856 fow_smooth => 0, 2187 fow_smooth => 0,
1857 gui_fontsize => 1, 2188 gui_fontsize => 1,
1858 log_fontsize => 0.7, 2189 log_fontsize => 0.7,
1859 gauge_fontsize=> 1, 2190 gauge_fontsize => 1,
1860 gauge_size => 0.35, 2191 gauge_size => 0.35,
1861 stat_fontsize => 0.7, 2192 stat_fontsize => 0.7,
1862 mapsize => 100, 2193 mapsize => 100,
1863 host => "crossfire.schmorp.de",
1864 say_command => 'say', 2194 say_command => 'chat',
1865 audio_enable => 1, 2195 audio_enable => 1,
1866 bgm_enable => 1, 2196 bgm_enable => 1,
1867 bgm_volume => 0.25, 2197 bgm_volume => 0.25,
1868 face_prefetch => 0, 2198 face_prefetch => 0,
1869 output_sync => 1, 2199 output_sync => 1,
1870 output_count => 1, 2200 output_count => 1,
1871 pickup => 0, 2201 pickup => 0,
2202 inv_sort => "mtime",
2203 default => "profile", # default profile
2204 show_tips => 1,
2205 );
1872 ); 2206
1873
1874 while (my ($k, $v) = each %DEF_CFG) { 2207 while (my ($k, $v) = each %DEF_CFG) {
1875 $CFG->{$k} = $v unless exists $CFG->{$k}; 2208 $CFG->{$k} = $v unless exists $CFG->{$k};
1876 } 2209 }
1877 2210
2211 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2212
1878 sdl_init; 2213 sdl_init;
1879 2214
1880 @SDL_MODES = reverse 2215 @SDL_MODES = reverse
1881 grep $_->[0] >= 640 && $_->[1] >= 480, 2216 grep $_->[0] >= 640 && $_->[1] >= 480,
1882 CFClient::SDL_ListModes; 2217 CFPlus::SDL_ListModes;
1883 2218
1884 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2219 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1885 2220
1886 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2221 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1887 2222
1888 { 2223 {
1889 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2224 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1890 DejaVuSans.ttf 2225 DejaVuSans.ttf
1891 DejaVuSansMono.ttf 2226 DejaVuSansMono.ttf
1892 DejaVuSans-Bold.ttf 2227 DejaVuSans-Bold.ttf
1893 DejaVuSansMono-Bold.ttf 2228 DejaVuSansMono-Bold.ttf
1894 DejaVuSans-Oblique.ttf 2229 DejaVuSans-Oblique.ttf
1895 DejaVuSansMono-Oblique.ttf 2230 DejaVuSansMono-Oblique.ttf
1896 DejaVuSans-BoldOblique.ttf 2231 DejaVuSans-BoldOblique.ttf
1897 DejaVuSansMono-BoldOblique.ttf 2232 DejaVuSansMono-BoldOblique.ttf
1898 ); 2233 );
1899 2234
1900 CFClient::add_font $_ for @fonts; 2235 CFPlus::add_font $_ for @fonts;
1901 2236
1902 CFClient::pango_init; 2237 CFPlus::pango_init;
1903 2238
1904 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2239 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1905 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2240 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1906 2241
1907 $FONT_PROP->make_default; 2242 $FONT_PROP->make_default;
1908 } 2243 }
1909 2244
1910# compare mono (ft) vs. rgba (cairo) 2245# compare mono (ft) vs. rgba (cairo)
1911# ft - 1.8s, cairo 3s, even in alpha-only mode 2246# ft - 1.8s, cairo 3s, even in alpha-only mode
1912# for my $rgba (0..1) { 2247# for my $rgba (0..1) {
1913# my $t1 = Time::HiRes::time; 2248# my $t1 = Time::HiRes::time;
1914# for (1..1000) { 2249# for (1..1000) {
1915# my $layout = CFClient::Layout->new ($rgba); 2250# my $layout = CFPlus::Layout->new ($rgba);
1916# $layout->set_text ("hallo" x 100); 2251# $layout->set_text ("hallo" x 100);
1917# $layout->render; 2252# $layout->render;
1918# } 2253# }
1919# my $t2 = Time::HiRes::time; 2254# my $t2 = Time::HiRes::time;
1920# warn $t2-$t1; 2255# warn $t2-$t1;
1921# } 2256# }
1922 2257
2258 $startup_done->();
2259
1923 video_init; 2260 video_init;
1924 audio_init; 2261 audio_init;
1925} 2262}
1926 2263
2264show_tip_of_the_day if $CFG->{show_tips};
2265
1927Event::loop; 2266Event::loop;
1928#CFClient::SDL_Quit; 2267#CFPlus::SDL_Quit;
1929#CFClient::_exit 0; 2268#CFPlus::_exit 0;
1930 2269
1931END { CFClient::SDL_Quit } 2270END { CFPlus::SDL_Quit }
1932 2271
1933=head1 NAME 2272=head1 NAME
1934 2273
1935cfplus - A Crossfire+ and Crossfire game client 2274cfplus - A Crossfire+ and Crossfire game client
1936 2275

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines