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.74 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.98 by root, Sat Jul 22 13:20:33 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
44 46
45$Event::DIED = sub { 47$Event::DIED = sub {
46 # TODO: display dialog box or so 48 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 49 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 50 CFClient::error $_[1];
… …
84our $CONSOLE; 86our $CONSOLE;
85our $METASERVER; 87our $METASERVER;
86our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 89our $QUIT_DIALOG;
88our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $FULLSCREEN_ENABLE;
92our $PICKUP_ENABLE;
89our $SERVER_INFO; 93our $SERVER_INFO;
90 94
91our $SETUP_DIALOG; 95our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 97our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 98our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 99
100our $PL_NOTEBOOK;
97our $STATS_WINDOW; 101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SKILL_PAGE;
106our $SPELL_PAGE;
107
108our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
99our $FLOORBOX; 110our $FLOORBOX;
100our $GAUGES; 111our $GAUGES;
101our $STATWIDS; 112our $STATWIDS;
102 113
… …
109 120
110our $ALT_ENTER_MESSAGE; 121our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 122our $STATUSBOX;
112our $DEBUG_STATUS; 123our $DEBUG_STATUS;
113 124
114our $INV_WINDOW;
115our $INV; 125our $INV;
116our $INVR; 126our $INVR;
117our $INV_RIGHT_HB; 127our $INV_RIGHT_HB;
118 128
119our $BIND_EDITOR; 129our $BIND_EDITOR;
130our $BIND_UPD_CB;
120 131
121our $PICKUP_CFG; 132our $PICKUP_CFG;
122 133
123sub status { 134sub status {
124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 135 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
178 $MESSAGE_WINDOW->show; 189 $MESSAGE_WINDOW->show;
179 190
180 unshift @dialog, new CFClient::UI::Label 191 unshift @dialog, new CFClient::UI::Label
181 max_w => $::WIDTH * 0.4, 192 max_w => $::WIDTH * 0.4,
182 ellipsise => 0, 193 ellipsise => 0,
183 markup => "\nOr use your keyboard:\n"; 194 markup => "\nOr use your keyboard and the text entry below:\n";
184 195
185 unshift @dialog, my $table = new CFClient::UI::Table; 196 unshift @dialog, my $table = new CFClient::UI::Table;
186 197
187 $table->add (0, 0, new CFClient::UI::Button 198 $table->add (0, 0, new CFClient::UI::Button
188 text => "Next Race", 199 text => "Next Race",
… …
205 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
206 ellipsise => 0, 217 ellipsise => 0,
207 markup => 218 markup =>
208 "<big><b>Character Creation: Race</b></big>\n\n" 219 "<big><b>Character Creation: Race</b></big>\n\n"
209 . "Look at the <b>Messages</b> window to see a description of this race " 220 . "Look at the <b>Messages</b> window to see a description of this race "
210 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
211 . "and the center of the screen to see how this race looks like " 221 . "and the center of the screen to see how this race looks like "
212 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n" 222 . "(<small>below this dialog window: you may need to move the dialog away and "
223 . "click into the display area to make it visible</small>).\n\n"
213 . "You can look at another race, or accept this race (you will come back to this race eventually, " 224 . "You can look at another race, or accept this race (you will cycle back to "
214 . "so you can take your time making this important choice." 225 . "this race eventually, so you can take your time making this important choice."
215 ; 226 ;
216 227
217 } elsif ($prompt =~ /roll new stats/) { 228 } elsif ($prompt =~ /roll new stats/) {
218 if (my $stat = delete $conn->{stat_change_with}) { 229 if (my $stat = delete $conn->{stat_change_with}) {
219 $conn->send ("reply $stat"); 230 $conn->send ("reply $stat");
220 destroy_query_dialog $conn; 231 destroy_query_dialog $conn;
221 return; 232 return;
222 } 233 }
223 234
224 $STATS_WINDOW->show; 235 $STATS_PAGE->show;
225 $MESSAGE_WINDOW->hide; 236 $MESSAGE_WINDOW->hide;
226 237
227 unshift @dialog, new CFClient::UI::Label 238 unshift @dialog, new CFClient::UI::Label
228 max_w => $::WIDTH * 0.4, 239 max_w => $::WIDTH * 0.4,
229 ellipsise => 0, 240 ellipsise => 0,
230 markup => "\nOr use your keyboard:\n"; 241 markup => "\nOr use your keyboard and the text entry below:\n";
231 242
232 unshift @dialog, my $table = new CFClient::UI::Table; 243 unshift @dialog, my $table = new CFClient::UI::Table;
233 244
234 # left: re-roll 245 # left: re-roll
235 $table->add (0, 0, new CFClient::UI::Button 246 $table->add (0, 0, new CFClient::UI::Button
… …
241 }, 252 },
242 ); 253 );
243 254
244 # center: swap stats 255 # center: swap stats
245 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 256 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
257 expand => 1,
246 value => $_, 258 value => $_,
247 options => [ 259 options => [
248 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 260 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
249 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 261 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
250 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 262 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
269 # right: accept 281 # right: accept
270 $table->add (4, 0, new CFClient::UI::Button 282 $table->add (4, 0, new CFClient::UI::Button
271 text => "Accept", 283 text => "Accept",
272 on_activate => sub { 284 on_activate => sub {
273 $conn->send ("reply n"); 285 $conn->send ("reply n");
274 $STATS_WINDOW->hide; 286 $STATS_PAGE->hide;
275 destroy_query_dialog $conn; 287 destroy_query_dialog $conn;
276 0 288 0
277 }, 289 },
278 ); 290 );
291
292 unshift @dialog, my $hbox = new CFClient::UI::HBox;
293 for (
294 [Str => CS_STAT_STR],
295 [Dex => CS_STAT_DEX],
296 [Con => CS_STAT_CON],
297 [Int => CS_STAT_INT],
298 [Wis => CS_STAT_WIS],
299 [Pow => CS_STAT_POW],
300 [Cha => CS_STAT_CHA],
301 ) {
302 my ($name, $id) = @$_;
303 $hbox->add (new CFClient::UI::Label
304 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
305 align => 0,
306 expand => 1,
307 can_events => 1,
308 can_hover => 1,
309 tooltip => $CFClient::STAT_TOOLTIP{$name},
310 );
311 }
279 312
280 unshift @dialog, new CFClient::UI::Label 313 unshift @dialog, new CFClient::UI::Label
281 max_w => $::WIDTH * 0.4, 314 max_w => $::WIDTH * 0.4,
282 ellipsise => 0, 315 ellipsise => 0,
283 markup => 316 markup =>
284 "<big><b>Character Creation: Stats</b></big>\n\n" 317 "<big><b>Character Creation: Stats</b></big>\n\n"
285 . "Look at the <b>Stats</b> window to see your basic stats " 318 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
286 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n" 319 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
320 . "They will be modified later by both the race and the class you choose.\n\n"
287 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. " 321 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
288 . "Race selection will influence those values later on."
289 ; 322 ;
290 } 323 }
291 324
292 push @dialog, my $entry = new CFClient::UI::Entry 325 push @dialog, my $entry = new CFClient::UI::Entry
293 on_changed => sub { 326 on_changed => sub {
… …
324 $LOGIN_BUTTON->set_text ("Logout"); 357 $LOGIN_BUTTON->set_text ("Logout");
325 $SETUP_DIALOG->hide; 358 $SETUP_DIALOG->hide;
326 359
327 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 360 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
328 361
329 my ($host, $port) = split /:/, $CFG->{host}; 362 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
330 363
331 $MAP = new CFClient::Map $mapsize, $mapsize; 364 $MAP = new CFClient::Map $mapsize, $mapsize;
332 365
333 $CONN = eval { 366 $CONN = eval {
334 new CFClient::Protocol 367 new CFClient::Protocol
335 host => $host, 368 host => $host,
336 port => $port || 13327, 369 port => $port || 13327,
337 user => $CFG->{user}, 370 user => $CFG->{profile}{default}{user},
338 pass => $CFG->{password}, 371 pass => $CFG->{profile}{default}{password},
339 mapw => $mapsize, 372 mapw => $mapsize,
340 maph => $mapsize, 373 maph => $mapsize,
341 374
342 map_widget => $MAPWIDGET, 375 map_widget => $MAPWIDGET,
343 logview => $LOGVIEW, 376 logview => $LOGVIEW,
… …
371 404
372sub stop_game { 405sub stop_game {
373 $LOGIN_BUTTON->set_text ("Login"); 406 $LOGIN_BUTTON->set_text ("Login");
374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 407 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
375 $SETUP_DIALOG->show; 408 $SETUP_DIALOG->show;
376 $INV_WINDOW->hide; 409 $PL_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells; 410 $SPELL_PAGE->clear_spells;
378 411
379 return unless $CONN; 412 return unless $CONN;
380 413
381 status "connection closed"; 414 status "connection closed";
382 415
383 destroy_query_dialog $CONN; 416 destroy_query_dialog $CONN;
384 $CONN->destroy; 417 $CONN->destroy;
385 $CONN = 0; # false, does not autovivify 418 $CONN = 0; # false, does not autovivify
419
420 undef $MAP;
386} 421}
387 422
388sub graphics_setup { 423sub graphics_setup {
389 my $vbox = new CFClient::UI::VBox; 424 my $vbox = new CFClient::UI::VBox;
390 425
… …
405 $mode_slider->emit (changed => $mode_slider->{range}[0]); 440 $mode_slider->emit (changed => $mode_slider->{range}[0]);
406 441
407 my $row = 1; 442 my $row = 1;
408 443
409 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 444 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
410 $table->add (1, $row++, new CFClient::UI::CheckBox 445 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
411 state => $CFG->{fullscreen}, 446 state => $CFG->{fullscreen},
412 tooltip => "Bring the client into fullscreen mode.", 447 tooltip => "Bring the client into fullscreen mode.",
413 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 448 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
414 ); 449 );
415 450
… …
465 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 500 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
466 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 501 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
467 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 502 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
468 ); 503 );
469 504
470 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
471
472 $table->add (1, $row++, new CFClient::UI::Slider
473 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
474 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
475 on_changed => sub {
476 $CFG->{stat_fontsize} = $_[1];
477 &set_stats_window_fontsize;
478 0
479 }
480 );
481
482 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 505 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
483 $table->add (1, $row++, new CFClient::UI::Slider 506 $table->add (1, $row++, new CFClient::UI::Slider
484 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 507 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
485 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 508 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
486 on_changed => sub { 509 on_changed => sub {
… …
555 ); 578 );
556 579
557 $vbox 580 $vbox
558} 581}
559 582
560sub set_stats_window_fontsize {
561 for (values %{$STATWIDS}) {
562 $_->set_fontsize ($::CFG->{stat_fontsize});
563 }
564}
565
566sub set_gauge_window_fontsize { 583sub set_gauge_window_fontsize {
567 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 584 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
568 $_->set_fontsize ($::CFG->{gauge_fontsize}); 585 $_->set_fontsize ($::CFG->{gauge_fontsize});
569 } 586 }
570} 587}
… …
649 666
650 $table 667 $table
651} 668}
652 669
653sub stats_window { 670sub stats_window {
654 my $tgw = new CFClient::UI::FancyFrame 671 my $r = new CFClient::UI::ScrolledWindow (
655 y => $HEIGHT * (2/8), 672 expand => 1,
656 x => "max", 673 scroll_y => 1
657 title => "Stats", 674 );
658 name => "stats_window", 675 $r->add (my $vb = new CFClient::UI::VBox);
659 has_close_button => 1;
660 676
661 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
662 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 677 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
663 can_hover => 1, can_events => 1, 678 can_hover => 1, can_events => 1,
664 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 679 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
665 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 680 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
666 can_hover => 1, can_events => 1, 681 can_hover => 1, can_events => 1,
… …
679 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
680 695
681 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
682 697
683 for ( 698 for (
684 [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"], 699 [0, 0, st_str => "Str", 30],
685 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 700 [0, 1, st_dex => "Dex", 30],
686 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 701 [0, 2, st_con => "Con", 30],
687 [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"], 702 [0, 3, st_int => "Int", 30],
688 [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"], 703 [0, 4, st_wis => "Wis", 30],
689 [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"], 704 [0, 5, st_pow => "Pow", 30],
690 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 705 [0, 6, st_cha => "Cha", 30],
691 706
692 [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."], 707 [2, 0, st_wc => "Wc", -120],
693 [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."], 708 [2, 1, st_ac => "Ac", -120],
694 [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."], 709 [2, 2, st_dam => "Dam", 120],
695 [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."], 710 [2, 3, st_arm => "Arm", 120],
696 [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."], 711 [2, 4, st_spd => "Spd", 10.54],
697 [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."], 712 [2, 5, st_wspd => "WSp", 10.54],
698 ) { 713 ) {
699 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
700 715
701 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
702 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 717 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
703 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 719 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
704 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 720 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
705 } 722 }
706 723
707 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
708 725
709 my $row = 0; 726 my $row = 0;
710 my $col = 0; 727 my $col = 0;
711 728
712 my %resist_names = ( 729 my %resist_names = (
730 slow => ["Slow",
713 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 731 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
732 holyw => ["Holy Word",
714 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 733 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
734 conf => ["Confusion",
715 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 735 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
736 fire => ["Fire",
716 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 737 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
738 depl => ["Depletion",
717 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 739 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
740 magic => ["Magic",
718 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 741 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
742 drain => ["Draining",
719 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 743 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
744 acid => ["Acid",
720 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 745 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
746 pois => ["Poison",
721 pois => "<b>Poison</b> (resistance to getting poisoned)", 747 "<b>Poison</b> (resistance to getting poisoned)"],
748 para => ["Paralysation",
722 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 749 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
750 deat => ["Death",
723 deat => "<b>Death</b> (resistance against death spells)", 751 "<b>Death</b> (resistance against death spells)"],
724 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 752 phys => ["Physical",
753 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
754 blind => ["Blind",
725 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 755 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
756 fear => ["Fear",
726 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 757 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
758 tund => ["Turn undead",
727 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 759 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
760 elec => ["Electricity",
728 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 761 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
762 cold => ["Cold",
729 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 763 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
764 ghit => ["Ghost hit",
730 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 765 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
731 ); 766 );
732 for (qw/slow holyw conf fire depl magic 767 for (qw/slow holyw conf fire depl magic
733 drain acid pois para deat phys 768 drain acid pois para deat phys
734 blind fear tund elec cold ghit/) 769 blind fear tund elec cold ghit/)
735 { 770 {
… …
740 template => "-100%", 775 template => "-100%",
741 align => +1, 776 align => +1,
742 valign => 0, 777 valign => 0,
743 can_events => 1, 778 can_events => 1,
744 can_hover => 1, 779 can_hover => 1,
745 tooltip => $resist_names{$_}, 780 tooltip => $resist_names{$_}->[1],
746 ); 781 );
747 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
748 font => $FONT_FIXED, 783 font => $FONT_FIXED,
749 can_hover => 1, 784 can_hover => 1,
750 can_events => 1, 785 can_events => 1,
751 image => "ui/resist/resist_$_.png", 786 path => "ui/resist/resist_$_.png",
752 tooltip => $resist_names{$_}, 787 tooltip => $resist_names{$_}->[1],
788 );
789 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
790 text => $resist_names{$_}->[0],
791 font => $FONT_FIXED,
792 can_hover => 1,
793 can_events => 1,
794 tooltip => $resist_names{$_}->[1],
753 ); 795 );
754 796
755 $row++; 797 $row++;
756 if ($row % 6 == 0) { 798 if ($row % 6 == 0) {
757 $col += 2; 799 $col += 3;
758 $row = 0; 800 $row = 0;
759 } 801 }
760 } 802 }
761 803
762 &set_stats_window_fontsize;
763 update_stats_window ({}); 804 #update_stats_window ({});
764 805
806 $r
807}
808
809sub skill_window {
810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
811 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
765 $tgw 812 $sw
766} 813}
767 814
768sub formsep($) { 815sub formsep($) {
769 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
770} 817}
771 818
772sub update_stats_window {
773 my ($stats) = @_;
774
775 # I love text protocols...
776
777 my $hp = $stats->{+CS_STAT_HP} * 1;
778 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
779 my $sp = $stats->{+CS_STAT_SP} * 1;
780 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
781 my $fo = $stats->{+CS_STAT_FOOD} * 1;
782 my $fo_m = 999;
783 my $gr = $stats->{+CS_STAT_GRACE} * 1;
784 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
785
786 $GAUGES->{hp} ->set_value ($hp, $hp_m);
787 $GAUGES->{mana} ->set_value ($sp, $sp_m);
788 $GAUGES->{food} ->set_value ($fo, $fo_m);
789 $GAUGES->{grace} ->set_value ($gr, $gr_m);
790 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
791 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
792 my $rng = $stats->{+CS_STAT_RANGE};
793 $rng =~ s/^Range: //; # thank you so much dear server
794 $GAUGES->{range} ->set_text ("Rng: " . $rng);
795 my $title = $stats->{+CS_STAT_TITLE};
796 $title =~ s/^Player: //;
797 $STATWIDS->{title} ->set_text ("Title: " . $title);
798
799 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
800 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
801 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
802 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
803 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
804 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
805 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
806 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
807 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
808 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
809 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
810 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
811 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
812
813 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
814
815 my %tbl = (
816 phys => CS_STAT_RES_PHYS,
817 magic => CS_STAT_RES_MAG,
818 fire => CS_STAT_RES_FIRE,
819 elec => CS_STAT_RES_ELEC,
820 cold => CS_STAT_RES_COLD,
821 conf => CS_STAT_RES_CONF,
822 acid => CS_STAT_RES_ACID,
823 drain => CS_STAT_RES_DRAIN,
824 ghit => CS_STAT_RES_GHOSTHIT,
825 pois => CS_STAT_RES_POISON,
826 slow => CS_STAT_RES_SLOW,
827 para => CS_STAT_RES_PARA,
828 tund => CS_STAT_TURN_UNDEAD,
829 fear => CS_STAT_RES_FEAR,
830 depl => CS_STAT_RES_DEPLETE,
831 deat => CS_STAT_RES_DEATH,
832 holyw => CS_STAT_RES_HOLYWORD,
833 blind => CS_STAT_RES_BLIND,
834 );
835
836 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
837 for keys %tbl;
838}
839
840my $METASERVER_ATIME; 819my $METASERVER_ATIME;
841 820
842sub update_metaserver { 821sub update_metaserver {
822 my ($metaserver_dialog) = @_;
823
824 $METASERVER = $metaserver_dialog
825 if defined $metaserver_dialog;
826
843 return if $METASERVER_ATIME > time; 827 return if $METASERVER_ATIME > time;
844 $METASERVER_ATIME = time + 60; 828 $METASERVER_ATIME = time + 60;
845 829
846 my $table = $METASERVER->{table}; 830 my $table = $METASERVER->{table};
847 $table->clear; 831 $table->clear;
… …
912 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 896 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
913 (new CFClient::UI::Button 897 (new CFClient::UI::Button
914 text => "Use", 898 text => "Use",
915 tooltip => "Put this server into the <b>Host:Port</b> field", 899 tooltip => "Put this server into the <b>Host:Port</b> field",
916 on_activate => sub { 900 on_activate => sub {
917 $HOST_ENTRY->set_text ($CFG->{host} = $host); 901 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
918 $METASERVER->hide; 902 $METASERVER->hide;
919 0 903 0
920 }, 904 },
921 ), 905 ),
922 (new CFClient::UI::Empty expand => 1), 906 (new CFClient::UI::Empty expand => 1),
… …
935 } 919 }
936 }); 920 });
937} 921}
938 922
939sub metaserver_dialog { 923sub metaserver_dialog {
924 my $vbox = new CFClient::UI::VBox;
925 my $table = new CFClient::UI::Table;
926 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
927
940 my $dialog = new CFClient::UI::FancyFrame 928 my $dialog = new CFClient::UI::FancyFrame
941 title => "Server List", 929 title => "Server List",
942 name => 'metaserver_dialog', 930 name => 'metaserver_dialog',
943 x => 'center', 931 x => 'center',
944 y => 'center', 932 y => 'center',
945 z => 3, 933 z => 3,
946 force_h => $::HEIGHT * 0.4, 934 force_h => $::HEIGHT * 0.4,
947 child => (my $vbox = new CFClient::UI::VBox), 935 child => $vbox,
936 has_close_button => 1,
937 table => $table,
948 on_visibility_change => sub { 938 on_visibility_change => sub {
949 update_metaserver if $_[1]; 939 update_metaserver ($_[0]) if $_[1];
950 0 940 0
951 }, 941 },
952 ; 942 ;
953 943
954 $dialog->{table} = new CFClient::UI::Table;
955
956 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
957
958 $dialog 944 $dialog
959} 945}
960 946
961sub server_setup { 947sub server_setup {
962 my $vbox = new CFClient::UI::VBox; 948 my $vbox = new CFClient::UI::VBox;
… …
968 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 954 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
969 955
970 $vbox->add ( 956 $vbox->add (
971 $HOST_ENTRY = new CFClient::UI::Entry 957 $HOST_ENTRY = new CFClient::UI::Entry
972 expand => 1, 958 expand => 1,
973 text => $CFG->{host}, 959 text => $CFG->{profile}{default}{host},
974 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 960 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
975 on_changed => sub { 961 on_changed => sub {
976 my ($self, $value) = @_; 962 my ($self, $value) = @_;
977 $CFG->{host} = $value; 963 $CFG->{profile}{default}{host} = $value;
978 0 964 0
979 } 965 }
980 ); 966 );
981
982 $METASERVER = metaserver_dialog;
983 967
984 $vbox->add (new CFClient::UI::Button 968 $vbox->add (new CFClient::UI::Button
985 expand => 1, 969 expand => 1,
986 text => "Server List", 970 text => "Server List",
987 other => $METASERVER, 971 other => $METASERVER,
… …
991 ); 975 );
992 } 976 }
993 977
994 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 978 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
995 $table->add (1, 4, new CFClient::UI::Entry 979 $table->add (1, 4, new CFClient::UI::Entry
996 text => $CFG->{user}, 980 text => $CFG->{profile}{default}{user},
997 tooltip => "The name of your character on the server", 981 tooltip => "The name of your character on the server",
998 on_changed => sub { my ($self, $value) = @_; $CFG->{user} = $value; 0 } 982 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
999 ); 983 );
1000 984
1001 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 985 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1002 $table->add (1, 5, new CFClient::UI::Entry 986 $table->add (1, 5, new CFClient::UI::Entry
1003 text => $CFG->{password}, 987 text => $CFG->{profile}{default}{password},
1004 hidden => 1, 988 hidden => 1,
1005 tooltip => "The password for your character", 989 tooltip => "The password for your character",
1006 on_changed => sub { my ($self, $value) = @_; $CFG->{password} = $value; 0 } 990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1007 ); 991 );
1008 992
1009 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 993 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1010 $table->add (1, 7, new CFClient::UI::Slider 994 $table->add (1, 7, new CFClient::UI::Slider
1011 force_w => 100, 995 force_w => 100,
… …
1083sub message_window { 1067sub message_window {
1084 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFClient::UI::FancyFrame
1085 name => "message_window", 1069 name => "message_window",
1086 title => "Messages", 1070 title => "Messages",
1087 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1088 bg => [0, 0, 0, 0.75],
1089 x => "max", 1072 x => "max",
1090 y => 0, 1073 y => 0,
1091 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1092 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1093 child => (my $vbox = new CFClient::UI::VBox), 1076 child => (my $vbox = new CFClient::UI::VBox),
… …
1179sub autopickup_setup { 1162sub autopickup_setup {
1180 my $table = new CFClient::UI::Table; 1163 my $table = new CFClient::UI::Table;
1181 1164
1182 for ( 1165 for (
1183 ["General", 0, 0, 1166 ["General", 0, 0,
1184 ["Enable autopickup" => PICKUP_NEWMODE], 1167 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1185 ["Inhibit autopickup" => PICKUP_INHIBIT], 1168 ["Inhibit autopickup" => PICKUP_INHIBIT],
1186 ["Stop before pickup" => PICKUP_STOP], 1169 ["Stop before pickup" => PICKUP_STOP],
1187 ["Debug autopickup" => PICKUP_DEBUG], 1170 ["Debug autopickup" => PICKUP_DEBUG],
1188 ], 1171 ],
1189 ["Weapons", 0, 6, 1172 ["Weapons", 0, 6,
… …
1226 for (@bits) { 1209 for (@bits) {
1227 ++$y; 1210 ++$y;
1228 1211
1229 my $mask = $_->[1]; 1212 my $mask = $_->[1];
1230 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1213 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1231 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1214 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1232 state => $CFG->{pickup} & $mask, 1215 state => $::CFG->{pickup} & $mask,
1233 on_changed => sub { 1216 on_changed => sub {
1234 my ($box, $value) = @_; 1217 my ($box, $value) = @_;
1235 1218
1236 if ($value) { 1219 if ($value) {
1237 $::CFG->{pickup} |= $mask; 1220 $::CFG->{pickup} |= $mask;
… …
1242 $::CONN->send_command ("pickup $::CFG->{pickup}") 1225 $::CONN->send_command ("pickup $::CFG->{pickup}")
1243 if defined $::CONN; 1226 if defined $::CONN;
1244 1227
1245 0 1228 0
1246 }); 1229 });
1230
1231 ${$_->[2]} = $checkbox if $_->[2];
1247 } 1232 }
1248 } 1233 }
1249 1234
1250 $table->add (2, 18, new CFClient::UI::ValSlider 1235 $table->add (2, 18, new CFClient::UI::ValSlider
1251 range => [0, 0, 16, 1, 1], 1236 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1237 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1238 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1239 on_changed => sub {
1254 my ($slider, $value) = @_; 1240 my ($slider, $value) = @_;
1255 1241
1256 $::CFG->{pickup} &= ~0x7; 1242 $::CFG->{pickup} &= ~0xF;
1257 $::CFG->{pickup} |= int $value 1243 $::CFG->{pickup} |= int $value
1258 if $value; 1244 if $value;
1259 1; 1245 1;
1260 }); 1246 });
1247
1261 $table->add (3, 18, new CFClient::UI::Button 1248 $table->add (3, 18, new CFClient::UI::Button
1262 text => "set", 1249 text => "set",
1263 on_activate => sub { 1250 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1251 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1252 if defined $::CONN;
… …
1267 }); 1254 });
1268 1255
1269 $table 1256 $table
1270} 1257}
1271 1258
1272sub inventory_window { 1259sub inventory_widget {
1260 my $hb = new CFClient::UI::HBox homogeneous => 1;
1261
1262 $hb->add (my $vb1 = new CFClient::UI::VBox);
1263 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1264 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1265 $sw1->add ($INV = new CFClient::UI::Inventory);
1266
1267 $hb->add (my $vb2 = new CFClient::UI::VBox);
1268
1269 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1270
1271 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272 $sw2->add ($INVR = new CFClient::UI::Inventory);
1273
1274 # XXX: Call after $INVR = ... because set_opencont sets the items
1275 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1276
1277 $hb
1278}
1279
1280sub toggle_player_page {
1281 my ($widget) = @_;
1282
1283 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1284 $PL_WINDOW->hide;
1285 } else {
1286 $PL_NOTEBOOK->set_current_page ($widget);
1287 $PL_WINDOW->show;
1288 }
1289}
1290
1291sub player_window {
1273 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1292 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1274 x => "center", 1293 x => "center",
1275 y => "center", 1294 y => "center",
1276 force_w => $WIDTH * 9/10, 1295 force_w => $WIDTH * 9/10,
1277 force_h => $HEIGHT * 9/10, 1296 force_h => $HEIGHT * 9/10,
1278 title => "Inventory", 1297 title => "Player",
1298 name => "playerbook",
1279 has_close_button => 1, 1299 has_close_button => 1
1280 ; 1300 ;
1281 1301
1282 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1302 my $ntb =
1303 $PL_NOTEBOOK =
1304 new CFClient::UI::Notebook expand => 1, debug => 1;
1283 1305
1284 $hb->add (my $vb1 = new CFClient::UI::VBox); 1306 $ntb->add (
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1307 "Statistics (F2)" => $STATS_PAGE = stats_window,
1286 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1308 "Shows statistics, where all your Stats and Resistances are shown."
1309 );
1310 $ntb->add (
1311 "Skills (F3)" => $SKILL_PAGE = skill_window,
1312 "Shows all your Skills."
1313 );
1287 1314
1288 $hb->add (my $vb2 = new CFClient::UI::VBox); 1315 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1316 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1317 $ntb->add (
1318 "Spellbook (F4)" => $spellsw,
1319 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1320 );
1321 $ntb->add (
1322 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1323 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1324 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1325 );
1289 1326
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1327 $ntb->set_current_page ($INVENTORY_PAGE);
1291 1328
1292 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1329 $plwin->add ($ntb);
1293 1330 $plwin
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1297 $invwin
1298} 1331}
1299 1332
1300sub spell_setup { 1333sub update_bindings {
1301 new CFClient::UI::SpellList 1334 $BIND_UPD_CB->() if $BIND_UPD_CB;
1302} 1335}
1303 1336
1304sub keyboard_setup { 1337sub keyboard_setup {
1305 my $binding_list = new CFClient::UI::VBox; 1338 my $binding_list = new CFClient::UI::VBox;
1306 1339
1307 my $refresh; 1340 my $refresh;
1308 $refresh = sub { 1341 $refresh = $BIND_UPD_CB = sub {
1309 $binding_list->clear (); 1342 $binding_list->clear ();
1310 1343
1311 for my $mod (keys %{$::CFG->{bindings}}) { 1344 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1312 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1345 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1313 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1346 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1314 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1347 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1315 1348
1316 my $lbl = join "; ", @$cmds; 1349 my $lbl = join "; ", @$cmds;
1317 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1350 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1318 $binding_list->add (my $hb = new CFClient::UI::HBox); 1351 $binding_list->add (my $hb = new CFClient::UI::HBox);
1319 $hb->add (new CFClient::UI::Button 1352 $hb->add (new CFClient::UI::Button
1320 text => "delete", 1353 text => "delete",
1321 tooltip => "Deletes the binding", 1354 tooltip => "Deletes the binding",
1322 on_activate => sub { 1355 on_activate => sub {
1323 $binding_list->remove ($hb); 1356 $binding_list->remove ($hb);
1324 delete $::CFG->{bindings}->{$mod}->{$sym}; 1357 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1325 0 1358 0
1326 }); 1359 });
1327 1360
1328 $hb->add (new CFClient::UI::Button 1361 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1362 text => "edit",
1330 tooltip => "Edits the binding", 1363 tooltip => "Edits the binding",
1331 on_activate => sub { 1364 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1365 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1366 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1367 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1368 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1369 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1370 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1371 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1372 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1373 $SETUP_DIALOG->show;
1341 }, 1374 },
1342 sub { 1375 sub {
… …
1376 tooltip => "This button opens the binding editor with an empty binding.", 1409 tooltip => "This button opens the binding editor with an empty binding.",
1377 on_activate => sub { 1410 on_activate => sub {
1378 $::BIND_EDITOR->set_binding (undef, undef, [], 1411 $::BIND_EDITOR->set_binding (undef, undef, [],
1379 sub { 1412 sub {
1380 my ($mod, $sym, $cmds) = @_; 1413 my ($mod, $sym, $cmds) = @_;
1381 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1414 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1382 $refresh->(); 1415 $refresh->();
1383 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1416 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1384 $SETUP_DIALOG->show; 1417 $SETUP_DIALOG->show;
1385 }, 1418 },
1386 sub { 1419 sub {
… …
1407 $refresh->(); 1440 $refresh->();
1408 1441
1409 $vb 1442 $vb
1410} 1443}
1411 1444
1445# just weirdness, pls. ignore
1446sub load_html_page {
1447 my ($viewer, $base) = @_;
1448
1449 $viewer->clear;
1450
1451 require LWP::Simple;
1452 require HTML::Parser;
1453 require URI;
1454
1455 my $page = LWP::Simple::get ($base)
1456 or return;
1457
1458 my @s = { };
1459 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1460
1461 my $parser = HTML::Parser->new (
1462 text_h => [sub {
1463 my ($text) = @_;
1464 $text =~ s/\s+/ /g;
1465 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1466 }, "dtext"],
1467 start_h => [sub {
1468 my ($tag, $attr) = @_;
1469 if ($passthrough{$tag}) {
1470 $s[-1]{text} .= "<$tag>";
1471 } elsif ($tag eq "h1") {
1472 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1473 } elsif ($tag eq "h2") {
1474 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1475 } elsif ($tag eq "h3") {
1476 push @s, { text => "<span size='large'>" };
1477 } elsif ($tag eq "a") {
1478 push @s, { text => "", url => $attr->{href} };
1479 } elsif ($tag eq "p") {
1480 push @s, { };
1481 } elsif ($tag eq "img") {
1482 eval {
1483 push @{$s[-1]{obj}}, new CFClient::UI::Image
1484 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1485 $s[-1]{text} .= "\x{fffc}";
1486 };
1487 }
1488 }, "tagname, attr"],
1489 end_h => [sub {
1490 my ($tag) = @_;
1491 if ($passthrough{$tag}) {
1492 $s[-1]{text} .= "</$tag>";
1493 } elsif ($tag =~ /^h\d$/) {
1494 $s[-1]{text} .= "</span>";
1495 push @s, { };
1496 } elsif ($tag eq "a") {
1497 my $S = pop @s;
1498 $s[-1]{text} .= "\x{fffc}";
1499 push @{$s[-1]{obj}}, new CFClient::UI::Label
1500 fg => [0.8, 0.8, 1],
1501 markup => "<u>$S->{text}</u>",
1502 fontsize => 0.8,
1503 can_events => 1,
1504 can_focus => 1,
1505 on_button_up => sub {
1506 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1507 },
1508 ;
1509 }
1510 }, "tagname"],
1511 );
1512
1513 $parser->parse ($page);
1514 $parser->eof;
1515
1516 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1517 for @s;
1518
1519 $viewer->set_offset (0);
1520}
1521
1412sub help_window { 1522sub help_window {
1413 my $win = new CFClient::UI::FancyFrame 1523 my $win = new CFClient::UI::FancyFrame
1414 x => 'center', 1524 x => 'center',
1415 y => 'center', 1525 y => 'center',
1416 z => 2, 1526 z => 2,
1417 name => 'doc_browser', 1527 name => 'doc_browser',
1418 force_w => int $WIDTH * 7/8, 1528 force_w => int $WIDTH * 7/8,
1419 force_h => int $HEIGHT * 7/8, 1529 force_h => int $HEIGHT * 7/8,
1420 title => "Documentation"; 1530 title => "Help Browser",
1531 has_close_button => 1;
1421 1532
1422 $win->add (my $vbox = new CFClient::UI::VBox); 1533 $win->add (my $vbox = new CFClient::UI::VBox);
1423 1534
1424 $vbox->add (my $buttons = new CFClient::UI::HBox); 1535 $vbox->add (my $buttons = new CFClient::UI::HBox);
1425 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1536 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1428 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1539 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1429 $buttons->add (my $combo = new CFClient::UI::Combobox 1540 $buttons->add (my $combo = new CFClient::UI::Combobox
1430 value => undef, 1541 value => undef,
1431 options => [ 1542 options => [
1432 [intro => "Introduction"], 1543 [intro => "Introduction"],
1433 [manual => "Manual"], 1544 [manual => "Main Manual"],
1434 [skill_help => "Skills"], 1545 [skill_help => "Skill Reference"],
1435 [command_help => "Commands"], 1546 [command_help => "Command Reference"],
1436 [dmcommand_help => "DM Commands"], 1547 [dmcommand_help => "DM Commands"],
1437 [COPYING => "License Terms"], 1548 [COPYING => "License Terms"],
1549 [test => "test (do not select)"], #d#TODO
1438 ], 1550 ],
1439 on_changed => sub { 1551 on_changed => sub {
1440 my ($self, $pod) = @_; 1552 my ($self, $pod) = @_;
1441 1553
1554 if ($pod eq "test") {#d#TODO
1555 eval {
1556 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1557 };
1558 warn "$@" if $@;
1559 return;
1560 }
1561
1442 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1562 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1443 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1563 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1444 1564
1445 $viewer->clear; 1565 $viewer->clear;
1566
1567# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1568# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1569# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1570# ]);#d#
1446 1571
1447 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1572 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1448 for @$pom; 1573 for @$pom;
1449 1574
1450 $viewer->set_offset (0); 1575 $viewer->set_offset (0);
1576
1451 0 1577 0
1452 }, 1578 },
1453 on_visibility_change => sub { 1579 on_visibility_change => sub {
1454 my ($self, $visible) = @_; 1580 my ($self, $visible) = @_;
1455 return unless $visible; 1581 return unless $visible;
… …
1502 z => 100, 1628 z => 100,
1503 force_x => "max", 1629 force_x => "max",
1504 force_y => 0; 1630 force_y => 0;
1505 $DEBUG_STATUS->show; 1631 $DEBUG_STATUS->show;
1506 1632
1507 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1633 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1508 1634
1509 $STATUSBOX = new CFClient::UI::Statusbox; 1635 $STATUSBOX = new CFClient::UI::Statusbox;
1510 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1636 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1511 1637
1512 (new CFClient::UI::Frame 1638 (new CFClient::UI::Frame
… …
1563 force_w => $::WIDTH * 0.6, 1689 force_w => $::WIDTH * 0.6,
1564 force_h => $::HEIGHT * 0.6, 1690 force_h => $::HEIGHT * 0.6,
1565 has_close_button => 1, 1691 has_close_button => 1,
1566 ; 1692 ;
1567 1693
1694 $METASERVER = metaserver_dialog;
1695
1568 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1696 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1569 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1697 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1570 1698
1571 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1699 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1572 "Configure the server to play on, your username, password and other server-related options."); 1700 "Configure the server to play on, your username, password and other server-related options.");
… …
1575 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1703 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1576 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1704 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1577 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1705 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1578 "Configure the use of audio, sound effects and background music."); 1706 "Configure the use of audio, sound effects and background music.");
1579 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1707 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1580 "Lets you define, edit and delete bindings." 1708 "Lets you define, edit and delete key bindings."
1581 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1709 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1582 . "with nothing set and the recording started. After doing the actions you " 1710 . "with nothing set and the recording started. After doing the actions you "
1583 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1711 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1584 . "After pressing the combo the binding will be saved automatically and the " 1712 . "After pressing the combo the binding will be saved automatically and the "
1585 . "binding editor closes"); 1713 . "binding editor closes");
1586 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1587 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1588 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1714 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1589 "Some debuggign options. Do not ask."); 1715 "Some debuggin' options. Do not ask.");
1590 1716
1591 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1717 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1592 1718
1593 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1719 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1594 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1720 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1596 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1722 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1597 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1723 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1598 1724
1599 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 1725 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
1600 1726
1601 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1602 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1727 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1604 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1728 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1605 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1606 1729
1607 $BUTTONBAR->add (new CFClient::UI::Button 1730 $BUTTONBAR->add (new CFClient::UI::Button
1608 text => "Save Config", 1731 text => "Save Config",
1609 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1732 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1610 on_activate => sub { 1733 on_activate => sub {
… …
1613 status "Configuration Saved"; 1736 status "Configuration Saved";
1614 0 1737 0
1615 }, 1738 },
1616 ); 1739 );
1617 1740
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1741 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1619 tooltip => "View Documentation"); 1742 tooltip => "View Documentation");
1620 1743
1621 $BUTTONBAR->add (new CFClient::UI::Button 1744 $BUTTONBAR->add (new CFClient::UI::Button
1622 text => "Quit", 1745 text => "Quit",
1623 tooltip => "Terminates the program", 1746 tooltip => "Terminates the program",
… …
1829# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1952# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1830 }, 1953 },
1831 CFClient::SDL_KEYDOWN => sub { 1954 CFClient::SDL_KEYDOWN => sub {
1832 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1955 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1833 # alt-enter 1956 # alt-enter
1957 $FULLSCREEN_ENABLE->toggle;
1834 video_shutdown; 1958 video_shutdown;
1835 $CFG->{fullscreen} = !$CFG->{fullscreen};
1836 video_init; 1959 video_init;
1837 } else { 1960 } else {
1838 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1961 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1839 } 1962 }
1840 }, 1963 },
… …
1856$SIG{INT} = $SIG{TERM} = sub { exit }; 1979$SIG{INT} = $SIG{TERM} = sub { exit };
1857 1980
1858{ 1981{
1859 local $SIG{__DIE__} = sub { 1982 local $SIG{__DIE__} = sub {
1860 return unless defined $^S && !$^S; 1983 return unless defined $^S && !$^S;
1861 Carp::confess $_[1];#d#TODO: remove when stable 1984 Carp::confess $_[0];#d#TODO: remove when stable
1862 CFClient::fatal $_[0]; 1985 CFClient::fatal $_[0];
1863 }; 1986 };
1864 1987
1865 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1988 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1866 CFClient::UI::set_layout ($::CFG->{layout}); 1989 CFClient::UI::set_layout ($::CFG->{layout});
1867 1990
1868 my %DEF_CFG = ( 1991 my %DEF_CFG = (
1869 sdl_mode => 0, 1992 sdl_mode => 0,
1870 width => 640, 1993 width => 640,
1871 height => 480, 1994 height => 480,
1872 fullscreen => 0, 1995 fullscreen => 0,
1873 fast => 0, 1996 fast => 0,
1874 map_scale => 1, 1997 map_scale => 1,
1875 fow_enable => 1, 1998 fow_enable => 1,
1876 fow_intensity => 0.45, 1999 fow_intensity => 0.45,
1877 fow_smooth => 0, 2000 fow_smooth => 0,
1878 gui_fontsize => 1, 2001 gui_fontsize => 1,
1879 log_fontsize => 0.7, 2002 log_fontsize => 0.7,
1880 gauge_fontsize=> 1, 2003 gauge_fontsize => 1,
1881 gauge_size => 0.35, 2004 gauge_size => 0.35,
1882 stat_fontsize => 0.7, 2005 stat_fontsize => 0.7,
1883 mapsize => 100, 2006 mapsize => 100,
1884 host => "crossfire.schmorp.de",
1885 say_command => 'say', 2007 say_command => 'say',
1886 audio_enable => 1, 2008 audio_enable => 1,
1887 bgm_enable => 1, 2009 bgm_enable => 1,
1888 bgm_volume => 0.25, 2010 bgm_volume => 0.25,
1889 face_prefetch => 0, 2011 face_prefetch => 0,
1890 output_sync => 1, 2012 output_sync => 1,
1891 output_count => 1, 2013 output_count => 1,
1892 pickup => 0, 2014 pickup => 0,
2015 default => "profile", # default profile
2016 );
1893 ); 2017
1894
1895 while (my ($k, $v) = each %DEF_CFG) { 2018 while (my ($k, $v) = each %DEF_CFG) {
1896 $CFG->{$k} = $v unless exists $CFG->{$k}; 2019 $CFG->{$k} = $v unless exists $CFG->{$k};
1897 } 2020 }
2021
2022 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1898 2023
1899 sdl_init; 2024 sdl_init;
1900 2025
1901 @SDL_MODES = reverse 2026 @SDL_MODES = reverse
1902 grep $_->[0] >= 640 && $_->[1] >= 480, 2027 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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