ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.39 by root, Thu Jun 1 03:42:58 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
108our $BIND_WINDOW;
109our $BIND_EDITOR;
110
111our $SPELL_LIST;
107 112
108sub status { 113sub status {
109 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 114 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
110} 115}
111 116
112sub debug { 117sub debug {
113 $DEBUG_STATUS->set_text ($_[0]); 118 $DEBUG_STATUS->set_text ($_[0]);
114 my ($w, $h) = $DEBUG_STATUS->size_request;
115 $DEBUG_STATUS->move ($WIDTH - $w, 0);
116} 119}
117 120
118sub start_game { 121sub start_game {
119 status "logging in..."; 122 status "logging in...";
120 123
179 $CONN = 0; # false, does not autovivify 182 $CONN = 0; # false, does not autovivify
180} 183}
181 184
182sub client_setup { 185sub client_setup {
183 my $dialog = new CFClient::UI::FancyFrame 186 my $dialog = new CFClient::UI::FancyFrame
184 req_x => 1, 187 x => 1,
185 req_y => $HEIGHT * (1/8), 188 y => $HEIGHT * (1/8),
186 name => "client_setup", 189 name => "client_setup",
187 title => "Client Setup", 190 title => "Client Setup",
188 child => (my $vbox = new CFClient::UI::VBox); 191 child => (my $vbox = new CFClient::UI::VBox);
192
189 $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]);
190 194
191 $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");
192 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
193 197
194 $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]);
195 $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");
196 200
197 $mode_slider->connect (changed => sub { 201 $mode_slider->connect (changed => sub {
198 my ($self, $value) = @_; 202 my ($self, $value) = @_;
199 203
387 391
388sub make_gauge_window { 392sub make_gauge_window {
389 my $gh = int $HEIGHT * $CFG->{gauge_size}; 393 my $gh = int $HEIGHT * $CFG->{gauge_size};
390 394
391 my $win = new CFClient::UI::Frame ( 395 my $win = new CFClient::UI::Frame (
392 req_x => 0, 396 force_x => 0,
393 req_y => -1, 397 force_y => "max",
394 def_w => $WIDTH, 398 force_w => $WIDTH,
395 def_h => $gh, 399 force_h => $gh,
396 ); 400 );
397 401
398 $win->add (my $hbox = new CFClient::UI::HBox 402 $win->add (my $hbox = new CFClient::UI::HBox
399 children => [ 403 children => [
400 (new CFClient::UI::HBox expand => 1), 404 (new CFClient::UI::HBox expand => 1),
436 &set_gauge_window_fontsize; 440 &set_gauge_window_fontsize;
437 441
438 $win 442 $win
439} 443}
440 444
445
441sub make_stats_window { 446sub make_stats_window {
442 my $tgw = new CFClient::UI::FancyFrame 447 my $tgw = new CFClient::UI::FancyFrame
443 req_y => $HEIGHT * (2/8), 448 y => $HEIGHT * (2/8),
444 req_x => -1, 449 x => "max",
445 title => "Stats", 450 title => "Stats",
446 name => "stats_window"; 451 name => "stats_window";
447 452
448 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 453 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
449 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 454 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
450 can_hover => 1, can_events => 1, 455 can_hover => 1, can_events => 1,
451 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 456 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
714 }); 719 });
715} 720}
716 721
717sub server_setup { 722sub server_setup {
718 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 723 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
719 x => $WIDTH * (1/3), 724 x => "center",
720 y => $HEIGHT * (1/8), 725 y => "center",
721 name => "server_setup", 726 name => "server_setup",
722 title => "Server Setup", 727 title => "Server Setup",
723 child => (my $vbox = new CFClient::UI::VBox), 728 child => (my $vbox = new CFClient::UI::VBox),
724 on_visibility_change => sub {
725 my ($self, $visible) = @_;
726 $self->center if $visible;
727 },
728 ; 729 ;
729 730
730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 731 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
731 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 732 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
732 733
778 } 779 }
779 ); 780 );
780 781
781 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 782 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
782 $table->add (1, 7, new CFClient::UI::Slider 783 $table->add (1, 7, new CFClient::UI::Slider
783 req_w => 100, 784 force_w => 100,
784 range => [$CFG->{mapsize}, 10, 100, 0, 1], 785 range => [$CFG->{mapsize}, 10, 100, 0, 1],
785 tooltip => "This is the size of the portion of the map update the server sends you. " 786 tooltip => "This is the size of the portion of the map update the server sends you. "
786 . "If you set this to a high value you will be able to see further, " 787 . "If you set this to a high value you will be able to see further, "
787 . "but you also increase bandwidth requirements and latency. " 788 . "but you also increase bandwidth requirements and latency. "
788 . "This option is only used once at log-in.", 789 . "This option is only used once at log-in.",
837 my $window = new CFClient::UI::FancyFrame 838 my $window = new CFClient::UI::FancyFrame
838 name => "message_window", 839 name => "message_window",
839 title => "Messages", 840 title => "Messages",
840 border_bg => [1, 1, 1, 1], 841 border_bg => [1, 1, 1, 1],
841 bg => [0, 0, 0, 0.75], 842 bg => [0, 0, 0, 0.75],
842 req_x => -1, 843 x => "max",
843 req_y => 0, 844 y => 0,
844 def_w => int $::WIDTH / 3, 845 force_w => $::WIDTH / 3,
845 def_h => int $::HEIGHT / 5, 846 force_h => $::HEIGHT / 5,
846 child => (my $vbox = new CFClient::UI::VBox); 847 child => (my $vbox = new CFClient::UI::VBox);
847 848
848 $vbox->add ($LOGVIEW); 849 $vbox->add ($LOGVIEW);
849 850
850 $vbox->add (my $input = new CFClient::UI::Entry 851 $vbox->add (my $input = new CFClient::UI::Entry
864 }, 865 },
865 on_activate => sub { 866 on_activate => sub {
866 my ($input, $text) = @_; 867 my ($input, $text) = @_;
867 $input->set_text (''); 868 $input->set_text ('');
868 869
870 if ($text =~ /^\/bind\s+(.*)$/) {
871 CFClient::Binder::open_binding_dialog (sub {
872 my ($mod, $sym) = @_;
873 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
874 });
869 if ($text =~ /^\/(.*)/) { 875 } elsif ($text =~ /^\/(.*)/) {
870 $::CONN->user_send ($1); 876 $::CONN->user_send ($1);
871 } else { 877 } else {
872 my $say_cmd = $::CFG->{say_command} || 'say'; 878 my $say_cmd = $::CFG->{say_command} || 'say';
873 $::CONN->user_send ("$say_cmd $text"); 879 $::CONN->user_send ("$say_cmd $text");
874 } 880 }
882 }, 888 },
883 ); 889 );
884 890
885 $CONSOLE = { 891 $CONSOLE = {
886 window => $window, 892 window => $window,
887 input => $input 893 input => $input,
888 }; 894 };
889 895
890 $window 896 $window
891} 897}
892 898
893sub open_quit_dialog { 899sub open_quit_dialog {
894 unless ($QUIT_DIALOG) { 900 unless ($QUIT_DIALOG) {
895 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 901 $QUIT_DIALOG = new CFClient::UI::FancyFrame
902 x => "center",
903 y => "center",
904 title => "Really Quit?",
905 ;
896 906
897 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 907 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
898 908
899 $vb->add (new CFClient::UI::Label 909 $vb->add (new CFClient::UI::Label
900 text => "You should find a savebed and apply it first!", 910 text => "You should find a savebed and apply it first!",
913 on_activate => sub { exit }, 923 on_activate => sub { exit },
914 ); 924 );
915 } 925 }
916 926
917 $QUIT_DIALOG->show; 927 $QUIT_DIALOG->show;
918 $QUIT_DIALOG->center;
919} 928}
920 929
921sub make_inventory_window { 930sub make_inventory_window {
922 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 931 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
932 x => "center",
933 y => "center",
923 def_w => $WIDTH * 7/8, 934 force_w => $WIDTH * 9/10,
924 def_h => $HEIGHT * 7/8, 935 force_h => $HEIGHT * 9/10,
925 title => "Inventory", 936 title => "Inventory",
926 name => "inventory_window",
927 on_visibility_change => sub {
928 my ($self, $visible) = @_;
929 $self->center if $visible;
930 },
931 ; 937 ;
932 938
933 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 939 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
934 940
935 $hb->add (my $vb1 = new CFClient::UI::VBox); 941 $hb->add (my $vb1 = new CFClient::UI::VBox);
936 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 942 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
937 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 943 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
938 944
939 $hb->add (my $vb2 = new CFClient::UI::VBox); 945 $hb->add (my $vb2 = new CFClient::UI::VBox);
940 946
947 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
948
949 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
950
951 # XXX: Call after $INVR = ... because set_opencont sets the items
952 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
953
954 $invwin
955}
956
957sub make_spell_list {
958 $SPELL_LIST = new CFClient::UI::SpellList
959 force_w => $WIDTH * (9/10),
960 force_h => $HEIGHT * (9/10);
961 $SPELL_LIST
962}
963
964sub make_binding_window {
965 my $binding_list = new CFClient::UI::VBox;
966
967 my $refresh;
968 $refresh = sub {
969 $binding_list->clear ();
970
971 for my $mod (keys %{$::CFG->{bindings}}) {
972 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
973 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
974 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
975
976 my $lbl = join "; ", @$cmds;
977 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
978 $binding_list->add (my $hb = new CFClient::UI::HBox);
979 $hb->add (new CFClient::UI::Button
980 text => "delete",
981 tooltip => "Deletes the binding",
982 on_activate => sub {
983 $binding_list->remove ($hb);
984 delete $::CFG->{bindings}->{$mod}->{$sym};
985 });
986
987 $hb->add (new CFClient::UI::Button
988 text => "edit",
989 tooltip => "Edits the binding",
990 on_activate => sub {
991 $::BIND_EDITOR->set_binding (
992 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
993 sub {
994 my ($nmod, $nsym, $ncmds) = @_;
995 delete $::CFG->{bindings}->{$mod}->{$sym};
996 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
997 $refresh->();
998 $::BIND_WINDOW->show;
999 },
1000 sub {
1001 $::BIND_WINDOW->show;
1002 });
1003 $::BIND_EDITOR->show;
1004 $::BIND_WINDOW->hide;
1005 });
1006
1007 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1008 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1009 }
1010 }
1011 };
1012
1013 $BIND_WINDOW = new CFClient::UI::FancyFrame
1014 title => "Bindings",
1015 x => "center",
1016 y => "center",
1017 def_w => int $WIDTH * 9/10,
1018 def_h => int $HEIGHT * 9/10,
1019 on_visibility_change => sub {
1020 my ($self, $visible) = @_;
1021 $refresh->() if $visible;
1022 };
1023
1024 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
1025 $vb->add ($binding_list);
941 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1026 $vb->add (my $hb = new CFClient::UI::HBox);
942 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
943 $hb2->add (new CFClient::UI::Button 1027 $hb->add (new CFClient::UI::Button
944 text => "Close", 1028 text => "record new",
945 tooltip => "Close the currently open container (if one is open)", 1029 expand => 1,
1030 tooltip => "This button opens the binding editor with an empty binding.",
946 on_activate => sub { 1031 on_activate => sub {
947 $CONN->send ("apply $CONN->{open_container}") 1032 $::BIND_EDITOR->set_binding (undef, undef, [],
948 if $CONN->{open_container} != 0; 1033 sub {
1034 my ($mod, $sym, $cmds) = @_;
1035 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1036 $refresh->();
1037 $::BIND_WINDOW->show;
1038 },
1039 sub {
1040 $::BIND_WINDOW->show;
1041 });
1042 $::BIND_WINDOW->hide;
1043 $::BIND_EDITOR->show;
949 }, 1044 },
950 ); 1045 );
1046 $hb->add (new CFClient::UI::Button
1047 text => "close",
1048 tooltip => "Closes the binding window",
1049 expand => 1,
1050 on_activate => sub {
1051 $::BIND_WINDOW->hide;
1052 }
1053 );
951 1054
952 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1055 $refresh->();
953 1056 $BIND_WINDOW
954 $invwin
955} 1057}
956 1058
957sub make_help_window { 1059sub make_help_window {
958 my $win = new CFClient::UI::FancyFrame 1060 my $win = new CFClient::UI::FancyFrame
959 def_w => int $WIDTH * 7/8, 1061 def_w => int $WIDTH * 7/8,
1027 if ($DEBUG_STATUS) { 1129 if ($DEBUG_STATUS) {
1028 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1130 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1029 } else { 1131 } else {
1030 # create the widgets 1132 # create the widgets
1031 1133
1032 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1134 $DEBUG_STATUS = new CFClient::UI::Label
1135 padding => 0,
1136 z => 100,
1137 force_x => "max",
1138 force_y => 0;
1033 $DEBUG_STATUS->show; 1139 $DEBUG_STATUS->show;
1034 1140
1141 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1142
1035 $STATUSBOX = new CFClient::UI::Statusbox; 1143 $STATUSBOX = new CFClient::UI::Statusbox;
1036 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1144 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1037 1145
1038 (new CFClient::UI::Frame 1146 (new CFClient::UI::Frame
1039 bg => [0, 0, 0, 0.4], 1147 bg => [0, 0, 0, 0.4],
1040 req_y => -1, 1148 force_x => 0,
1149 force_y => "max",
1041 child => $STATUSBOX, 1150 child => $STATUSBOX,
1042 )->show; 1151 )->show;
1043 1152
1044 CFClient::UI::FancyFrame->new ( 1153 CFClient::UI::FancyFrame->new (
1154 x => 0,
1155 y => $FONTSIZE + 8,
1045 border_bg => [1, 1, 1, 192/255], 1156 border_bg => [1, 1, 1, 192/255],
1046 bg => [1, 1, 1, 0], 1157 bg => [1, 1, 1, 0],
1047 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1158 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1048 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1159 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1049 ), 1160 ),
1072 can_hover => 1, 1183 can_hover => 1,
1073 can_events => 1, 1184 can_events => 1,
1074 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1185 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1075 ; 1186 ;
1076 1187
1077 $BUTTONBAR = new CFClient::UI::HBox; 1188 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1078 1189
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1190 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1080 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1191 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1081 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1192 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1082 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1193 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1086 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1197 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1087 1198
1088 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1199 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1089 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1200 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1090 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1201 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1091 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1202 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1203 ."You can also hit the Tab-key to show/hide the Inventory.");
1092 1204
1093 $BUTTONBAR->add (new CFClient::UI::Button 1205 $BUTTONBAR->add (new CFClient::UI::Button
1094 text => "Save Config", 1206 text => "Save Config",
1095 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1207 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1096 on_activate => sub { 1208 on_activate => sub {
1097 $::CFG->{layout} = CFClient::UI::get_layout; 1209 $::CFG->{layout} = CFClient::UI::get_layout;
1098 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1210 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1099 status "Configuration Saved"; 1211 status "Configuration Saved";
1100 }, 1212 },
1101 ); 1213 );
1102 1214
1103 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1215 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1104 tooltip => "View Documentation"); 1216 tooltip => "View Documentation");
1217
1218 $BUTTONBAR->add (new CFClient::UI::Flopper
1219 text => "Bindings",
1220 other => make_binding_window,
1221 tooltip =>
1222 "Lets you define, edit and delete bindings."
1223 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1224 ."with nothing set and the recording started. After doing the actions you "
1225 ."want to record press Insert and you will be asked to press a key-combo."
1226 ."After pressing the combo the binding will be saved automatically and the "
1227 ."binding editor closes");
1228
1229 $BUTTONBAR->add (new CFClient::UI::Flopper
1230 text => "Spells",
1231 other => make_spell_list,
1232 tooltip => "The spell list");
1105 1233
1106 $BUTTONBAR->add (new CFClient::UI::Button 1234 $BUTTONBAR->add (new CFClient::UI::Button
1107 text => "Quit", 1235 text => "Quit",
1108 tooltip => "Terminates the program", 1236 tooltip => "Terminates the program",
1109 on_activate => sub { 1237 on_activate => sub {
1114 } 1242 }
1115 }, 1243 },
1116 ); 1244 );
1117 1245
1118 $BUTTONBAR->show; 1246 $BUTTONBAR->show;
1247 $SERVER_SETUP->show;
1119 1248
1120 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1249 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1121
1122 $SERVER_SETUP->show;
1123 } 1250 }
1124} 1251}
1125 1252
1126sub video_shutdown { 1253sub video_shutdown {
1127 undef $SDL_ACTIVE; 1254 undef $SDL_ACTIVE;
1195 1322
1196my %demo;#d# 1323my %demo;#d#
1197 1324
1198sub force_refresh { 1325sub force_refresh {
1199 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1326 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1200 debug sprintf "%3.2f", $fps; 1327 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201 1328
1202 $CFClient::UI::ROOT->draw; 1329 $CFClient::UI::ROOT->draw;
1203 1330
1204 $WANT_REFRESH = 0; 1331 $WANT_REFRESH = 0;
1205 $CAN_REFRESH = 0; 1332 $CAN_REFRESH = 0;
1337############################################################################# 1464#############################################################################
1338 1465
1339$SIG{INT} = $SIG{TERM} = sub { exit }; 1466$SIG{INT} = $SIG{TERM} = sub { exit };
1340 1467
1341{ 1468{
1342 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1469 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1343 1470
1344 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1471 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345 CFClient::UI::set_layout ($::CFG->{layout}); 1472 CFClient::UI::set_layout ($::CFG->{layout});
1346 1473
1347 my %DEF_CFG = ( 1474 my %DEF_CFG = (
1348 sdl_mode => 0, 1475 sdl_mode => 0,
1349 width => 640, 1476 width => 640,
1427 1554
1428END { CFClient::SDL_Quit } 1555END { CFClient::SDL_Quit }
1429 1556
1430=head1 NAME 1557=head1 NAME
1431 1558
1432pclient - A Crossfire+ and Crossfire game client 1559cfplus - A Crossfire+ and Crossfire game client
1433 1560
1434=head1 SYNOPSIS 1561=head1 SYNOPSIS
1435 1562
1436Just run it - no commandline arguments are supported. 1563Just run it - no commandline arguments are supported.
1437 1564
1438=head1 USAGE 1565=head1 USAGE
1439 1566
1440Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1567cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441fullscreen and interactively. 1568fullscreen and interactively.
1442 1569
1570=head1 DEBUGGING
1571
1572
1573CFPLUS_DEBUG - environment variable
1574
1575 1 draw borders around widgets
1576 2 add low-level widget info to tooltips
1577 4 show fps
1578 8 suppress tooltips
1579
1443=head1 AUTHOR 1580=head1 AUTHOR
1444 1581
1445Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1582Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446 1583
1447 1584

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines