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.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.50 by root, Sat Jun 3 02:32:35 2006 UTC

… …
41use CFClient::UI; 41use CFClient::UI;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43 43
44$Event::DIED = sub { 44$Event::DIED = sub {
45 # TODO: display dialog box or so 45 # TODO: display dialog box or so
46 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 47 CFClient::error $_[1];
47}; 48};
48 49
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 50#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 51
… …
81our $LOGVIEW; 82our $LOGVIEW;
82our $CONSOLE; 83our $CONSOLE;
83our $METASERVER; 84our $METASERVER;
84our $LOGIN_BUTTON; 85our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 86our $QUIT_DIALOG;
86our $SERVER_SETUP; 87our $HOST_ENTRY;
88
89our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK;
91our $SETUP_SERVER;
92our $SETUP_KEYBOARD;
93our $SETUP_SPELLS;
87 94
88our $FLOORBOX; 95our $FLOORBOX;
89our $GAUGES; 96our $GAUGES;
90our $STATWIDS; 97our $STATWIDS;
91 98
… …
101our $DEBUG_STATUS; 108our $DEBUG_STATUS;
102 109
103our $INV_WINDOW; 110our $INV_WINDOW;
104our $INV; 111our $INV;
105our $INVR; 112our $INVR;
106our $INVR_LBL; 113our $INV_RIGHT_HB;
114
115our $BIND_EDITOR;
116
117our $PICKUP_CFG;
107 118
108sub status { 119sub status {
109 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 120 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
110} 121}
111 122
112sub debug { 123sub debug {
113 $DEBUG_STATUS->set_text ($_[0]); 124 $DEBUG_STATUS->set_text ($_[0]);
114 my ($w, $h) = $DEBUG_STATUS->size_request;
115 $DEBUG_STATUS->move ($WIDTH - $w, 0);
116} 125}
117 126
118sub start_game { 127sub start_game {
119 status "logging in..."; 128 status "logging in...";
120 129
121 $LOGIN_BUTTON->set_text ("Logout"); 130 $LOGIN_BUTTON->set_text ("Logout");
122 $SERVER_SETUP->hide; 131 $SETUP_DIALOG->hide;
123 132
124 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 133 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
125 134
126 my ($host, $port) = split /:/, $CFG->{host}; 135 my ($host, $port) = split /:/, $CFG->{host};
127 136
… …
165 } 174 }
166} 175}
167 176
168sub stop_game { 177sub stop_game {
169 $LOGIN_BUTTON->set_text ("Login"); 178 $LOGIN_BUTTON->set_text ("Login");
170 $SERVER_SETUP->show; 179 $SETUP_DIALOG->show;
171 $INV_WINDOW->hide; 180 $INV_WINDOW->hide;
172 $LOGVIEW->hide; 181 $LOGVIEW->hide;
173 182
174 return unless $CONN; 183 return unless $CONN;
175 184
… …
177 186
178 $CONN->destroy; 187 $CONN->destroy;
179 $CONN = 0; # false, does not autovivify 188 $CONN = 0; # false, does not autovivify
180} 189}
181 190
182sub client_setup { 191sub graphics_setup {
183 my $dialog = new CFClient::UI::FancyFrame
184 req_x => 1,
185 req_y => $HEIGHT * (1/8),
186 name => "client_setup",
187 title => "Client Setup",
188 child => (my $vbox = new CFClient::UI::VBox); 192 my $vbox = new CFClient::UI::VBox;
193
189 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 194 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
190 195
191 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 196 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
192 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
193 198
194 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 199 $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]);
195 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 200 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
196 201
197 $mode_slider->connect (changed => sub { 202 $mode_slider->connect (changed => sub {
198 my ($self, $value) = @_; 203 my ($self, $value) = @_;
199 204
… …
316 on_activate => sub { 321 on_activate => sub {
317 video_shutdown (); 322 video_shutdown ();
318 video_init (); 323 video_init ();
319 } 324 }
320 ); 325 );
326
327 $vbox
328}
329
330sub audio_setup {
331 my $vbox = new CFClient::UI::VBox;
332
333 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
334
335 my $row = 0;
321 336
322 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 337 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
323 $table->add (1, $row++, new CFClient::UI::CheckBox 338 $table->add (1, $row++, new CFClient::UI::CheckBox
324 state => $CFG->{audio_enable}, 339 state => $CFG->{audio_enable},
325 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.", 340 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.",
… …
356 audio_shutdown (); 371 audio_shutdown ();
357 audio_init (); 372 audio_init ();
358 } 373 }
359 ); 374 );
360 375
361 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 376 $vbox
362 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
363 text => $CFG->{say_command},
364 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. "
365 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
366 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
367 on_changed => sub {
368 my ($self, $value) = @_;
369 $CFG->{say_command} = $value;
370 }
371 );
372
373 $dialog
374} 377}
375 378
376sub set_stats_window_fontsize { 379sub set_stats_window_fontsize {
377 for (values %{$STATWIDS}) { 380 for (values %{$STATWIDS}) {
378 $_->set_fontsize ($::CFG->{stat_fontsize}); 381 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
387 390
388sub make_gauge_window { 391sub make_gauge_window {
389 my $gh = int $HEIGHT * $CFG->{gauge_size}; 392 my $gh = int $HEIGHT * $CFG->{gauge_size};
390 393
391 my $win = new CFClient::UI::Frame ( 394 my $win = new CFClient::UI::Frame (
392 req_x => 0, 395 force_x => 0,
393 req_y => -1, 396 force_y => "max",
394 def_w => $WIDTH, 397 force_w => $WIDTH,
395 def_h => $gh, 398 force_h => $gh,
396 ); 399 );
397 400
398 $win->add (my $hbox = new CFClient::UI::HBox 401 $win->add (my $hbox = new CFClient::UI::HBox
399 children => [ 402 children => [
400 (new CFClient::UI::HBox expand => 1), 403 (new CFClient::UI::HBox expand => 1),
… …
436 &set_gauge_window_fontsize; 439 &set_gauge_window_fontsize;
437 440
438 $win 441 $win
439} 442}
440 443
444
441sub make_stats_window { 445sub make_stats_window {
442 my $tgw = new CFClient::UI::FancyFrame 446 my $tgw = new CFClient::UI::FancyFrame
443 req_y => $HEIGHT * (2/8), 447 y => $HEIGHT * (2/8),
444 req_x => -1, 448 x => "max",
445 title => "Stats", 449 title => "Stats",
446 name => "stats_window"; 450 name => "stats_window";
447 451
448 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 452 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
449 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 453 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
450 can_hover => 1, can_events => 1, 454 can_hover => 1, can_events => 1,
451 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 455 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
550 update_stats_window ({}); 554 update_stats_window ({});
551 555
552 $tgw 556 $tgw
553} 557}
554 558
555sub formsep { 559sub formsep($) {
556 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
557} 561}
558 562
559sub update_stats_window { 563sub update_stats_window {
560 my ($stats) = @_; 564 my ($stats) = @_;
561 565
… …
623 627
624 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
625 for keys %tbl; 629 for keys %tbl;
626} 630}
627 631
628sub metaserver_dialog {
629 my $dialog = new CFClient::UI::FancyFrame
630 title => "Server List",
631 child => (my $vbox = new CFClient::UI::VBox);
632
633 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
634
635 $dialog
636}
637
638my $METASERVER_ATIME; 632my $METASERVER_ATIME;
639 633
640sub update_metaserver { 634sub update_metaserver {
641 my ($HOST) = @_;
642
643 return if $METASERVER_ATIME > time; 635 return if $METASERVER_ATIME > time;
644 $METASERVER_ATIME = time + 60; 636 $METASERVER_ATIME = time + 60;
645 637
646 my $table = $METASERVER->{table}; 638 my $table = $METASERVER->{table};
647 $table->clear; 639 $table->clear;
… …
699 691
700 $y++; 692 $y++;
701 693
702 $table->add (0, $y, new CFClient::UI::VBox children => [ 694 $table->add (0, $y, new CFClient::UI::VBox children => [
703 (new CFClient::UI::Button text => "Use", on_activate => sub { 695 (new CFClient::UI::Button text => "Use", on_activate => sub {
704 $HOST->set_text ($CFG->{host} = $host); 696 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility;
705 }), 698 }),
706 (new CFClient::UI::Empty expand => 1), 699 (new CFClient::UI::Empty expand => 1),
707 ]); 700 ]);
708 701
709 $table->add ($_ + 1, $y, new CFClient::UI::Label 702 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
712 } 705 }
713 } 706 }
714 }); 707 });
715} 708}
716 709
717sub server_setup { 710sub metaserver_dialog {
718 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 711 my $dialog = new CFClient::UI::FancyFrame
719 x => $WIDTH * (1/3), 712 title => "Server List",
720 y => $HEIGHT * (1/8), 713 name => 'metaserver_dialog',
721 name => "server_setup", 714 x => 'center',
722 title => "Server Setup", 715 y => 'center',
723 child => (my $vbox = new CFClient::UI::VBox), 716 child => (my $vbox = new CFClient::UI::VBox),
724 on_visibility_change => sub { 717 on_visibility_change => sub {
725 my ($self, $visible) = @_; 718 update_metaserver if $_[1];
726 $self->center if $visible;
727 }, 719 },
728 ; 720 ;
729 721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723
724 $dialog
725}
726
727sub server_setup {
728 my $vbox = new CFClient::UI::VBox;
729
730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
731 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 731 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
732 732
733 { 733 {
734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735 735
736 $vbox->add ( 736 $vbox->add (
737 my $HOST = new CFClient::UI::Entry 737 $HOST_ENTRY = new CFClient::UI::Entry
738 expand => 1, 738 expand => 1,
739 text => $CFG->{host}, 739 text => $CFG->{host},
740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741 on_changed => sub { 741 on_changed => sub {
742 my ($self, $value) = @_; 742 my ($self, $value) = @_;
… …
744 } 744 }
745 ); 745 );
746 746
747 $METASERVER = metaserver_dialog; 747 $METASERVER = metaserver_dialog;
748 748
749 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Button
750 expand => 1, 750 expand => 1,
751 text => "Server List", 751 text => "Server List",
752 other => $METASERVER, 752 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
754 on_open => sub { 754 on_activate => sub { $METASERVER->toggle_visibility },
755 update_metaserver $HOST;
756 }
757 ); 755 );
758 } 756 }
759 757
760 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
761 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
… …
778 } 776 }
779 ); 777 );
780 778
781 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
782 $table->add (1, 7, new CFClient::UI::Slider 780 $table->add (1, 7, new CFClient::UI::Slider
783 req_w => 100, 781 force_w => 100,
784 range => [$CFG->{mapsize}, 10, 100, 0, 1], 782 range => [$CFG->{mapsize}, 10, 100, 0, 1],
785 tooltip => "This is the size of the portion of the map update the server sends you. " 783 tooltip => "This is the size of the portion of the map update the server sends you. "
786 . "If you set this to a high value you will be able to see further, " 784 . "If you set this to a high value you will be able to see further, "
787 . "but you also increase bandwidth requirements and latency. " 785 . "but you also increase bandwidth requirements and latency. "
788 . "This option is only used once at log-in.", 786 . "This option is only used once at log-in.",
… …
828 $CONN ? stop_game 826 $CONN ? stop_game
829 : start_game; 827 : start_game;
830 }, 828 },
831 ); 829 );
832 830
833 $dialog 831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
833 text => $CFG->{say_command},
834 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. "
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub {
838 my ($self, $value) = @_;
839 $CFG->{say_command} = $value;
840 }
841 );
842
843 $vbox
834} 844}
835 845
836sub message_window { 846sub message_window {
837 my $window = new CFClient::UI::FancyFrame 847 my $window = new CFClient::UI::FancyFrame
838 name => "message_window", 848 name => "message_window",
839 title => "Messages", 849 title => "Messages",
840 border_bg => [1, 1, 1, 1], 850 border_bg => [1, 1, 1, 1],
841 bg => [0, 0, 0, 0.75], 851 bg => [0, 0, 0, 0.75],
842 req_x => -1, 852 x => "max",
843 req_y => 0, 853 y => 0,
844 def_w => int $::WIDTH / 3, 854 force_w => $::WIDTH / 3,
845 def_h => int $::HEIGHT / 5, 855 force_h => $::HEIGHT / 5,
846 child => (my $vbox = new CFClient::UI::VBox); 856 child => (my $vbox = new CFClient::UI::VBox);
847 857
848 $vbox->add ($LOGVIEW); 858 $vbox->add ($LOGVIEW);
849 859
850 $vbox->add (my $input = new CFClient::UI::Entry 860 $vbox->add (my $input = new CFClient::UI::Entry
… …
882 }, 892 },
883 ); 893 );
884 894
885 $CONSOLE = { 895 $CONSOLE = {
886 window => $window, 896 window => $window,
887 input => $input 897 input => $input,
888 }; 898 };
889 899
890 $window 900 $window
891} 901}
892 902
893sub open_quit_dialog { 903sub open_quit_dialog {
894 unless ($QUIT_DIALOG) { 904 unless ($QUIT_DIALOG) {
895 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 905 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center",
907 y => "center",
908 title => "Really Quit?",
909 ;
896 910
897 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
898 912
899 $vb->add (new CFClient::UI::Label 913 $vb->add (new CFClient::UI::Label
900 text => "You should find a savebed and apply it first!", 914 text => "You should find a savebed and apply it first!",
… …
913 on_activate => sub { exit }, 927 on_activate => sub { exit },
914 ); 928 );
915 } 929 }
916 930
917 $QUIT_DIALOG->show; 931 $QUIT_DIALOG->show;
918 $QUIT_DIALOG->center; 932}
933
934sub autopickup_setup {
935 my $vb = new CFClient::UI::VBox;
936
937 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
938 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
939 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
940 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
941
942 my $tbl = 0;
943 my $tblrow = 0;
944
945 for (
946 ["General", $gen_tbl],
947 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
948 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
949 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
950 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
951 ["Weapons", $ltbl],
952 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
953 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
954 ["Bows" => CFClient::Pickup::PU_BOW],
955 ["Arrows" => CFClient::Pickup::PU_ARROW],
956 ["Armour"],
957 ["Helmets" => CFClient::Pickup::PU_HELMET],
958 ["Shields" => CFClient::Pickup::PU_SHIELD],
959 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
960 ["Boots" => CFClient::Pickup::PU_BOOTS],
961 ["Gloves" => CFClient::Pickup::PU_GLOVES],
962 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
963 ["Readables", $rtbl],
964 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
965 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
966 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
967 ["Misc"],
968 ["Food" => CFClient::Pickup::PU_FOOD],
969 ["Drinks" => CFClient::Pickup::PU_DRINK],
970 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
971 ["Keys" => CFClient::Pickup::PU_KEY],
972 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
973 ["Potions" => CFClient::Pickup::PU_POTION],
974 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
975 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
976 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
977 )
978 {
979 if (ref $_->[1]) {
980 $tbl = $_->[1];
981 $tblrow = 0;
982 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
983 } elsif (not defined $_->[1]) {
984 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
985 } else {
986 my $mask = $_->[1];
987 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask,
990 on_changed => sub {
991 my ($box, $value) = @_;
992 if ($value) {
993 $::CFG->{pickup} |= $mask;
994 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
996 }
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
998 if defined $::CONN;
999 });
1000 }
1001 }
1002
1003 $vb
919} 1004}
920 1005
921sub make_inventory_window { 1006sub make_inventory_window {
922 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008 x => "center",
1009 y => "center",
923 def_w => $WIDTH * 7/8, 1010 force_w => $WIDTH * 9/10,
924 def_h => $HEIGHT * 7/8, 1011 force_h => $HEIGHT * 9/10,
925 title => "Inventory", 1012 title => "Inventory",
926 name => "inventory_window",
927 on_visibility_change => sub {
928 my ($self, $visible) = @_;
929 $self->center if $visible;
930 },
931 ; 1013 ;
932 1014
933 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1015 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
934 1016
935 $hb->add (my $vb1 = new CFClient::UI::VBox); 1017 $hb->add (my $vb1 = new CFClient::UI::VBox);
936 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1018 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
937 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1019 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
938 1020
939 $hb->add (my $vb2 = new CFClient::UI::VBox); 1021 $hb->add (my $vb2 = new CFClient::UI::VBox);
940 1022
1023 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1024
1025 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1026
1027 # XXX: Call after $INVR = ... because set_opencont sets the items
1028 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1029
1030 $invwin
1031}
1032
1033sub spell_setup {
1034 new CFClient::UI::SpellList
1035}
1036
1037sub keyboard_setup {
1038 my $binding_list = new CFClient::UI::VBox;
1039
1040 my $refresh;
1041 $refresh = sub {
1042 $binding_list->clear ();
1043
1044 for my $mod (keys %{$::CFG->{bindings}}) {
1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1048
1049 my $lbl = join "; ", @$cmds;
1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1051 $binding_list->add (my $hb = new CFClient::UI::HBox);
1052 $hb->add (new CFClient::UI::Button
1053 text => "delete",
1054 tooltip => "Deletes the binding",
1055 on_activate => sub {
1056 $binding_list->remove ($hb);
1057 delete $::CFG->{bindings}->{$mod}->{$sym};
1058 });
1059
1060 $hb->add (new CFClient::UI::Button
1061 text => "edit",
1062 tooltip => "Edits the binding",
1063 on_activate => sub {
1064 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1066 sub {
1067 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym};
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1070 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1072 $SETUP_DIALOG->show;
1073 },
1074 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1076 $SETUP_DIALOG->show;
1077 });
1078 $::BIND_EDITOR->show;
1079 $SETUP_DIALOG->hide;
1080 });
1081
1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1084 }
1085 }
1086 };
1087
1088 my $vb = new CFClient::UI::VBox;
1089 $vb->add ($binding_list);
941 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1090 $vb->add (my $hb = new CFClient::UI::HBox);
942 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor"); 1091
943 $hb2->add (new CFClient::UI::Button 1092 $hb->add (new CFClient::UI::Button
944 text => "Close", 1093 text => "record new",
945 tooltip => "Close the currently open container (if one is open)", 1094 expand => 1,
1095 tooltip => "This button opens the binding editor with an empty binding.",
946 on_activate => sub { 1096 on_activate => sub {
947 $CONN->send ("apply $CONN->{open_container}") 1097 $::BIND_EDITOR->set_binding (undef, undef, [],
948 if $CONN->{open_container} != 0; 1098 sub {
1099 my ($mod, $sym, $cmds) = @_;
1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1101 $refresh->();
1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show;
1104 },
1105 sub {
1106 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107 $SETUP_DIALOG->show;
1108 });
1109 $SETUP_DIALOG->hide;
1110 $::BIND_EDITOR->show;
949 }, 1111 },
950 ); 1112 );
951 1113
952 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1114 $hb->add (new CFClient::UI::Button
1115 text => "close",
1116 tooltip => "Closes the binding window",
1117 expand => 1,
1118 on_activate => sub {
1119 $SETUP_DIALOG->hide;
1120 }
1121 );
953 1122
954 $invwin 1123 $refresh->();
1124
1125 $vb
955} 1126}
956 1127
957sub make_help_window { 1128sub make_help_window {
958 my $win = new CFClient::UI::FancyFrame 1129 my $win = new CFClient::UI::FancyFrame
1130 x => 'center',
1131 y => 'center',
1132 name => 'doc_browser',
959 def_w => int $WIDTH * 7/8, 1133 force_w => int $WIDTH * 7/8,
960 def_h => int $HEIGHT * 7/8, 1134 force_h => int $HEIGHT * 7/8,
961 title => "Documentation"; 1135 title => "Documentation";
962 1136
963 $win->add (my $vbox = new CFClient::UI::VBox); 1137 $win->add (my $vbox = new CFClient::UI::VBox);
964 1138
965 $vbox->add (my $buttons = new CFClient::UI::HBox); 1139 $vbox->add (my $buttons = new CFClient::UI::HBox);
966 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
1027 if ($DEBUG_STATUS) { 1201 if ($DEBUG_STATUS) {
1028 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1202 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1029 } else { 1203 } else {
1030 # create the widgets 1204 # create the widgets
1031 1205
1032 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1206 $DEBUG_STATUS = new CFClient::UI::Label
1207 padding => 0,
1208 z => 100,
1209 force_x => "max",
1210 force_y => 0;
1033 $DEBUG_STATUS->show; 1211 $DEBUG_STATUS->show;
1034 1212
1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1214
1035 $STATUSBOX = new CFClient::UI::Statusbox; 1215 $STATUSBOX = new CFClient::UI::Statusbox;
1036 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1216 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1037 1217
1038 (new CFClient::UI::Frame 1218 (new CFClient::UI::Frame
1039 bg => [0, 0, 0, 0.4], 1219 bg => [0, 0, 0, 0.4],
1040 req_y => -1, 1220 force_x => 0,
1221 force_y => "max",
1041 child => $STATUSBOX, 1222 child => $STATUSBOX,
1042 )->show; 1223 )->show;
1043 1224
1044 CFClient::UI::FancyFrame->new ( 1225 CFClient::UI::FancyFrame->new (
1226 title => "Map",
1227 name => "mapmap",
1228 x => 0,
1229 y => $FONTSIZE + 8,
1045 border_bg => [1, 1, 1, 192/255], 1230 border_bg => [1, 1, 1, 192/255],
1046 bg => [1, 1, 1, 0], 1231 bg => [1, 1, 1, 0],
1047 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1232 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1048 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1233 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1049 ), 1234 ),
… …
1072 can_hover => 1, 1257 can_hover => 1,
1073 can_events => 1, 1258 can_events => 1,
1074 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1075 ; 1260 ;
1076 1261
1262 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1263 title => "Setup",
1264 name => "setup_dialog",
1265 x => 'center',
1266 y => 'center',
1267 force_w => $::WIDTH * 0.6,
1268 force_h => $::HEIGHT * 0.6,
1269 ;
1270
1271 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1272 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1273
1274 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1275 "Configure the server to play on, your username, password and other server-related options.");
1276 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1277 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
1278 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1279 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1280 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1281 "Configure the use of audio, sound effects and background music.");
1282 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1283 "Lets you define, edit and delete bindings."
1284 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor "
1285 . "with nothing set and the recording started. After doing the actions you "
1286 . "want to record press Insert and you will be asked to press a key-combo."
1287 . "After pressing the combo the binding will be saved automatically and the "
1288 . "binding editor closes");
1289 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1290 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1291
1077 $BUTTONBAR = new CFClient::UI::HBox; 1292 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1078 1293
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1080 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1295 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1081 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1296
1082 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1083 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1297 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1084 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1298 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1085 1299
1086 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 1300 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
1087 1301
1088 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1302 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1089 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1303 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1090 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1304 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1091 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1305 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1306 ."You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1092 1307
1093 $BUTTONBAR->add (new CFClient::UI::Button 1308 $BUTTONBAR->add (new CFClient::UI::Button
1094 text => "Save Config", 1309 text => "Save Config",
1095 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1310 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1096 on_activate => sub { 1311 on_activate => sub {
1097 $::CFG->{layout} = CFClient::UI::get_layout; 1312 $::CFG->{layout} = CFClient::UI::get_layout;
1098 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1313 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1099 status "Configuration Saved"; 1314 status "Configuration Saved";
1100 }, 1315 },
1101 ); 1316 );
1102 1317
1103 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1318 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
… …
1114 } 1329 }
1115 }, 1330 },
1116 ); 1331 );
1117 1332
1118 $BUTTONBAR->show; 1333 $BUTTONBAR->show;
1334 $SETUP_DIALOG->show;
1335 }
1119 1336
1120 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1337 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1121
1122 $SERVER_SETUP->show;
1123 }
1124} 1338}
1125 1339
1126sub video_shutdown { 1340sub video_shutdown {
1127 undef $SDL_ACTIVE; 1341 undef $SDL_ACTIVE;
1128} 1342}
… …
1195 1409
1196my %demo;#d# 1410my %demo;#d#
1197 1411
1198sub force_refresh { 1412sub force_refresh {
1199 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1413 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1200 debug sprintf "%3.2f", $fps; 1414 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201 1415
1202 $CFClient::UI::ROOT->draw; 1416 $CFClient::UI::ROOT->draw;
1203 1417
1204 $WANT_REFRESH = 0; 1418 $WANT_REFRESH = 0;
1205 $CAN_REFRESH = 0; 1419 $CAN_REFRESH = 0;
… …
1260}; 1474};
1261 1475
1262 CFClient::SDL_GL_SwapBuffers; 1476 CFClient::SDL_GL_SwapBuffers;
1263} 1477}
1264 1478
1265my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1479my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1266 $NOW = time; 1480 $NOW = time;
1267 1481
1268 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1482 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1269 for CFClient::SDL_PollEvent; 1483 for CFClient::SDL_PollEvent;
1270 1484
… …
1337############################################################################# 1551#############################################################################
1338 1552
1339$SIG{INT} = $SIG{TERM} = sub { exit }; 1553$SIG{INT} = $SIG{TERM} = sub { exit };
1340 1554
1341{ 1555{
1342 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1556 local $SIG{__DIE__} = sub {
1557 return unless defined $^S && !$^S;
1558 Carp::confess $_[1];#d#TODO: remove when stable
1559 CFClient::fatal $_[0];
1560 };
1343 1561
1344 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345 CFClient::UI::set_layout ($::CFG->{layout}); 1563 CFClient::UI::set_layout ($::CFG->{layout});
1346 1564
1347 my %DEF_CFG = ( 1565 my %DEF_CFG = (
1348 sdl_mode => 0, 1566 sdl_mode => 0,
1349 width => 640, 1567 width => 640,
… …
1427 1645
1428END { CFClient::SDL_Quit } 1646END { CFClient::SDL_Quit }
1429 1647
1430=head1 NAME 1648=head1 NAME
1431 1649
1432pclient - A Crossfire+ and Crossfire game client 1650cfplus - A Crossfire+ and Crossfire game client
1433 1651
1434=head1 SYNOPSIS 1652=head1 SYNOPSIS
1435 1653
1436Just run it - no commandline arguments are supported. 1654Just run it - no commandline arguments are supported.
1437 1655
1438=head1 USAGE 1656=head1 USAGE
1439 1657
1440Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1658cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441fullscreen and interactively. 1659fullscreen and interactively.
1442 1660
1661=head1 DEBUGGING
1662
1663
1664CFPLUS_DEBUG - environment variable
1665
1666 1 draw borders around widgets
1667 2 add low-level widget info to tooltips
1668 4 show fps
1669 8 suppress tooltips
1670
1443=head1 AUTHOR 1671=head1 AUTHOR
1444 1672
1445Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1673Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446 1674
1447 1675

Diff Legend

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