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.77 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.142 by root, Mon Mar 12 22:23:09 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines