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

Diff Legend

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