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.95 by root, Sun Jul 16 23:30:08 2006 UTC vs.
Revision 1.121 by root, Sun Oct 1 18:17:38 2006 UTC

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

Diff Legend

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