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.18 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.32 by root, Tue May 30 02:55:45 2006 UTC

81our $LOGVIEW; 81our $LOGVIEW;
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $SERVER_SETUP;
86 87
87our $FLOORBOX; 88our $FLOORBOX;
88our $GAUGES; 89our $GAUGES;
89our $STATWIDS; 90our $STATWIDS;
90 91
97 98
98our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 100our $STATUSBOX;
100our $DEBUG_STATUS; 101our $DEBUG_STATUS;
101 102
103our $INV_WINDOW;
102our $INV; 104our $INV;
103our $INVR; 105our $INVR;
104our $INVR_LBL; 106our $INV_RIGHT_HB;
107
108our $BIND_WINDOW;
105 109
106sub status { 110sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 112}
109 113
110sub debug { 114sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request;
113 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 116}
115 117
116sub start_game { 118sub start_game {
117 status "logging in..."; 119 status "logging in...";
120
121 $LOGIN_BUTTON->set_text ("Logout");
122 $SERVER_SETUP->hide;
118 123
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 124 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 125
121 my ($host, $port) = split /:/, $CFG->{host}; 126 my ($host, $port) = split /:/, $CFG->{host};
122 127
151 }; 156 };
152 157
153 if ($CONN) { 158 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 159 CFClient::lowdelay fileno $CONN->{fh};
155 160
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 161 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 162 } else {
163 status "unable to connect"; 163 status "unable to connect";
164 stop_game(); 164 stop_game();
165 } 165 }
166} 166}
167 167
168sub stop_game { 168sub stop_game {
169 $LOGIN_BUTTON->set_text ("Login");
170 $SERVER_SETUP->show;
171 $INV_WINDOW->hide;
172 $LOGVIEW->hide;
173
169 return unless $CONN; 174 return unless $CONN;
170 175
171 status "connection closed"; 176 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 177
173 $CONN->destroy; 178 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 179 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 180}
179 181
180sub client_setup { 182sub client_setup {
181 my $dialog = new CFClient::UI::FancyFrame 183 my $dialog = new CFClient::UI::FancyFrame
184 x => 1,
185 y => $HEIGHT * (1/8),
182 name => "client_setup", 186 name => "client_setup",
183 title => "Client Setup", 187 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 188 child => (my $vbox = new CFClient::UI::VBox);
189
185 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 190 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186 191
187 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 192 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 193 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 194
190 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 195 $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]);
191 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 196 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192 197
193 $mode_slider->connect (changed => sub { 198 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 199 my ($self, $value) = @_;
195 200
383 388
384sub make_gauge_window { 389sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 390 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 391
387 my $win = new CFClient::UI::Frame ( 392 my $win = new CFClient::UI::Frame (
388 req_y => -1, 393 force_x => 0,
394 force_y => "max",
389 user_w => $WIDTH, 395 force_w => $WIDTH,
390 user_h => $gh, 396 force_h => $gh,
391 ); 397 );
392 398
393 $win->add (my $hbox = new CFClient::UI::HBox 399 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 400 children => [
395 (new CFClient::UI::HBox expand => 1), 401 (new CFClient::UI::HBox expand => 1),
431 &set_gauge_window_fontsize; 437 &set_gauge_window_fontsize;
432 438
433 $win 439 $win
434} 440}
435 441
442
436sub make_stats_window { 443sub make_stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window"; 444 my $tgw = new CFClient::UI::FancyFrame
445 y => $HEIGHT * (2/8),
446 x => "max",
447 title => "Stats",
448 name => "stats_window";
438 449
439 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 450 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 451 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441 can_hover => 1, can_events => 1, 452 can_hover => 1, can_events => 1,
442 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 453 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
704 } 715 }
705 }); 716 });
706} 717}
707 718
708sub server_setup { 719sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame 720 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
721 x => "center",
722 y => "center",
710 name => "server_setup", 723 name => "server_setup",
711 title => "Server Setup", 724 title => "Server Setup",
712 child => (my $vbox = new CFClient::UI::VBox); 725 child => (my $vbox = new CFClient::UI::VBox),
713 726 ;
727
714 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 728 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
715 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 729 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
716 730
717 { 731 {
718 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 732 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
762 } 776 }
763 ); 777 );
764 778
765 $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");
766 $table->add (1, 7, new CFClient::UI::Slider 780 $table->add (1, 7, new CFClient::UI::Slider
767 req_w => 100, 781 force_w => 100,
768 range => [$CFG->{mapsize}, 10, 100, 0, 1], 782 range => [$CFG->{mapsize}, 10, 100, 0, 1],
769 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. "
770 . "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, "
771 . "but you also increase bandwidth requirements and latency. " 785 . "but you also increase bandwidth requirements and latency. "
772 . "This option is only used once at log-in.", 786 . "This option is only used once at log-in.",
821 my $window = new CFClient::UI::FancyFrame 835 my $window = new CFClient::UI::FancyFrame
822 name => "message_window", 836 name => "message_window",
823 title => "Messages", 837 title => "Messages",
824 border_bg => [1, 1, 1, 1], 838 border_bg => [1, 1, 1, 1],
825 bg => [0, 0, 0, 0.75], 839 bg => [0, 0, 0, 0.75],
840 x => "max",
841 y => 0,
826 user_w => int $::WIDTH / 3, 842 force_w => $::WIDTH / 3,
827 user_h => int $::HEIGHT / 5, 843 force_h => $::HEIGHT / 5,
828 child => (my $vbox = new CFClient::UI::VBox); 844 child => (my $vbox = new CFClient::UI::VBox);
829 845
830 $vbox->add ($LOGVIEW); 846 $vbox->add ($LOGVIEW);
831 847
832 $vbox->add (my $input = new CFClient::UI::Entry 848 $vbox->add (my $input = new CFClient::UI::Entry
846 }, 862 },
847 on_activate => sub { 863 on_activate => sub {
848 my ($input, $text) = @_; 864 my ($input, $text) = @_;
849 $input->set_text (''); 865 $input->set_text ('');
850 866
867 if ($text =~ /^\/bind\s+(.*)$/) {
868 CFClient::Recorder::open_binding_dialog ([$1]);
851 if ($text =~ /^\/(.*)/) { 869 } elsif ($text =~ /^\/(.*)/) {
852 $::CONN->user_send ($1); 870 $::CONN->user_send ($1);
853 } else { 871 } else {
854 my $say_cmd = $::CFG->{say_command} || 'say'; 872 my $say_cmd = $::CFG->{say_command} || 'say';
855 $::CONN->user_send ("$say_cmd $text"); 873 $::CONN->user_send ("$say_cmd $text");
856 } 874 }
864 }, 882 },
865 ); 883 );
866 884
867 $CONSOLE = { 885 $CONSOLE = {
868 window => $window, 886 window => $window,
869 input => $input 887 input => $input,
870 }; 888 };
871 889
872 $window 890 $window
873} 891}
874 892
875sub open_quit_dialog { 893sub open_quit_dialog {
876 unless ($QUIT_DIALOG) { 894 unless ($QUIT_DIALOG) {
877
878 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 895 $QUIT_DIALOG = new CFClient::UI::FancyFrame
896 x => "center",
897 y => "center",
898 title => "Really Quit?",
899 ;
879 900
880 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 901 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881 902
882 $vb->add (new CFClient::UI::Label 903 $vb->add (new CFClient::UI::Label
883 text => "You should find a savebed and apply it first!", 904 text => "You should find a savebed and apply it first!",
893 $hb->add (new CFClient::UI::Button 914 $hb->add (new CFClient::UI::Button
894 text => "Quit anyway", 915 text => "Quit anyway",
895 expand => 1, 916 expand => 1,
896 on_activate => sub { exit }, 917 on_activate => sub { exit },
897 ); 918 );
919 }
898 920
899 $QUIT_DIALOG->show_centered; 921 $QUIT_DIALOG->show;
900 } else {
901 $QUIT_DIALOG->show_centered;
902 }
903} 922}
904 923
905sub make_inventory_window { 924sub make_inventory_window {
906 my $invwin = new CFClient::UI::FancyFrame 925 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
907 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window"; 926 x => "center",
927 y => "center",
928 force_w => $WIDTH * 9/10,
929 force_h => $HEIGHT * 9/10,
930 title => "Inventory",
931 name => "inventory_window",
932 ;
908 933
909 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 934 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
910 935
911 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 936 $hb->add (my $vb1 = new CFClient::UI::VBox);
912 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 937 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
913 $lbl->set_text ("Player");
914 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 938 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
915 939
916 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
917
918 $vb2->add (my $hb2 = new CFClient::UI::HBox); 940 $hb->add (my $vb2 = new CFClient::UI::VBox);
919 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
920 $hb2->add (new CFClient::UI::Button
921 text => "Close",
922 tooltip => "Close the currently open container (if one is open)",
923 on_activate => sub {
924 $CONN->send ("apply $CONN->{open_container}")
925 if $CONN->{open_container} != 0;
926 },
927 );
928 941
929 $INVR_LBL->set_text ("Floor"); 942 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
943
930 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 944 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
931 945
946 # XXX: Call after $INVR = ... because set_opencont sets the items
947 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
948
932 $invwin 949 $invwin
950}
951
952sub make_binding_window {
953 my $binding_list = new CFClient::UI::VBox;
954
955 my $refresh = sub {
956 $binding_list->clear ();
957
958 for my $mod (keys %{$::CFG->{bindings}}) {
959 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
960 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
961 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
962
963 my $lbl = join "; ", @$cmds;
964 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);
965 $binding_list->add (my $hb = new CFClient::UI::HBox);
966 $hb->add (new CFClient::UI::Button
967 text => "delete",
968 on_activate => sub {
969 $binding_list->remove ($hb);
970 delete $::CFG->{bindings}->{$mod}->{$sym};
971 });
972 $hb->add (new CFClient::UI::Label text => "($nam)");
973 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
974 }
975 }
976 };
977
978 $BIND_WINDOW = new CFClient::UI::FancyFrame
979 title => "Bindings",
980 x => "center",
981 y => "center",
982 def_w => int $WIDTH * 9/10,
983 def_h => int $HEIGHT * 9/10,
984 on_visibility_change => sub {
985 my ($self, $visible) = @_;
986 $refresh->() if $visible;
987 };
988
989 $BIND_WINDOW->add ($binding_list);
990 $refresh->();
991 $BIND_WINDOW
933} 992}
934 993
935sub make_help_window { 994sub make_help_window {
936 my $win = new CFClient::UI::FancyFrame 995 my $win = new CFClient::UI::FancyFrame
937 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 996 def_w => int $WIDTH * 7/8,
997 def_h => int $HEIGHT * 7/8,
998 title => "Documentation";
938 999
939 $win->add (my $vbox = new CFClient::UI::VBox); 1000 $win->add (my $vbox = new CFClient::UI::VBox);
940 1001
941 $vbox->add (my $buttons = new CFClient::UI::HBox); 1002 $vbox->add (my $buttons = new CFClient::UI::HBox);
942 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1003 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1003 if ($DEBUG_STATUS) { 1064 if ($DEBUG_STATUS) {
1004 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1065 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1005 } else { 1066 } else {
1006 # create the widgets 1067 # create the widgets
1007 1068
1008 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1069 $DEBUG_STATUS = new CFClient::UI::Label
1070 padding => 0,
1071 z => 100,
1072 force_x => "max",
1073 force_y => 0;
1009 $DEBUG_STATUS->show; 1074 $DEBUG_STATUS->show;
1010 1075
1011 $STATUSBOX = new CFClient::UI::Statusbox; 1076 $STATUSBOX = new CFClient::UI::Statusbox;
1012 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1077 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1013 1078
1014 (new CFClient::UI::Frame 1079 (new CFClient::UI::Frame
1015 bg => [0, 0, 0, 0.4], 1080 bg => [0, 0, 0, 0.4],
1016 req_y => -1, 1081 force_x => 0,
1082 force_y => "max",
1017 child => $STATUSBOX, 1083 child => $STATUSBOX,
1018 )->show; 1084 )->show;
1019 1085
1020 CFClient::UI::FancyFrame->new ( 1086 CFClient::UI::FancyFrame->new (
1087 x => 0,
1088 y => $FONTSIZE + 8,
1021 border_bg => [1, 1, 1, 192/255], 1089 border_bg => [1, 1, 1, 192/255],
1022 bg => [1, 1, 1, 0], 1090 bg => [1, 1, 1, 0],
1023 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1091 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1024 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1092 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1025 ), 1093 ),
1048 can_hover => 1, 1116 can_hover => 1,
1049 can_events => 1, 1117 can_events => 1,
1050 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1118 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1051 ; 1119 ;
1052 1120
1053 $BUTTONBAR = new CFClient::UI::HBox; 1121 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1054 1122
1055 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1123 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1056 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1124 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1057 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1125 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1058 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1126 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1069 $BUTTONBAR->add (new CFClient::UI::Button 1137 $BUTTONBAR->add (new CFClient::UI::Button
1070 text => "Save Config", 1138 text => "Save Config",
1071 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1139 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1072 on_activate => sub { 1140 on_activate => sub {
1073 $::CFG->{layout} = CFClient::UI::get_layout; 1141 $::CFG->{layout} = CFClient::UI::get_layout;
1074 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1142 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1075 status "Configuration Saved"; 1143 status "Configuration Saved";
1076 }, 1144 },
1077 ); 1145 );
1078 1146
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1147 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1080 tooltip => "View Documentation"); 1148 tooltip => "View Documentation");
1149
1150 $BUTTONBAR->add (new CFClient::UI::Flopper
1151 text => "Bindings",
1152 other => make_binding_window,
1153 tooltip => "Lets you delete bindings you have made with the recorder"
1154 );
1155 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1156 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1081 1157
1082 $BUTTONBAR->add (new CFClient::UI::Button 1158 $BUTTONBAR->add (new CFClient::UI::Button
1083 text => "Quit", 1159 text => "Quit",
1084 tooltip => "Terminates the program", 1160 tooltip => "Terminates the program",
1085 on_activate => sub { 1161 on_activate => sub {
1090 } 1166 }
1091 }, 1167 },
1092 ); 1168 );
1093 1169
1094 $BUTTONBAR->show; 1170 $BUTTONBAR->show;
1171 $SERVER_SETUP->show;
1095 1172
1096 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1173 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1097
1098 # delay till geometry is constant
1099 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1100 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1101 my $widget = $GAUGES->{win};
1102 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1103 });
1104 force_refresh ();
1105 } 1174 }
1106} 1175}
1107 1176
1108sub video_shutdown { 1177sub video_shutdown {
1109 undef $SDL_ACTIVE; 1178 undef $SDL_ACTIVE;
1319############################################################################# 1388#############################################################################
1320 1389
1321$SIG{INT} = $SIG{TERM} = sub { exit }; 1390$SIG{INT} = $SIG{TERM} = sub { exit };
1322 1391
1323{ 1392{
1324 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1393 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1325 1394
1326 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1395 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1327 CFClient::UI::set_layout ($::CFG->{layout}); 1396 CFClient::UI::set_layout ($::CFG->{layout});
1328 1397
1329 my %DEF_CFG = ( 1398 my %DEF_CFG = (
1330 sdl_mode => 0, 1399 sdl_mode => 0,
1331 width => 640, 1400 width => 640,
1409 1478
1410END { CFClient::SDL_Quit } 1479END { CFClient::SDL_Quit }
1411 1480
1412=head1 NAME 1481=head1 NAME
1413 1482
1414pclient - A Crossfire+ and Crossfire game client 1483cfplus - A Crossfire+ and Crossfire game client
1415 1484
1416=head1 SYNOPSIS 1485=head1 SYNOPSIS
1417 1486
1418Just run it - no commandline arguments are supported. 1487Just run it - no commandline arguments are supported.
1419 1488
1420=head1 USAGE 1489=head1 USAGE
1421 1490
1422Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1491cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1423fullscreen and interactively. 1492fullscreen and interactively.
1424 1493
1425=head1 AUTHOR 1494=head1 AUTHOR
1426 1495
1427Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1496Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines