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

Diff Legend

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