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.25 by elmex, Mon May 29 19:49:33 2006 UTC vs.
Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
47}; 49};
48 50
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 52
… …
81our $LOGVIEW; 83our $LOGVIEW;
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
86our $SERVER_SETUP; 88our $HOST_ENTRY;
89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
87 95
88our $FLOORBOX; 96our $FLOORBOX;
89our $GAUGES; 97our $GAUGES;
90our $STATWIDS; 98our $STATWIDS;
91 99
… …
101our $DEBUG_STATUS; 109our $DEBUG_STATUS;
102 110
103our $INV_WINDOW; 111our $INV_WINDOW;
104our $INV; 112our $INV;
105our $INVR; 113our $INVR;
106our $INVR_LBL; 114our $INV_RIGHT_HB;
107 115
108our $BIND_WINDOW; 116our $BIND_EDITOR;
117
118our $PICKUP_CFG;
109 119
110sub status { 120sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 121 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 122}
113 123
114sub debug { 124sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 125 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
118} 126}
119 127
120sub start_game { 128sub start_game {
121 status "logging in..."; 129 status "logging in...";
122 130
123 $LOGIN_BUTTON->set_text ("Logout"); 131 $LOGIN_BUTTON->set_text ("Logout");
124 $SERVER_SETUP->hide; 132 $SETUP_DIALOG->hide;
125 133
126 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 134 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
127 135
128 my ($host, $port) = split /:/, $CFG->{host}; 136 my ($host, $port) = split /:/, $CFG->{host};
129 137
… …
167 } 175 }
168} 176}
169 177
170sub stop_game { 178sub stop_game {
171 $LOGIN_BUTTON->set_text ("Login"); 179 $LOGIN_BUTTON->set_text ("Login");
172 $SERVER_SETUP->show; 180 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
181 $SETUP_DIALOG->show;
173 $INV_WINDOW->hide; 182 $INV_WINDOW->hide;
174 $LOGVIEW->hide;
175 183
176 return unless $CONN; 184 return unless $CONN;
177 185
178 status "connection closed"; 186 status "connection closed";
179 187
180 $CONN->destroy; 188 $CONN->destroy;
181 $CONN = 0; # false, does not autovivify 189 $CONN = 0; # false, does not autovivify
182} 190}
183 191
184sub client_setup { 192sub graphics_setup {
185 my $dialog = new CFClient::UI::FancyFrame
186 req_x => 1,
187 req_y => $HEIGHT * (1/8),
188 name => "client_setup",
189 title => "Client Setup",
190 child => (my $vbox = new CFClient::UI::VBox); 193 my $vbox = new CFClient::UI::VBox;
194
191 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
192 196
193 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 197 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
195 199
196 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 200 $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]);
197 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 201 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
198 202
199 $mode_slider->connect (changed => sub { 203 $mode_slider->connect (changed => sub {
200 my ($self, $value) = @_; 204 my ($self, $value) = @_;
201 205
… …
318 on_activate => sub { 322 on_activate => sub {
319 video_shutdown (); 323 video_shutdown ();
320 video_init (); 324 video_init ();
321 } 325 }
322 ); 326 );
327
328 $vbox
329}
330
331sub audio_setup {
332 my $vbox = new CFClient::UI::VBox;
333
334 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
335
336 my $row = 0;
323 337
324 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 338 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
325 $table->add (1, $row++, new CFClient::UI::CheckBox 339 $table->add (1, $row++, new CFClient::UI::CheckBox
326 state => $CFG->{audio_enable}, 340 state => $CFG->{audio_enable},
327 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.", 341 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.",
… …
358 audio_shutdown (); 372 audio_shutdown ();
359 audio_init (); 373 audio_init ();
360 } 374 }
361 ); 375 );
362 376
363 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 377 $vbox
364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
365 text => $CFG->{say_command},
366 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. "
367 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
368 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
369 on_changed => sub {
370 my ($self, $value) = @_;
371 $CFG->{say_command} = $value;
372 }
373 );
374
375 $dialog
376} 378}
377 379
378sub set_stats_window_fontsize { 380sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) { 381 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize}); 382 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
389 391
390sub make_gauge_window { 392sub make_gauge_window {
391 my $gh = int $HEIGHT * $CFG->{gauge_size}; 393 my $gh = int $HEIGHT * $CFG->{gauge_size};
392 394
393 my $win = new CFClient::UI::Frame ( 395 my $win = new CFClient::UI::Frame (
394 req_x => 0, 396 force_x => 0,
395 req_y => -1, 397 force_y => "max",
396 def_w => $WIDTH, 398 force_w => $WIDTH,
397 def_h => $gh, 399 force_h => $gh,
398 ); 400 );
399 401
400 $win->add (my $hbox = new CFClient::UI::HBox 402 $win->add (my $hbox = new CFClient::UI::HBox
401 children => [ 403 children => [
402 (new CFClient::UI::HBox expand => 1), 404 (new CFClient::UI::HBox expand => 1),
… …
441} 443}
442 444
443 445
444sub make_stats_window { 446sub make_stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 447 my $tgw = new CFClient::UI::FancyFrame
446 req_y => $HEIGHT * (2/8), 448 y => $HEIGHT * (2/8),
447 req_x => -1, 449 x => "max",
448 title => "Stats", 450 title => "Stats",
449 name => "stats_window"; 451 name => "stats_window";
450 452
451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 453 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
452 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 454 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453 can_hover => 1, can_events => 1, 455 can_hover => 1, can_events => 1,
454 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 456 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
553 update_stats_window ({}); 555 update_stats_window ({});
554 556
555 $tgw 557 $tgw
556} 558}
557 559
558sub formsep { 560sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 561 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560} 562}
561 563
562sub update_stats_window { 564sub update_stats_window {
563 my ($stats) = @_; 565 my ($stats) = @_;
564 566
… …
626 628
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 630 for keys %tbl;
629} 631}
630 632
631sub metaserver_dialog {
632 my $dialog = new CFClient::UI::FancyFrame
633 title => "Server List",
634 child => (my $vbox = new CFClient::UI::VBox);
635
636 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638 $dialog
639}
640
641my $METASERVER_ATIME; 633my $METASERVER_ATIME;
642 634
643sub update_metaserver { 635sub update_metaserver {
644 my ($HOST) = @_;
645
646 return if $METASERVER_ATIME > time; 636 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 637 $METASERVER_ATIME = time + 60;
648 638
649 my $table = $METASERVER->{table}; 639 my $table = $METASERVER->{table};
650 $table->clear; 640 $table->clear;
… …
702 692
703 $y++; 693 $y++;
704 694
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 695 $table->add (0, $y, new CFClient::UI::VBox children => [
706 (new CFClient::UI::Button text => "Use", on_activate => sub { 696 (new CFClient::UI::Button text => "Use", on_activate => sub {
707 $HOST->set_text ($CFG->{host} = $host); 697 $HOST_ENTRY->set_text ($CFG->{host} = $host);
698 $METASERVER->toggle_visibility;
708 }), 699 }),
709 (new CFClient::UI::Empty expand => 1), 700 (new CFClient::UI::Empty expand => 1),
710 ]); 701 ]);
711 702
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 703 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
715 } 706 }
716 } 707 }
717 }); 708 });
718} 709}
719 710
720sub server_setup { 711sub metaserver_dialog {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 712 my $dialog = new CFClient::UI::FancyFrame
722 x => $WIDTH * (1/3), 713 title => "Server List",
723 y => $HEIGHT * (1/8), 714 name => 'metaserver_dialog',
724 name => "server_setup", 715 x => 'center',
725 title => "Server Setup", 716 y => 'center',
717 z => 3,
726 child => (my $vbox = new CFClient::UI::VBox), 718 child => (my $vbox = new CFClient::UI::VBox),
727 on_visibility_change => sub { 719 on_visibility_change => sub {
728 my ($self, $visible) = @_; 720 update_metaserver if $_[1];
729 $self->center if $visible;
730 }, 721 },
731 ; 722 ;
732 723
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
725
726 $dialog
727}
728
729sub server_setup {
730 my $vbox = new CFClient::UI::VBox;
731
733 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 732 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
734 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 733 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
735 734
736 { 735 {
737 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 736 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
738 737
739 $vbox->add ( 738 $vbox->add (
740 my $HOST = new CFClient::UI::Entry 739 $HOST_ENTRY = new CFClient::UI::Entry
741 expand => 1, 740 expand => 1,
742 text => $CFG->{host}, 741 text => $CFG->{host},
743 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 742 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
744 on_changed => sub { 743 on_changed => sub {
745 my ($self, $value) = @_; 744 my ($self, $value) = @_;
… …
747 } 746 }
748 ); 747 );
749 748
750 $METASERVER = metaserver_dialog; 749 $METASERVER = metaserver_dialog;
751 750
752 $vbox->add (new CFClient::UI::Flopper 751 $vbox->add (new CFClient::UI::Button
753 expand => 1, 752 expand => 1,
754 text => "Server List", 753 text => "Server List",
755 other => $METASERVER, 754 other => $METASERVER,
756 tooltip => "Show a list of available crossfire servers", 755 tooltip => "Show a list of available crossfire servers",
757 on_open => sub { 756 on_activate => sub { $METASERVER->toggle_visibility },
758 update_metaserver $HOST;
759 }
760 ); 757 );
761 } 758 }
762 759
763 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 760 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
764 $table->add (1, 4, new CFClient::UI::Entry 761 $table->add (1, 4, new CFClient::UI::Entry
… …
781 } 778 }
782 ); 779 );
783 780
784 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 781 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
785 $table->add (1, 7, new CFClient::UI::Slider 782 $table->add (1, 7, new CFClient::UI::Slider
786 req_w => 100, 783 force_w => 100,
787 range => [$CFG->{mapsize}, 10, 100, 0, 1], 784 range => [$CFG->{mapsize}, 10, 100, 0, 1],
788 tooltip => "This is the size of the portion of the map update the server sends you. " 785 tooltip => "This is the size of the portion of the map update the server sends you. "
789 . "If you set this to a high value you will be able to see further, " 786 . "If you set this to a high value you will be able to see further, "
790 . "but you also increase bandwidth requirements and latency. " 787 . "but you also increase bandwidth requirements and latency. "
791 . "This option is only used once at log-in.", 788 . "This option is only used once at log-in.",
… …
831 $CONN ? stop_game 828 $CONN ? stop_game
832 : start_game; 829 : start_game;
833 }, 830 },
834 ); 831 );
835 832
836 $dialog 833 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
834 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
835 text => $CFG->{say_command},
836 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. "
837 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
838 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
839 on_changed => sub {
840 my ($self, $value) = @_;
841 $CFG->{say_command} = $value;
842 }
843 );
844
845 $vbox
837} 846}
838 847
839sub message_window { 848sub message_window {
840 my $window = new CFClient::UI::FancyFrame 849 my $window = new CFClient::UI::FancyFrame
841 name => "message_window", 850 name => "message_window",
842 title => "Messages", 851 title => "Messages",
843 border_bg => [1, 1, 1, 1], 852 border_bg => [1, 1, 1, 1],
844 bg => [0, 0, 0, 0.75], 853 bg => [0, 0, 0, 0.75],
845 req_x => -1, 854 x => "max",
846 req_y => 0, 855 y => 0,
847 def_w => int $::WIDTH / 3, 856 force_w => $::WIDTH / 3,
848 def_h => int $::HEIGHT / 5, 857 force_h => $::HEIGHT / 5,
849 child => (my $vbox = new CFClient::UI::VBox); 858 child => (my $vbox = new CFClient::UI::VBox);
850 859
851 $vbox->add ($LOGVIEW); 860 $vbox->add ($LOGVIEW);
852 861
853 $vbox->add (my $input = new CFClient::UI::Entry 862 $vbox->add (my $input = new CFClient::UI::Entry
… …
867 }, 876 },
868 on_activate => sub { 877 on_activate => sub {
869 my ($input, $text) = @_; 878 my ($input, $text) = @_;
870 $input->set_text (''); 879 $input->set_text ('');
871 880
872 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]);
874 } elsif ($text =~ /^\/(.*)/) { 881 if ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1); 882 $::CONN->user_send ($1);
876 } else { 883 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say'; 884 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text"); 885 $::CONN->user_send ("$say_cmd $text");
879 } 886 }
… …
887 }, 894 },
888 ); 895 );
889 896
890 $CONSOLE = { 897 $CONSOLE = {
891 window => $window, 898 window => $window,
892 input => $input 899 input => $input,
893 }; 900 };
894 901
895 $window 902 $window
896} 903}
897 904
898sub open_quit_dialog { 905sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 906 unless ($QUIT_DIALOG) {
900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 907 $QUIT_DIALOG = new CFClient::UI::FancyFrame
908 x => "center",
909 y => "center",
910 z => 50,
911 title => "Really Quit?",
912 ;
901 913
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 914 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
903 915
904 $vb->add (new CFClient::UI::Label 916 $vb->add (new CFClient::UI::Label
905 text => "You should find a savebed and apply it first!", 917 text => "You should find a savebed and apply it first!",
… …
918 on_activate => sub { exit }, 930 on_activate => sub { exit },
919 ); 931 );
920 } 932 }
921 933
922 $QUIT_DIALOG->show; 934 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center; 935}
936
937sub autopickup_setup {
938 my $table = new CFClient::UI::Table;
939
940 for (
941 ["General", 0, 0,
942 ["Enable autopickup" => PICKUP_NEWMODE],
943 ["Inhibit autopickup" => PICKUP_INHIBIT],
944 ["Stop before pickup" => PICKUP_STOP],
945 ["Debug autopickup" => PICKUP_DEBUG],
946 ],
947 ["Weapons", 0, 6,
948 ["All weapons" => PICKUP_ALLWEAPON],
949 ["Missile weapons" => PICKUP_MISSILEWEAPON],
950 ["Bows" => PICKUP_BOW],
951 ["Arrows" => PICKUP_ARROW],
952 ],
953 ["Armour", 0, 12,
954 ["Helmets" => PICKUP_HELMET],
955 ["Shields" => PICKUP_SHIELD],
956 ["Body Armour" => PICKUP_ARMOUR],
957 ["Boots" => PICKUP_BOOTS],
958 ["Gloves" => PICKUP_GLOVES],
959 ["Cloaks" => PICKUP_CLOAK],
960 ],
961
962 ["Readables", 2, 2,
963 ["Spellbooks" => PICKUP_SPELLBOOK],
964 ["Skillscrolls" => PICKUP_SKILLSCROLL],
965 ["Normal Books/Scrolls" => PICKUP_READABLES],
966 ],
967 ["Misc", 2, 7,
968 ["Food" => PICKUP_FOOD],
969 ["Drinks" => PICKUP_DRINK],
970 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
971 ["Keys" => PICKUP_KEY],
972 ["Magical Items" => PICKUP_MAGICAL],
973 ["Potions" => PICKUP_POTION],
974 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
975 ["Ignore cursed" => PICKUP_NOT_CURSED],
976 ["Jewelery" => PICKUP_JEWELS],
977 ],
978 )
979 {
980 my ($title, $x, $y, @bits) = @$_;
981 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
982
983 for (@bits) {
984 ++$y;
985
986 my $mask = $_->[1];
987 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $table->add ($x+1, $y, 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 $table
924} 1004}
925 1005
926sub make_inventory_window { 1006sub make_inventory_window {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008 x => "center",
1009 y => "center",
928 def_w => $WIDTH * 7/8, 1010 force_w => $WIDTH * 9/10,
929 def_h => $HEIGHT * 7/8, 1011 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 1012 title => "Inventory",
931 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ; 1013 ;
937 1014
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1015 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 1016
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1017 $hb->add (my $vb1 = new CFClient::UI::VBox);
941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1018 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1019 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
943 1020
944 $hb->add (my $vb2 = new CFClient::UI::VBox); 1021 $hb->add (my $vb2 = new CFClient::UI::VBox);
945 1022
946 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1023 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
947 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
948 $hb2->add (new CFClient::UI::Button
949 text => "Close",
950 tooltip => "Close the currently open container (if one is open)",
951 on_activate => sub {
952 $CONN->send ("apply $CONN->{open_container}")
953 if $CONN->{open_container} != 0;
954 },
955 );
956 1024
957 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1025 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
958 1026
1027 # XXX: Call after $INVR = ... because set_opencont sets the items
1028 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1029
959 $invwin 1030 $invwin
960} 1031}
961 1032
962sub make_binding_window { 1033sub spell_setup {
1034 new CFClient::UI::SpellList
1035}
1036
1037sub keyboard_setup {
963 my $binding_list = new CFClient::UI::VBox; 1038 my $binding_list = new CFClient::UI::VBox;
964 1039
1040 my $refresh;
965 my $refresh = sub { 1041 $refresh = sub {
966 $binding_list->clear (); 1042 $binding_list->clear ();
967 1043
968 for my $mod (keys %{$::CFG->{bindings}}) { 1044 for my $mod (keys %{$::CFG->{bindings}}) {
969 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
970 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
971 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
972 1048
973 my $lbl = join "; ", @$cmds; 1049 my $lbl = join "; ", @$cmds;
974 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
975 $binding_list->add (my $hb = new CFClient::UI::HBox); 1051 $binding_list->add (my $hb = new CFClient::UI::HBox);
976 $hb->add (new CFClient::UI::Button 1052 $hb->add (new CFClient::UI::Button
977 text => "delete", 1053 text => "delete",
1054 tooltip => "Deletes the binding",
978 on_activate => sub { 1055 on_activate => sub {
979 $binding_list->remove ($hb); 1056 $binding_list->remove ($hb);
980 delete $::CFG->{bindings}->{$mod}->{$sym}; 1057 delete $::CFG->{bindings}->{$mod}->{$sym};
981 }); 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
982 $hb->add (new CFClient::UI::Label text => "($nam)"); 1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
983 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
984 } 1084 }
985 } 1085 }
986 }; 1086 };
987 1087
988 $BIND_WINDOW = new CFClient::UI::FancyFrame 1088 my $vb = new CFClient::UI::VBox;
989 title => "Bindings", 1089 $vb->add ($binding_list);
990 def_w => int $WIDTH * 7/8, 1090 $vb->add (my $hb = new CFClient::UI::HBox);
991 def_h => int $HEIGHT * 7/8, 1091
992 on_visibility_change => sub { 1092 $hb->add (new CFClient::UI::Button
993 my ($self, $visible) = @_; 1093 text => "record new",
994 if ($visible) { 1094 expand => 1,
995 $self->center; 1095 tooltip => "This button opens the binding editor with an empty binding.",
1096 on_activate => sub {
1097 $::BIND_EDITOR->set_binding (undef, undef, [],
1098 sub {
1099 my ($mod, $sym, $cmds) = @_;
1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
996 $refresh->() 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 },
997 } 1109 );
1110 $SETUP_DIALOG->hide;
1111 $::BIND_EDITOR->show;
1112 },
1113 );
1114
1115 $hb->add (new CFClient::UI::Button
1116 text => "close",
1117 tooltip => "Closes the binding window",
1118 expand => 1,
1119 on_activate => sub {
1120 $SETUP_DIALOG->hide;
998 }; 1121 }
1122 );
999 1123
1000 $BIND_WINDOW->add ($binding_list);
1001 $refresh->(); 1124 $refresh->();
1002 $BIND_WINDOW 1125
1126 $vb
1003} 1127}
1004 1128
1005sub make_help_window { 1129sub make_help_window {
1006 my $win = new CFClient::UI::FancyFrame 1130 my $win = new CFClient::UI::FancyFrame
1131 x => 'center',
1132 y => 'center',
1133 z => 2,
1134 name => 'doc_browser',
1007 def_w => int $WIDTH * 7/8, 1135 force_w => int $WIDTH * 7/8,
1008 def_h => int $HEIGHT * 7/8, 1136 force_h => int $HEIGHT * 7/8,
1009 title => "Documentation"; 1137 title => "Documentation";
1010 1138
1011 $win->add (my $vbox = new CFClient::UI::VBox); 1139 $win->add (my $vbox = new CFClient::UI::VBox);
1012 1140
1013 $vbox->add (my $buttons = new CFClient::UI::HBox); 1141 $vbox->add (my $buttons = new CFClient::UI::HBox);
1014 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1142 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
1022 my ($pod, $label) = @$_; 1150 my ($pod, $label) = @$_;
1023 1151
1024 $buttons->add (new CFClient::UI::Button 1152 $buttons->add (new CFClient::UI::Button
1025 text => $label, 1153 text => $label,
1026 on_activate => sub { 1154 on_activate => sub {
1027 my $parser = new Pod::POM; 1155 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1028 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1156 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1029 1157
1030 $viewer->clear; 1158 $viewer->clear;
1031 1159
1032 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1160 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1033 for @{ CFClient::pod_to_pango_list $pom }; 1161 for @$pom;
1034 1162
1035 $viewer->set_offset (0); 1163 $viewer->set_offset (0);
1036 }, 1164 },
1037 ); 1165 );
1038 } 1166 }
… …
1075 if ($DEBUG_STATUS) { 1203 if ($DEBUG_STATUS) {
1076 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1204 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1077 } else { 1205 } else {
1078 # create the widgets 1206 # create the widgets
1079 1207
1080 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1208 $DEBUG_STATUS = new CFClient::UI::Label
1209 padding => 0,
1210 z => 100,
1211 force_x => "max",
1212 force_y => 0;
1081 $DEBUG_STATUS->show; 1213 $DEBUG_STATUS->show;
1082 1214
1215 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1216
1083 $STATUSBOX = new CFClient::UI::Statusbox; 1217 $STATUSBOX = new CFClient::UI::Statusbox;
1084 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1218 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1085 1219
1086 (new CFClient::UI::Frame 1220 (new CFClient::UI::Frame
1087 bg => [0, 0, 0, 0.4], 1221 bg => [0, 0, 0, 0.4],
1088 req_y => -1, 1222 force_x => 0,
1223 force_y => "max",
1089 child => $STATUSBOX, 1224 child => $STATUSBOX,
1090 )->show; 1225 )->show;
1091 1226
1092 CFClient::UI::FancyFrame->new ( 1227 CFClient::UI::FancyFrame->new (
1228 title => "Map",
1229 name => "mapmap",
1230 x => 0,
1231 y => $FONTSIZE + 8,
1093 border_bg => [1, 1, 1, 192/255], 1232 border_bg => [1, 1, 1, 192/255],
1094 bg => [1, 1, 1, 0], 1233 bg => [1, 1, 1, 0],
1095 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1234 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1096 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1235 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1097 ), 1236 ),
… …
1120 can_hover => 1, 1259 can_hover => 1,
1121 can_events => 1, 1260 can_events => 1,
1122 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1261 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1123 ; 1262 ;
1124 1263
1125 $BUTTONBAR = new CFClient::UI::HBox; 1264 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1265 title => "Setup",
1266 name => "setup_dialog",
1267 x => 'center',
1268 y => 'center',
1269 z => 2,
1270 force_w => $::WIDTH * 0.6,
1271 force_h => $::HEIGHT * 0.6,
1272 ;
1126 1273
1274 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1275 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1276
1277 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1278 "Configure the server to play on, your username, password and other server-related options.");
1279 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1280 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1281 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1282 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1283 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1284 "Configure the use of audio, sound effects and background music.");
1285 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1286 "Lets you define, edit and delete bindings."
1287 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1288 . "with nothing set and the recording started. After doing the actions you "
1289 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1290 . "After pressing the combo the binding will be saved automatically and the "
1291 . "binding editor closes");
1292 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1293 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1294
1295 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1296
1127 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1297 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1128 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1298 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1129 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1299
1130 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1131 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1300 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1132 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1301 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1133 1302
1134 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 1303 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
1135 1304
1136 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1137 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1306 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1138 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1307 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1139 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1308 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1309 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1140 1310
1141 $BUTTONBAR->add (new CFClient::UI::Button 1311 $BUTTONBAR->add (new CFClient::UI::Button
1142 text => "Save Config", 1312 text => "Save Config",
1143 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1313 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1144 on_activate => sub { 1314 on_activate => sub {
1145 $::CFG->{layout} = CFClient::UI::get_layout; 1315 $::CFG->{layout} = CFClient::UI::get_layout;
1146 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1316 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1147 status "Configuration Saved"; 1317 status "Configuration Saved";
1148 }, 1318 },
1149 ); 1319 );
1150 1320
1151 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1321 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1152 tooltip => "View Documentation"); 1322 tooltip => "View Documentation");
1153
1154 $BUTTONBAR->add (new CFClient::UI::Flopper
1155 text => "Bindings",
1156 other => make_binding_window,
1157 tooltip => "Lets you delete bindings you have made with the recorder"
1158 );
1159 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1160 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1161 1323
1162 $BUTTONBAR->add (new CFClient::UI::Button 1324 $BUTTONBAR->add (new CFClient::UI::Button
1163 text => "Quit", 1325 text => "Quit",
1164 tooltip => "Terminates the program", 1326 tooltip => "Terminates the program",
1165 on_activate => sub { 1327 on_activate => sub {
… …
1170 } 1332 }
1171 }, 1333 },
1172 ); 1334 );
1173 1335
1174 $BUTTONBAR->show; 1336 $BUTTONBAR->show;
1337 $SETUP_DIALOG->show;
1338 }
1175 1339
1176 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1340 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1177
1178 $SERVER_SETUP->show;
1179 }
1180} 1341}
1181 1342
1182sub video_shutdown { 1343sub video_shutdown {
1183 undef $SDL_ACTIVE; 1344 undef $SDL_ACTIVE;
1184} 1345}
… …
1251 1412
1252my %demo;#d# 1413my %demo;#d#
1253 1414
1254sub force_refresh { 1415sub force_refresh {
1255 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1416 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1256 debug sprintf "%3.2f", $fps; 1417 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1257 1418
1258 $CFClient::UI::ROOT->draw; 1419 $CFClient::UI::ROOT->draw;
1259 1420
1260 $WANT_REFRESH = 0; 1421 $WANT_REFRESH = 0;
1261 $CAN_REFRESH = 0; 1422 $CAN_REFRESH = 0;
… …
1316}; 1477};
1317 1478
1318 CFClient::SDL_GL_SwapBuffers; 1479 CFClient::SDL_GL_SwapBuffers;
1319} 1480}
1320 1481
1321my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1482my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1322 $NOW = time; 1483 $NOW = time;
1323 1484
1324 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1485 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1325 for CFClient::SDL_PollEvent; 1486 for CFClient::SDL_PollEvent;
1326 1487
… …
1393############################################################################# 1554#############################################################################
1394 1555
1395$SIG{INT} = $SIG{TERM} = sub { exit }; 1556$SIG{INT} = $SIG{TERM} = sub { exit };
1396 1557
1397{ 1558{
1398 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1559 local $SIG{__DIE__} = sub {
1560 return unless defined $^S && !$^S;
1561 Carp::confess $_[1];#d#TODO: remove when stable
1562 CFClient::fatal $_[0];
1563 };
1399 1564
1400 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1565 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1401 CFClient::UI::set_layout ($::CFG->{layout}); 1566 CFClient::UI::set_layout ($::CFG->{layout});
1402 1567
1403 my %DEF_CFG = ( 1568 my %DEF_CFG = (
1404 sdl_mode => 0, 1569 sdl_mode => 0,
1405 width => 640, 1570 width => 640,
… …
1483 1648
1484END { CFClient::SDL_Quit } 1649END { CFClient::SDL_Quit }
1485 1650
1486=head1 NAME 1651=head1 NAME
1487 1652
1488pclient - A Crossfire+ and Crossfire game client 1653cfplus - A Crossfire+ and Crossfire game client
1489 1654
1490=head1 SYNOPSIS 1655=head1 SYNOPSIS
1491 1656
1492Just run it - no commandline arguments are supported. 1657Just run it - no commandline arguments are supported.
1493 1658
1494=head1 USAGE 1659=head1 USAGE
1495 1660
1496Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1661cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1497fullscreen and interactively. 1662fullscreen and interactively.
1498 1663
1664=head1 DEBUGGING
1665
1666
1667CFPLUS_DEBUG - environment variable
1668
1669 1 draw borders around widgets
1670 2 add low-level widget info to tooltips
1671 4 show fps
1672 8 suppress tooltips
1673
1499=head1 AUTHOR 1674=head1 AUTHOR
1500 1675
1501Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1676Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1502 1677
1503 1678

Diff Legend

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