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.68 by elmex, Mon Jun 12 12:28:06 2006 UTC vs.
Revision 1.141 by elmex, Sat Dec 16 17:33:26 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines