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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines