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.76 by root, Tue Jun 20 08:49:40 2006 UTC vs.
Revision 1.133 by root, Sun Dec 3 01:03:49 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines