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.29 by root, Mon May 29 21:54:16 2006 UTC vs.
Revision 1.36 by elmex, Tue May 30 14:59:26 2006 UTC

… …
104our $INV; 104our $INV;
105our $INVR; 105our $INVR;
106our $INV_RIGHT_HB; 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);
… …
954} 954}
955 955
956sub make_binding_window { 956sub make_binding_window {
957 my $binding_list = new CFClient::UI::VBox; 957 my $binding_list = new CFClient::UI::VBox;
958 958
959 my $refresh;
959 my $refresh = sub { 960 $refresh = sub {
960 $binding_list->clear (); 961 $binding_list->clear ();
961 962
962 for my $mod (keys %{$::CFG->{bindings}}) { 963 for my $mod (keys %{$::CFG->{bindings}}) {
963 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 964 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
964 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 965 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
965 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 966 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
966 967
967 my $lbl = join "; ", @$cmds; 968 my $lbl = join "; ", @$cmds;
968 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 969 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
969 $binding_list->add (my $hb = new CFClient::UI::HBox); 970 $binding_list->add (my $hb = new CFClient::UI::HBox);
970 $hb->add (new CFClient::UI::Button 971 $hb->add (new CFClient::UI::Button
971 text => "delete", 972 text => "delete",
973 tooltip => "Deletes the binding",
972 on_activate => sub { 974 on_activate => sub {
973 $binding_list->remove ($hb); 975 $binding_list->remove ($hb);
974 delete $::CFG->{bindings}->{$mod}->{$sym}; 976 delete $::CFG->{bindings}->{$mod}->{$sym};
975 }); 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
976 $hb->add (new CFClient::UI::Label text => "($nam)"); 999 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
977 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1000 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
978 } 1001 }
979 } 1002 }
980 }; 1003 };
981 1004
982 $BIND_WINDOW = new CFClient::UI::FancyFrame 1005 $BIND_WINDOW = new CFClient::UI::FancyFrame
983 title => "Bindings", 1006 title => "Bindings",
1007 x => "center",
1008 y => "center",
984 def_w => int $WIDTH * 7/8, 1009 def_w => int $WIDTH * 9/10,
985 def_h => int $HEIGHT * 7/8, 1010 def_h => int $HEIGHT * 9/10,
986 on_visibility_change => sub { 1011 on_visibility_change => sub {
987 my ($self, $visible) = @_; 1012 my ($self, $visible) = @_;
988 if ($visible) { 1013 $refresh->() if $visible;
989 $self->center;
990 $refresh->()
991 }
992 }; 1014 };
993 1015
1016 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
994 $BIND_WINDOW->add ($binding_list); 1017 $vb->add ($binding_list);
1018 $vb->add (my $hb = new CFClient::UI::HBox);
1019 $hb->add (new CFClient::UI::Button
1020 text => "record new",
1021 expand => 1,
1022 tooltip => "This button opens the binding editor with an empty binding.",
1023 on_activate => sub {
1024 $::BIND_EDITOR->set_binding (undef, undef, [],
1025 sub {
1026 my ($mod, $sym, $cmds) = @_;
1027 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1028 $refresh->();
1029 $::BIND_WINDOW->show;
1030 },
1031 sub {
1032 $::BIND_WINDOW->show;
1033 });
1034 $::BIND_WINDOW->hide;
1035 $::BIND_EDITOR->show;
1036 },
1037 );
1038 $hb->add (new CFClient::UI::Button
1039 text => "close",
1040 tooltip => "Closes the binding window",
1041 expand => 1,
1042 on_activate => sub {
1043 $::BIND_WINDOW->hide;
1044 }
1045 );
1046
995 $refresh->(); 1047 $refresh->();
996 $BIND_WINDOW 1048 $BIND_WINDOW
997} 1049}
998 1050
999sub make_help_window { 1051sub make_help_window {
… …
1069 if ($DEBUG_STATUS) { 1121 if ($DEBUG_STATUS) {
1070 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1122 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1071 } else { 1123 } else {
1072 # create the widgets 1124 # create the widgets
1073 1125
1074 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1126 $DEBUG_STATUS = new CFClient::UI::Label
1127 padding => 0,
1128 z => 100,
1129 force_x => "max",
1130 force_y => 0;
1075 $DEBUG_STATUS->show; 1131 $DEBUG_STATUS->show;
1076 1132
1133 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1134
1077 $STATUSBOX = new CFClient::UI::Statusbox; 1135 $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]); 1136 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1079 1137
1080 (new CFClient::UI::Frame 1138 (new CFClient::UI::Frame
1081 bg => [0, 0, 0, 0.4], 1139 bg => [0, 0, 0, 0.4],
1082 req_y => -1, 1140 force_x => 0,
1141 force_y => "max",
1083 child => $STATUSBOX, 1142 child => $STATUSBOX,
1084 )->show; 1143 )->show;
1085 1144
1086 CFClient::UI::FancyFrame->new ( 1145 CFClient::UI::FancyFrame->new (
1146 x => 0,
1147 y => $FONTSIZE + 8,
1087 border_bg => [1, 1, 1, 192/255], 1148 border_bg => [1, 1, 1, 192/255],
1088 bg => [1, 1, 1, 0], 1149 bg => [1, 1, 1, 0],
1089 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1150 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.", 1151 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1091 ), 1152 ),
… …
1114 can_hover => 1, 1175 can_hover => 1,
1115 can_events => 1, 1176 can_events => 1,
1116 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1177 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1117 ; 1178 ;
1118 1179
1119 $BUTTONBAR = new CFClient::UI::HBox; 1180 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1120 1181
1121 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1182 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1122 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1183 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1123 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1184 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1124 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1185 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
… …
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 1189 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 1190
1130 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1191 $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."); 1192 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, 1193 $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 :)."); 1194 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1195 ."You can also hit the Tab-key to show/hide the Inventory.");
1134 1196
1135 $BUTTONBAR->add (new CFClient::UI::Button 1197 $BUTTONBAR->add (new CFClient::UI::Button
1136 text => "Save Config", 1198 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.", 1199 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 { 1200 on_activate => sub {
… …
1146 tooltip => "View Documentation"); 1208 tooltip => "View Documentation");
1147 1209
1148 $BUTTONBAR->add (new CFClient::UI::Flopper 1210 $BUTTONBAR->add (new CFClient::UI::Flopper
1149 text => "Bindings", 1211 text => "Bindings",
1150 other => make_binding_window, 1212 other => make_binding_window,
1151 tooltip => "Lets you delete bindings you have made with the recorder" 1213 tooltip =>
1214 "Lets you define, edit and delete bindings."
1215 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1216 ."with nothing set and the recording started. After doing the actions you "
1217 ."want to record press Insert and you will be asked to press a key-combo."
1218 ."After pressing the combo the binding will be saved automatically and the "
1219 ."binding editor closes"
1152 ); 1220 );
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 1221
1156 $BUTTONBAR->add (new CFClient::UI::Button 1222 $BUTTONBAR->add (new CFClient::UI::Button
1157 text => "Quit", 1223 text => "Quit",
1158 tooltip => "Terminates the program", 1224 tooltip => "Terminates the program",
1159 on_activate => sub { 1225 on_activate => sub {
… …
1164 } 1230 }
1165 }, 1231 },
1166 ); 1232 );
1167 1233
1168 $BUTTONBAR->show; 1234 $BUTTONBAR->show;
1235 $SERVER_SETUP->show;
1169 1236
1170 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1237 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1171
1172 $SERVER_SETUP->show;
1173 } 1238 }
1174} 1239}
1175 1240
1176sub video_shutdown { 1241sub video_shutdown {
1177 undef $SDL_ACTIVE; 1242 undef $SDL_ACTIVE;
… …
1245 1310
1246my %demo;#d# 1311my %demo;#d#
1247 1312
1248sub force_refresh { 1313sub force_refresh {
1249 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1314 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1250 debug sprintf "%3.2f", $fps; 1315 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1251 1316
1252 $CFClient::UI::ROOT->draw; 1317 $CFClient::UI::ROOT->draw;
1253 1318
1254 $WANT_REFRESH = 0; 1319 $WANT_REFRESH = 0;
1255 $CAN_REFRESH = 0; 1320 $CAN_REFRESH = 0;

Diff Legend

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