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.34 by elmex, Tue May 30 14:35:09 2006 UTC

… …
101our $DEBUG_STATUS; 101our $DEBUG_STATUS;
102 102
103our $INV_WINDOW; 103our $INV_WINDOW;
104our $INV; 104our $INV;
105our $INVR; 105our $INVR;
106our $INVR_LBL; 106our $INV_RIGHT_HB;
107 107
108our $BIND_WINDOW; 108our $BIND_WINDOW;
109our $BIND_EDITOR;
109 110
110sub status { 111sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 112 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 113}
113 114
114sub debug { 115sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 116 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
118} 117}
119 118
120sub start_game { 119sub start_game {
121 status "logging in..."; 120 status "logging in...";
122 121
… …
181 $CONN = 0; # false, does not autovivify 180 $CONN = 0; # false, does not autovivify
182} 181}
183 182
184sub client_setup { 183sub client_setup {
185 my $dialog = new CFClient::UI::FancyFrame 184 my $dialog = new CFClient::UI::FancyFrame
186 req_x => 1, 185 x => 1,
187 req_y => $HEIGHT * (1/8), 186 y => $HEIGHT * (1/8),
188 name => "client_setup", 187 name => "client_setup",
189 title => "Client Setup", 188 title => "Client Setup",
190 child => (my $vbox = new CFClient::UI::VBox); 189 child => (my $vbox = new CFClient::UI::VBox);
190
191 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 191 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
192 192
193 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 193 $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); 194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
195 195
196 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 196 $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"); 197 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
198 198
199 $mode_slider->connect (changed => sub { 199 $mode_slider->connect (changed => sub {
200 my ($self, $value) = @_; 200 my ($self, $value) = @_;
201 201
… …
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.");
… …
717 }); 717 });
718} 718}
719 719
720sub server_setup { 720sub server_setup {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
722 x => $WIDTH * (1/3), 722 x => "center",
723 y => $HEIGHT * (1/8), 723 y => "center",
724 name => "server_setup", 724 name => "server_setup",
725 title => "Server Setup", 725 title => "Server Setup",
726 child => (my $vbox = new CFClient::UI::VBox), 726 child => (my $vbox = new CFClient::UI::VBox),
727 on_visibility_change => sub {
728 my ($self, $visible) = @_;
729 $self->center if $visible;
730 },
731 ; 727 ;
732 728
733 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 729 $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"); 730 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
735 731
… …
781 } 777 }
782 ); 778 );
783 779
784 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 780 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
785 $table->add (1, 7, new CFClient::UI::Slider 781 $table->add (1, 7, new CFClient::UI::Slider
786 req_w => 100, 782 force_w => 100,
787 range => [$CFG->{mapsize}, 10, 100, 0, 1], 783 range => [$CFG->{mapsize}, 10, 100, 0, 1],
788 tooltip => "This is the size of the portion of the map update the server sends you. " 784 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, " 785 . "If you set this to a high value you will be able to see further, "
790 . "but you also increase bandwidth requirements and latency. " 786 . "but you also increase bandwidth requirements and latency. "
791 . "This option is only used once at log-in.", 787 . "This option is only used once at log-in.",
… …
840 my $window = new CFClient::UI::FancyFrame 836 my $window = new CFClient::UI::FancyFrame
841 name => "message_window", 837 name => "message_window",
842 title => "Messages", 838 title => "Messages",
843 border_bg => [1, 1, 1, 1], 839 border_bg => [1, 1, 1, 1],
844 bg => [0, 0, 0, 0.75], 840 bg => [0, 0, 0, 0.75],
845 req_x => -1, 841 x => "max",
846 req_y => 0, 842 y => 0,
847 def_w => int $::WIDTH / 3, 843 force_w => $::WIDTH / 3,
848 def_h => int $::HEIGHT / 5, 844 force_h => $::HEIGHT / 5,
849 child => (my $vbox = new CFClient::UI::VBox); 845 child => (my $vbox = new CFClient::UI::VBox);
850 846
851 $vbox->add ($LOGVIEW); 847 $vbox->add ($LOGVIEW);
852 848
853 $vbox->add (my $input = new CFClient::UI::Entry 849 $vbox->add (my $input = new CFClient::UI::Entry
… …
868 on_activate => sub { 864 on_activate => sub {
869 my ($input, $text) = @_; 865 my ($input, $text) = @_;
870 $input->set_text (''); 866 $input->set_text ('');
871 867
872 if ($text =~ /^\/bind\s+(.*)$/) { 868 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]); 869 CFClient::Binder::open_binding_dialog (sub {
870 my ($mod, $sym) = @_;
871 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
872 });
874 } elsif ($text =~ /^\/(.*)/) { 873 } elsif ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1); 874 $::CONN->user_send ($1);
876 } else { 875 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say'; 876 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text"); 877 $::CONN->user_send ("$say_cmd $text");
… …
887 }, 886 },
888 ); 887 );
889 888
890 $CONSOLE = { 889 $CONSOLE = {
891 window => $window, 890 window => $window,
892 input => $input 891 input => $input,
893 }; 892 };
894 893
895 $window 894 $window
896} 895}
897 896
898sub open_quit_dialog { 897sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 898 unless ($QUIT_DIALOG) {
900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 899 $QUIT_DIALOG = new CFClient::UI::FancyFrame
900 x => "center",
901 y => "center",
902 title => "Really Quit?",
903 ;
901 904
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 905 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
903 906
904 $vb->add (new CFClient::UI::Label 907 $vb->add (new CFClient::UI::Label
905 text => "You should find a savebed and apply it first!", 908 text => "You should find a savebed and apply it first!",
… …
918 on_activate => sub { exit }, 921 on_activate => sub { exit },
919 ); 922 );
920 } 923 }
921 924
922 $QUIT_DIALOG->show; 925 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center;
924} 926}
925 927
926sub make_inventory_window { 928sub make_inventory_window {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 929 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
930 x => "center",
931 y => "center",
928 def_w => $WIDTH * 7/8, 932 force_w => $WIDTH * 9/10,
929 def_h => $HEIGHT * 7/8, 933 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 934 title => "Inventory",
931 name => "inventory_window", 935 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ; 936 ;
937 937
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 939
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 940 $hb->add (my $vb1 = new CFClient::UI::VBox);
941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
943 943
944 $hb->add (my $vb2 = new CFClient::UI::VBox); 944 $hb->add (my $vb2 = new CFClient::UI::VBox);
945 945
946 $vb2->add (my $hb2 = new CFClient::UI::HBox); 946 $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 947
957 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 948 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
949
950 # XXX: Call after $INVR = ... because set_opencont sets the items
951 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
958 952
959 $invwin 953 $invwin
960} 954}
961 955
962sub make_binding_window { 956sub make_binding_window {
963 my $binding_list = new CFClient::UI::VBox; 957 my $binding_list = new CFClient::UI::VBox;
964 958
959 my $refresh;
965 my $refresh = sub { 960 $refresh = sub {
966 $binding_list->clear (); 961 $binding_list->clear ();
967 962
968 for my $mod (keys %{$::CFG->{bindings}}) { 963 for my $mod (keys %{$::CFG->{bindings}}) {
969 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 964 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
970 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 965 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
971 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 966 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
972 967
973 my $lbl = join "; ", @$cmds; 968 my $lbl = join "; ", @$cmds;
974 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 969 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
975 $binding_list->add (my $hb = new CFClient::UI::HBox); 970 $binding_list->add (my $hb = new CFClient::UI::HBox);
976 $hb->add (new CFClient::UI::Button 971 $hb->add (new CFClient::UI::Button
977 text => "delete", 972 text => "delete",
973 tooltip => "Deletes the binding",
978 on_activate => sub { 974 on_activate => sub {
979 $binding_list->remove ($hb); 975 $binding_list->remove ($hb);
980 delete $::CFG->{bindings}->{$mod}->{$sym}; 976 delete $::CFG->{bindings}->{$mod}->{$sym};
981 }); 977 });
978
979 $hb->add (new CFClient::UI::Button
980 text => "edit",
981 tooltip => "Edits the binding",
982 on_activate => sub {
983 $::BIND_EDITOR->set_binding (
984 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
985 sub {
986 my ($nmod, $nsym, $ncmds) = @_;
987 delete $::CFG->{bindings}->{$mod}->{$sym};
988 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
989 $refresh->();
990 $::BIND_WINDOW->show;
991 },
992 sub {
993 $::BIND_WINDOW->show;
994 });
995 $::BIND_EDITOR->show;
996 $::BIND_WINDOW->hide;
997 });
998
982 $hb->add (new CFClient::UI::Label text => "($nam)"); 999 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
983 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1000 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
984 } 1001 }
985 } 1002 }
986 }; 1003 };
987 1004
988 $BIND_WINDOW = new CFClient::UI::FancyFrame 1005 $BIND_WINDOW = new CFClient::UI::FancyFrame
989 title => "Bindings", 1006 title => "Bindings",
1007 x => "center",
1008 y => "center",
990 def_w => int $WIDTH * 7/8, 1009 def_w => int $WIDTH * 9/10,
991 def_h => int $HEIGHT * 7/8, 1010 def_h => int $HEIGHT * 9/10,
992 on_visibility_change => sub { 1011 on_visibility_change => sub {
993 my ($self, $visible) = @_; 1012 my ($self, $visible) = @_;
994 if ($visible) { 1013 $refresh->() if $visible;
995 $self->center;
996 $refresh->()
997 }
998 }; 1014 };
999 1015
1016 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
1017 $vb->add (new CFClient::UI::Button
1018 text => "record new",
1019 tooltip => "This button opens the binding editor with an empty binding.",
1020 on_activate => sub {
1021 $::BIND_EDITOR->set_binding (undef, undef, [],
1022 sub {
1023 my ($mod, $sym, $cmds) = @_;
1024 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1025 $refresh->();
1026 $::BIND_WINDOW->show;
1027 },
1028 sub {
1029 $::BIND_WINDOW->show;
1030 });
1031 $::BIND_WINDOW->hide;
1032 $::BIND_EDITOR->show;
1033 },
1034 );
1000 $BIND_WINDOW->add ($binding_list); 1035 $vb->add ($binding_list);
1001 $refresh->(); 1036 $refresh->();
1002 $BIND_WINDOW 1037 $BIND_WINDOW
1003} 1038}
1004 1039
1005sub make_help_window { 1040sub make_help_window {
… …
1075 if ($DEBUG_STATUS) { 1110 if ($DEBUG_STATUS) {
1076 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1111 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1077 } else { 1112 } else {
1078 # create the widgets 1113 # create the widgets
1079 1114
1080 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1115 $DEBUG_STATUS = new CFClient::UI::Label
1116 padding => 0,
1117 z => 100,
1118 force_x => "max",
1119 force_y => 0;
1081 $DEBUG_STATUS->show; 1120 $DEBUG_STATUS->show;
1082 1121
1122 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1123
1083 $STATUSBOX = new CFClient::UI::Statusbox; 1124 $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]); 1125 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1085 1126
1086 (new CFClient::UI::Frame 1127 (new CFClient::UI::Frame
1087 bg => [0, 0, 0, 0.4], 1128 bg => [0, 0, 0, 0.4],
1088 req_y => -1, 1129 force_x => 0,
1130 force_y => "max",
1089 child => $STATUSBOX, 1131 child => $STATUSBOX,
1090 )->show; 1132 )->show;
1091 1133
1092 CFClient::UI::FancyFrame->new ( 1134 CFClient::UI::FancyFrame->new (
1135 x => 0,
1136 y => $FONTSIZE + 8,
1093 border_bg => [1, 1, 1, 192/255], 1137 border_bg => [1, 1, 1, 192/255],
1094 bg => [1, 1, 1, 0], 1138 bg => [1, 1, 1, 0],
1095 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1139 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.", 1140 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1097 ), 1141 ),
… …
1120 can_hover => 1, 1164 can_hover => 1,
1121 can_events => 1, 1165 can_events => 1,
1122 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1166 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1123 ; 1167 ;
1124 1168
1125 $BUTTONBAR = new CFClient::UI::HBox; 1169 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1126 1170
1127 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1171 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1128 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1172 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1129 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1173 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1130 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1174 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
… …
1141 $BUTTONBAR->add (new CFClient::UI::Button 1185 $BUTTONBAR->add (new CFClient::UI::Button
1142 text => "Save Config", 1186 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.", 1187 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 { 1188 on_activate => sub {
1145 $::CFG->{layout} = CFClient::UI::get_layout; 1189 $::CFG->{layout} = CFClient::UI::get_layout;
1146 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1190 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1147 status "Configuration Saved"; 1191 status "Configuration Saved";
1148 }, 1192 },
1149 ); 1193 );
1150 1194
1151 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1195 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
… …
1154 $BUTTONBAR->add (new CFClient::UI::Flopper 1198 $BUTTONBAR->add (new CFClient::UI::Flopper
1155 text => "Bindings", 1199 text => "Bindings",
1156 other => make_binding_window, 1200 other => make_binding_window,
1157 tooltip => "Lets you delete bindings you have made with the recorder" 1201 tooltip => "Lets you delete bindings you have made with the recorder"
1158 ); 1202 );
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 1203
1162 $BUTTONBAR->add (new CFClient::UI::Button 1204 $BUTTONBAR->add (new CFClient::UI::Button
1163 text => "Quit", 1205 text => "Quit",
1164 tooltip => "Terminates the program", 1206 tooltip => "Terminates the program",
1165 on_activate => sub { 1207 on_activate => sub {
… …
1170 } 1212 }
1171 }, 1213 },
1172 ); 1214 );
1173 1215
1174 $BUTTONBAR->show; 1216 $BUTTONBAR->show;
1217 $SERVER_SETUP->show;
1175 1218
1176 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1219 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1177
1178 $SERVER_SETUP->show;
1179 } 1220 }
1180} 1221}
1181 1222
1182sub video_shutdown { 1223sub video_shutdown {
1183 undef $SDL_ACTIVE; 1224 undef $SDL_ACTIVE;
… …
1251 1292
1252my %demo;#d# 1293my %demo;#d#
1253 1294
1254sub force_refresh { 1295sub force_refresh {
1255 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1296 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1256 debug sprintf "%3.2f", $fps; 1297 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1257 1298
1258 $CFClient::UI::ROOT->draw; 1299 $CFClient::UI::ROOT->draw;
1259 1300
1260 $WANT_REFRESH = 0; 1301 $WANT_REFRESH = 0;
1261 $CAN_REFRESH = 0; 1302 $CAN_REFRESH = 0;
… …
1393############################################################################# 1434#############################################################################
1394 1435
1395$SIG{INT} = $SIG{TERM} = sub { exit }; 1436$SIG{INT} = $SIG{TERM} = sub { exit };
1396 1437
1397{ 1438{
1398 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1439 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1399 1440
1400 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1441 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1401 CFClient::UI::set_layout ($::CFG->{layout}); 1442 CFClient::UI::set_layout ($::CFG->{layout});
1402 1443
1403 my %DEF_CFG = ( 1444 my %DEF_CFG = (
1404 sdl_mode => 0, 1445 sdl_mode => 0,
1405 width => 640, 1446 width => 640,
… …
1483 1524
1484END { CFClient::SDL_Quit } 1525END { CFClient::SDL_Quit }
1485 1526
1486=head1 NAME 1527=head1 NAME
1487 1528
1488pclient - A Crossfire+ and Crossfire game client 1529cfplus - A Crossfire+ and Crossfire game client
1489 1530
1490=head1 SYNOPSIS 1531=head1 SYNOPSIS
1491 1532
1492Just run it - no commandline arguments are supported. 1533Just run it - no commandline arguments are supported.
1493 1534
1494=head1 USAGE 1535=head1 USAGE
1495 1536
1496Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1537cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1497fullscreen and interactively. 1538fullscreen and interactively.
1498 1539
1499=head1 AUTHOR 1540=head1 AUTHOR
1500 1541
1501Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1542Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>

Diff Legend

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