ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines