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.19 by elmex, Sat May 27 21:15:57 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;
87our $HOST_ENTRY;
88
89our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK;
91our $SETUP_SERVER;
92our $SETUP_KEYBOARD;
93our $SETUP_SPELLS;
86 94
87our $FLOORBOX; 95our $FLOORBOX;
88our $GAUGES; 96our $GAUGES;
89our $STATWIDS; 97our $STATWIDS;
90 98
… …
97 105
98our $ALT_ENTER_MESSAGE; 106our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 107our $STATUSBOX;
100our $DEBUG_STATUS; 108our $DEBUG_STATUS;
101 109
110our $INV_WINDOW;
102our $INV; 111our $INV;
103our $INVR; 112our $INVR;
104our $INVR_LBL; 113our $INV_RIGHT_HB;
114
115our $BIND_EDITOR;
116
117our $PICKUP_CFG;
105 118
106sub status { 119sub status {
107 $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]);
108} 121}
109 122
110sub debug { 123sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 124 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request;
113 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 125}
115 126
116sub start_game { 127sub start_game {
117 status "logging in..."; 128 status "logging in...";
129
130 $LOGIN_BUTTON->set_text ("Logout");
131 $SETUP_DIALOG->hide;
118 132
119 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;
120 134
121 my ($host, $port) = split /:/, $CFG->{host}; 135 my ($host, $port) = split /:/, $CFG->{host};
122 136
… …
151 }; 165 };
152 166
153 if ($CONN) { 167 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 168 CFClient::lowdelay fileno $CONN->{fh};
155 169
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 170 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 171 } else {
163 status "unable to connect"; 172 status "unable to connect";
164 stop_game(); 173 stop_game();
165 } 174 }
166} 175}
167 176
168sub stop_game { 177sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login");
179 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide;
181 $LOGVIEW->hide;
182
169 return unless $CONN; 183 return unless $CONN;
170 184
171 status "connection closed"; 185 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 186
173 $CONN->destroy; 187 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 188 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 189}
179 190
180sub client_setup { 191sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame
182 req_x => 1,
183 req_y => $HEIGHT * (1/8),
184 name => "client_setup",
185 title => "Client Setup",
186 child => (my $vbox = new CFClient::UI::VBox); 192 my $vbox = new CFClient::UI::VBox;
193
187 $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]);
188 195
189 $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");
190 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191 198
192 $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]);
193 $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");
194 201
195 $mode_slider->connect (changed => sub { 202 $mode_slider->connect (changed => sub {
196 my ($self, $value) = @_; 203 my ($self, $value) = @_;
197 204
… …
314 on_activate => sub { 321 on_activate => sub {
315 video_shutdown (); 322 video_shutdown ();
316 video_init (); 323 video_init ();
317 } 324 }
318 ); 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;
319 336
320 $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");
321 $table->add (1, $row++, new CFClient::UI::CheckBox 338 $table->add (1, $row++, new CFClient::UI::CheckBox
322 state => $CFG->{audio_enable}, 339 state => $CFG->{audio_enable},
323 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.",
… …
354 audio_shutdown (); 371 audio_shutdown ();
355 audio_init (); 372 audio_init ();
356 } 373 }
357 ); 374 );
358 375
359 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 376 $vbox
360 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
361 text => $CFG->{say_command},
362 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. "
363 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
364 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
365 on_changed => sub {
366 my ($self, $value) = @_;
367 $CFG->{say_command} = $value;
368 }
369 );
370
371 $dialog
372} 377}
373 378
374sub set_stats_window_fontsize { 379sub set_stats_window_fontsize {
375 for (values %{$STATWIDS}) { 380 for (values %{$STATWIDS}) {
376 $_->set_fontsize ($::CFG->{stat_fontsize}); 381 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
385 390
386sub make_gauge_window { 391sub make_gauge_window {
387 my $gh = int $HEIGHT * $CFG->{gauge_size}; 392 my $gh = int $HEIGHT * $CFG->{gauge_size};
388 393
389 my $win = new CFClient::UI::Frame ( 394 my $win = new CFClient::UI::Frame (
390 req_y => -1, 395 force_x => 0,
396 force_y => "max",
391 user_w => $WIDTH, 397 force_w => $WIDTH,
392 user_h => $gh, 398 force_h => $gh,
393 ); 399 );
394 400
395 $win->add (my $hbox = new CFClient::UI::HBox 401 $win->add (my $hbox = new CFClient::UI::HBox
396 children => [ 402 children => [
397 (new CFClient::UI::HBox expand => 1), 403 (new CFClient::UI::HBox expand => 1),
… …
433 &set_gauge_window_fontsize; 439 &set_gauge_window_fontsize;
434 440
435 $win 441 $win
436} 442}
437 443
444
438sub make_stats_window { 445sub make_stats_window {
439 my $tgw = new CFClient::UI::FancyFrame 446 my $tgw = new CFClient::UI::FancyFrame
440 req_y => $HEIGHT * (2/8), 447 y => $HEIGHT * (2/8),
441 req_x => -1, 448 x => "max",
442 title => "Stats", 449 title => "Stats",
443 name => "stats_window"; 450 name => "stats_window";
444 451
445 $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);
446 $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,
447 can_hover => 1, can_events => 1, 454 can_hover => 1, can_events => 1,
448 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.");
… …
547 update_stats_window ({}); 554 update_stats_window ({});
548 555
549 $tgw 556 $tgw
550} 557}
551 558
552sub formsep { 559sub formsep($) {
553 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
554} 561}
555 562
556sub update_stats_window { 563sub update_stats_window {
557 my ($stats) = @_; 564 my ($stats) = @_;
558 565
… …
620 627
621 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
622 for keys %tbl; 629 for keys %tbl;
623} 630}
624 631
625sub metaserver_dialog {
626 my $dialog = new CFClient::UI::FancyFrame
627 title => "Server List",
628 child => (my $vbox = new CFClient::UI::VBox);
629
630 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
631
632 $dialog
633}
634
635my $METASERVER_ATIME; 632my $METASERVER_ATIME;
636 633
637sub update_metaserver { 634sub update_metaserver {
638 my ($HOST) = @_;
639
640 return if $METASERVER_ATIME > time; 635 return if $METASERVER_ATIME > time;
641 $METASERVER_ATIME = time + 60; 636 $METASERVER_ATIME = time + 60;
642 637
643 my $table = $METASERVER->{table}; 638 my $table = $METASERVER->{table};
644 $table->clear; 639 $table->clear;
… …
696 691
697 $y++; 692 $y++;
698 693
699 $table->add (0, $y, new CFClient::UI::VBox children => [ 694 $table->add (0, $y, new CFClient::UI::VBox children => [
700 (new CFClient::UI::Button text => "Use", on_activate => sub { 695 (new CFClient::UI::Button text => "Use", on_activate => sub {
701 $HOST->set_text ($CFG->{host} = $host); 696 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility;
702 }), 698 }),
703 (new CFClient::UI::Empty expand => 1), 699 (new CFClient::UI::Empty expand => 1),
704 ]); 700 ]);
705 701
706 $table->add ($_ + 1, $y, new CFClient::UI::Label 702 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
709 } 705 }
710 } 706 }
711 }); 707 });
712} 708}
713 709
710sub metaserver_dialog {
711 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List",
713 name => 'metaserver_dialog',
714 x => 'center',
715 y => 'center',
716 child => (my $vbox = new CFClient::UI::VBox),
717 on_visibility_change => sub {
718 update_metaserver if $_[1];
719 },
720 ;
721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723
724 $dialog
725}
726
714sub server_setup { 727sub server_setup {
715 my $dialog = new CFClient::UI::FancyFrame 728 my $vbox = new CFClient::UI::VBox;
716 x => $WIDTH * (1/3),
717 y => $HEIGHT * (1/8),
718 name => "server_setup",
719 title => "Server Setup",
720 child => (my $vbox = new CFClient::UI::VBox),
721 on_visibility_change => sub {
722 $_[0]->show_centered if $_[1]
723 };
724 729
725 $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]);
726 $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");
727 732
728 { 733 {
729 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
730 735
731 $vbox->add ( 736 $vbox->add (
732 my $HOST = new CFClient::UI::Entry 737 $HOST_ENTRY = new CFClient::UI::Entry
733 expand => 1, 738 expand => 1,
734 text => $CFG->{host}, 739 text => $CFG->{host},
735 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",
736 on_changed => sub { 741 on_changed => sub {
737 my ($self, $value) = @_; 742 my ($self, $value) = @_;
… …
739 } 744 }
740 ); 745 );
741 746
742 $METASERVER = metaserver_dialog; 747 $METASERVER = metaserver_dialog;
743 748
744 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Button
745 expand => 1, 750 expand => 1,
746 text => "Server List", 751 text => "Server List",
747 other => $METASERVER, 752 other => $METASERVER,
748 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
749 on_open => sub { 754 on_activate => sub { $METASERVER->toggle_visibility },
750 update_metaserver $HOST;
751 }
752 ); 755 );
753 } 756 }
754 757
755 $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");
756 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
… …
773 } 776 }
774 ); 777 );
775 778
776 $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");
777 $table->add (1, 7, new CFClient::UI::Slider 780 $table->add (1, 7, new CFClient::UI::Slider
778 req_w => 100, 781 force_w => 100,
779 range => [$CFG->{mapsize}, 10, 100, 0, 1], 782 range => [$CFG->{mapsize}, 10, 100, 0, 1],
780 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. "
781 . "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, "
782 . "but you also increase bandwidth requirements and latency. " 785 . "but you also increase bandwidth requirements and latency. "
783 . "This option is only used once at log-in.", 786 . "This option is only used once at log-in.",
… …
823 $CONN ? stop_game 826 $CONN ? stop_game
824 : start_game; 827 : start_game;
825 }, 828 },
826 ); 829 );
827 830
828 $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
829} 844}
830 845
831sub message_window { 846sub message_window {
832 my $window = new CFClient::UI::FancyFrame 847 my $window = new CFClient::UI::FancyFrame
833 name => "message_window", 848 name => "message_window",
834 title => "Messages", 849 title => "Messages",
835 border_bg => [1, 1, 1, 1], 850 border_bg => [1, 1, 1, 1],
836 bg => [0, 0, 0, 0.75], 851 bg => [0, 0, 0, 0.75],
837 req_x => -1, 852 x => "max",
853 y => 0,
838 user_w => int $::WIDTH / 3, 854 force_w => $::WIDTH / 3,
839 user_h => int $::HEIGHT / 5, 855 force_h => $::HEIGHT / 5,
840 child => (my $vbox = new CFClient::UI::VBox); 856 child => (my $vbox = new CFClient::UI::VBox);
841 857
842 $vbox->add ($LOGVIEW); 858 $vbox->add ($LOGVIEW);
843 859
844 $vbox->add (my $input = new CFClient::UI::Entry 860 $vbox->add (my $input = new CFClient::UI::Entry
… …
876 }, 892 },
877 ); 893 );
878 894
879 $CONSOLE = { 895 $CONSOLE = {
880 window => $window, 896 window => $window,
881 input => $input 897 input => $input,
882 }; 898 };
883 899
884 $window 900 $window
885} 901}
886 902
887sub open_quit_dialog { 903sub open_quit_dialog {
888 unless ($QUIT_DIALOG) { 904 unless ($QUIT_DIALOG) {
889
890 $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 ;
891 910
892 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
893 912
894 $vb->add (new CFClient::UI::Label 913 $vb->add (new CFClient::UI::Label
895 text => "You should find a savebed and apply it first!", 914 text => "You should find a savebed and apply it first!",
… …
905 $hb->add (new CFClient::UI::Button 924 $hb->add (new CFClient::UI::Button
906 text => "Quit anyway", 925 text => "Quit anyway",
907 expand => 1, 926 expand => 1,
908 on_activate => sub { exit }, 927 on_activate => sub { exit },
909 ); 928 );
929 }
910 930
911 $QUIT_DIALOG->show_centered; 931 $QUIT_DIALOG->show;
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);
912 } else { 985 } else {
913 $QUIT_DIALOG->show_centered; 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 }
914 } 1001 }
1002
1003 $vb
915} 1004}
916 1005
917sub make_inventory_window { 1006sub make_inventory_window {
918 my $invwin = new CFClient::UI::FancyFrame 1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008 x => "center",
1009 y => "center",
919 user_w => $WIDTH * (7/8), 1010 force_w => $WIDTH * 9/10,
920 user_h => $HEIGHT * (7/8), 1011 force_h => $HEIGHT * 9/10,
921 title => "Inventory", 1012 title => "Inventory",
922 name => "inventory_window", 1013 ;
923 on_visibility_change => sub {
924 $_[0]->show_centered if $_[1]
925 };
926 1014
927 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1015 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
928 1016
929 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1017 $hb->add (my $vb1 = new CFClient::UI::VBox);
930 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1018 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
931 $lbl->set_text ("Player");
932 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1019 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
933 1020
934 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1021 $hb->add (my $vb2 = new CFClient::UI::VBox);
935 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);
936 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1090 $vb->add (my $hb = new CFClient::UI::HBox);
937 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1); 1091
938 $hb2->add (new CFClient::UI::Button 1092 $hb->add (new CFClient::UI::Button
939 text => "Close", 1093 text => "record new",
940 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.",
941 on_activate => sub { 1096 on_activate => sub {
942 $CONN->send ("apply $CONN->{open_container}") 1097 $::BIND_EDITOR->set_binding (undef, undef, [],
943 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;
944 }, 1111 },
945 ); 1112 );
946 1113
947 $INVR_LBL->set_text ("Floor"); 1114 $hb->add (new CFClient::UI::Button
948 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1115 text => "close",
1116 tooltip => "Closes the binding window",
1117 expand => 1,
1118 on_activate => sub {
1119 $SETUP_DIALOG->hide;
1120 }
1121 );
949 1122
950 $invwin 1123 $refresh->();
1124
1125 $vb
951} 1126}
952 1127
953sub make_help_window { 1128sub make_help_window {
954 my $win = new CFClient::UI::FancyFrame 1129 my $win = new CFClient::UI::FancyFrame
955 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1130 x => 'center',
1131 y => 'center',
1132 name => 'doc_browser',
1133 force_w => int $WIDTH * 7/8,
1134 force_h => int $HEIGHT * 7/8,
1135 title => "Documentation";
956 1136
957 $win->add (my $vbox = new CFClient::UI::VBox); 1137 $win->add (my $vbox = new CFClient::UI::VBox);
958 1138
959 $vbox->add (my $buttons = new CFClient::UI::HBox); 1139 $vbox->add (my $buttons = new CFClient::UI::HBox);
960 $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);
… …
1021 if ($DEBUG_STATUS) { 1201 if ($DEBUG_STATUS) {
1022 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1202 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1023 } else { 1203 } else {
1024 # create the widgets 1204 # create the widgets
1025 1205
1026 $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;
1027 $DEBUG_STATUS->show; 1211 $DEBUG_STATUS->show;
1028 1212
1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1214
1029 $STATUSBOX = new CFClient::UI::Statusbox; 1215 $STATUSBOX = new CFClient::UI::Statusbox;
1030 $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]);
1031 1217
1032 (new CFClient::UI::Frame 1218 (new CFClient::UI::Frame
1033 bg => [0, 0, 0, 0.4], 1219 bg => [0, 0, 0, 0.4],
1034 req_y => -1, 1220 force_x => 0,
1221 force_y => "max",
1035 child => $STATUSBOX, 1222 child => $STATUSBOX,
1036 )->show; 1223 )->show;
1037 1224
1038 CFClient::UI::FancyFrame->new ( 1225 CFClient::UI::FancyFrame->new (
1226 title => "Map",
1227 name => "mapmap",
1228 x => 0,
1229 y => $FONTSIZE + 8,
1039 border_bg => [1, 1, 1, 192/255], 1230 border_bg => [1, 1, 1, 192/255],
1040 bg => [1, 1, 1, 0], 1231 bg => [1, 1, 1, 0],
1041 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1232 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1042 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.",
1043 ), 1234 ),
… …
1066 can_hover => 1, 1257 can_hover => 1,
1067 can_events => 1, 1258 can_events => 1,
1068 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.",
1069 ; 1260 ;
1070 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
1071 $BUTTONBAR = new CFClient::UI::HBox; 1292 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1072 1293
1073 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1074 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.");
1075 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1296
1076 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1077 $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,
1078 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.");
1079 1299
1080 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
1081 1301
1082 $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,
1083 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.");
1084 $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,
1085 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.");
1086 1307
1087 $BUTTONBAR->add (new CFClient::UI::Button 1308 $BUTTONBAR->add (new CFClient::UI::Button
1088 text => "Save Config", 1309 text => "Save Config",
1089 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.",
1090 on_activate => sub { 1311 on_activate => sub {
1091 $::CFG->{layout} = CFClient::UI::get_layout; 1312 $::CFG->{layout} = CFClient::UI::get_layout;
1092 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1313 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1093 status "Configuration Saved"; 1314 status "Configuration Saved";
1094 }, 1315 },
1095 ); 1316 );
1096 1317
1097 $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,
… …
1108 } 1329 }
1109 }, 1330 },
1110 ); 1331 );
1111 1332
1112 $BUTTONBAR->show; 1333 $BUTTONBAR->show;
1334 $SETUP_DIALOG->show;
1335 }
1113 1336
1114 $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]);
1115
1116 # delay till geometry is constant
1117 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1118 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1119 my $widget = $GAUGES->{win};
1120 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1121 });
1122 force_refresh ();
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