1 | #!/opt/bin/perl |
1 | #!/opt/bin/perl |
2 | |
2 | |
3 | use strict; |
3 | use strict; |
4 | use utf8; |
4 | use utf8; |
5 | |
5 | |
|
|
6 | # do things only needed for single-binary version (par) |
6 | BEGIN { |
7 | BEGIN { |
7 | if (%PAR::LibCache) { |
8 | if (%PAR::LibCache) { |
8 | @INC = grep ref, @INC; # weed out all paths except pars loader refs |
9 | @INC = grep ref, @INC; # weed out all paths except pars loader refs |
9 | |
10 | |
10 | while (my ($filename, $zip) = each %PAR::LibCache) { |
11 | while (my ($filename, $zip) = each %PAR::LibCache) { |
… | |
… | |
13 | $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") |
14 | $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") |
14 | unless -e "$ENV{PAR_TEMP}/$1"; |
15 | unless -e "$ENV{PAR_TEMP}/$1"; |
15 | } |
16 | } |
16 | } |
17 | } |
17 | |
18 | |
|
|
19 | # TODO: pango-rc file, anybody? |
|
|
20 | |
18 | unshift @INC, $ENV{PAR_TEMP}; |
21 | unshift @INC, $ENV{PAR_TEMP}; |
19 | |
|
|
20 | if ($^O eq "MSWin32") { |
|
|
21 | $ENV{GTK_RC_FILES} = "$ENV{PAR_TEMP}/share/themes/MS-Windows/gtk-2.0/gtkrc"; |
|
|
22 | } |
|
|
23 | } |
22 | } |
24 | } |
23 | } |
25 | |
24 | |
26 | # need to do it again because that pile of garbage called PAR nukes it before main |
25 | # need to do it again because that pile of garbage called PAR nukes it before main |
27 | unshift @INC, $ENV{PAR_TEMP}; |
26 | unshift @INC, $ENV{PAR_TEMP} |
|
|
27 | if %PAR::LibCache; |
28 | |
28 | |
29 | use Time::HiRes 'time'; |
29 | use Time::HiRes 'time'; |
|
|
30 | use Pod::POM; |
30 | use Event; |
31 | use Event; |
31 | |
32 | |
32 | use Crossfire; |
33 | use Crossfire; |
33 | use Crossfire::Protocol; |
34 | use Crossfire::Protocol; |
34 | |
35 | |
… | |
… | |
94 | our $SDL_MIXER; |
95 | our $SDL_MIXER; |
95 | our @SOUNDS; # event => file mapping |
96 | our @SOUNDS; # event => file mapping |
96 | our %AUDIO_CHUNKS; # audio files |
97 | our %AUDIO_CHUNKS; # audio files |
97 | |
98 | |
98 | our $ALT_ENTER_MESSAGE; |
99 | our $ALT_ENTER_MESSAGE; |
99 | our $STATUS_LINE; |
100 | our $STATUSBOX; |
100 | our $DEBUG_STATUS; |
101 | our $DEBUG_STATUS; |
101 | |
102 | |
102 | our $INVWIN; |
103 | our $INVWIN; |
103 | our $INV; |
104 | our $INV; |
|
|
105 | our $INVR; |
|
|
106 | our $INVR_LBL; |
|
|
107 | our $OPENCONT; |
104 | |
108 | |
105 | sub status { |
109 | sub status { |
106 | $STATUS_LINE->add ($_[0], pri => -10, group => "status", timeout => 20, color => [1, 1, 0, 1]); |
110 | $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]); |
107 | $CFClient::UI::ROOT->on_refresh ($STATUS_LINE => sub { |
|
|
108 | $STATUS_LINE->move (0, $HEIGHT - $STATUS_LINE->{h});#d# to in toplevel |
|
|
109 | }); |
|
|
110 | } |
111 | } |
111 | |
112 | |
112 | sub debug { |
113 | sub debug { |
113 | $DEBUG_STATUS->set_text ($_[0]); |
114 | $DEBUG_STATUS->set_text ($_[0]); |
114 | my ($w, $h) = $DEBUG_STATUS->size_request; |
115 | my ($w, $h) = $DEBUG_STATUS->size_request; |
… | |
… | |
135 | maph => $mapsize, |
136 | maph => $mapsize, |
136 | ; |
137 | ; |
137 | }; |
138 | }; |
138 | |
139 | |
139 | if ($CONN) { |
140 | if ($CONN) { |
|
|
141 | CFClient::lowdelay fileno $CONN->{fh}; |
|
|
142 | |
140 | $LOGIN_BUTTON->set_text ("Logout"); |
143 | $LOGIN_BUTTON->set_text ("Logout"); |
141 | |
|
|
142 | status "login successful"; |
144 | status "login successful"; |
143 | |
145 | |
144 | CFClient::lowdelay fileno $CONN->{fh}; |
146 | $BUTTONBAR->{children}[1]->emit ("activate") |
|
|
147 | if $BUTTONBAR->{children}[1]->{state}; |
|
|
148 | |
145 | } else { |
149 | } else { |
146 | status "unable to connect"; |
150 | status "unable to connect"; |
147 | stop_game(); |
151 | stop_game(); |
148 | } |
152 | } |
149 | } |
153 | } |
… | |
… | |
153 | |
157 | |
154 | status "connection closed"; |
158 | status "connection closed"; |
155 | $LOGIN_BUTTON->set_text ("Login"); |
159 | $LOGIN_BUTTON->set_text ("Login"); |
156 | $CONN->destroy; |
160 | $CONN->destroy; |
157 | $CONN = 0; # false, does not autovivify |
161 | $CONN = 0; # false, does not autovivify |
|
|
162 | |
|
|
163 | $BUTTONBAR->{children}[1]->emit ("activate") |
|
|
164 | unless $BUTTONBAR->{children}[1]->{state}; |
158 | |
165 | |
159 | undef $MAPCACHE; |
166 | undef $MAPCACHE; |
160 | undef $MAP; |
167 | undef $MAP; |
161 | } |
168 | } |
162 | |
169 | |
… | |
… | |
167 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
174 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
168 | |
175 | |
169 | $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); |
176 | $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); |
170 | $table->add (1, 0, my $hbox = new CFClient::UI::HBox); |
177 | $table->add (1, 0, my $hbox = new CFClient::UI::HBox); |
171 | |
178 | |
172 | $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); |
179 | $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); |
173 | $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); |
180 | $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); |
174 | |
181 | |
175 | $mode_slider->connect (changed => sub { |
182 | $mode_slider->connect (changed => sub { |
176 | my ($self, $value) = @_; |
183 | my ($self, $value) = @_; |
177 | |
184 | |
… | |
… | |
202 | } |
209 | } |
203 | ); |
210 | ); |
204 | |
211 | |
205 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); |
212 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); |
206 | $table->add (1, $row++, new CFClient::UI::Slider |
213 | $table->add (1, $row++, new CFClient::UI::Slider |
207 | range => [$CFG->{map_scale}, 0.25, 2, 0.05], |
214 | range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05], |
208 | tooltip => "Enlarge or shrink the displayed map", |
215 | tooltip => "Enlarge or shrink the displayed map", |
209 | connect_changed => sub { |
216 | connect_changed => sub { |
210 | my ($self, $value) = @_; |
217 | my ($self, $value) = @_; |
211 | $CFG->{map_scale} = 0.05 * int $value / 0.05; |
218 | $CFG->{map_scale} = $value; |
212 | } |
219 | } |
213 | ); |
220 | ); |
214 | |
221 | |
215 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); |
222 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); |
216 | $table->add (1, $row++, new CFClient::UI::CheckBox |
223 | $table->add (1, $row++, new CFClient::UI::CheckBox |
… | |
… | |
243 | } |
250 | } |
244 | ); |
251 | ); |
245 | |
252 | |
246 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); |
253 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); |
247 | $table->add (1, $row++, new CFClient::UI::Slider |
254 | $table->add (1, $row++, new CFClient::UI::Slider |
248 | range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], |
255 | range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1], |
249 | tooltip => "The font size used by most GUI elements", |
256 | tooltip => "The font size used by most GUI elements", |
250 | connect_changed => sub { |
257 | connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, |
251 | $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; |
|
|
252 | # $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; |
|
|
253 | } |
|
|
254 | ); |
258 | ); |
255 | |
259 | |
256 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); |
260 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); |
257 | $table->add (1, $row++, new CFClient::UI::Slider |
261 | $table->add (1, $row++, new CFClient::UI::Slider |
258 | range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], |
262 | range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1], |
259 | tooltip => "The font size used by the server log window only", |
263 | tooltip => "The font size used by the server log window only", |
260 | connect_changed => sub { |
264 | connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, |
261 | $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10); |
|
|
262 | } |
|
|
263 | ); |
265 | ); |
264 | |
266 | |
265 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); |
267 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); |
266 | |
268 | |
267 | $table->add (1, $row++, new CFClient::UI::Slider |
269 | $table->add (1, $row++, new CFClient::UI::Slider |
268 | range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], |
270 | range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1], |
269 | tooltip => "The font size used by the statistics window only", |
271 | tooltip => "The font size used by the statistics window only", |
270 | connect_changed => sub { |
272 | connect_changed => sub { |
271 | $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; |
273 | $CFG->{stat_fontsize} = $_[1]; |
272 | &set_stats_window_fontsize; |
274 | &set_stats_window_fontsize; |
273 | } |
275 | } |
274 | ); |
276 | ); |
275 | |
277 | |
276 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); |
278 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); |
277 | $table->add (1, $row++, new CFClient::UI::Slider |
279 | $table->add (1, $row++, new CFClient::UI::Slider |
278 | range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], |
280 | range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], |
279 | tooltip => "Adjust the size of the stats gauges at the bottom right", |
281 | tooltip => "Adjust the size of the stats gauges at the bottom right", |
280 | connect_changed => sub { |
282 | connect_changed => sub { |
281 | $CFG->{gauge_size} = $_[1]; |
283 | $CFG->{gauge_size} = $_[1]; |
282 | my $h = int $HEIGHT * $CFG->{gauge_size}; |
284 | $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); |
283 | $GAUGES->{win}->set_size ($WIDTH, $h); |
|
|
284 | $GAUGES->{win}->move (0, $HEIGHT - $h); |
|
|
285 | } |
285 | } |
286 | ); |
286 | ); |
287 | |
287 | |
288 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); |
288 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); |
289 | $table->add (1, $row++, new CFClient::UI::Slider |
289 | $table->add (1, $row++, new CFClient::UI::Slider |
290 | range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], |
290 | range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1], |
291 | tooltip => "Adjusts the fontsize of the gauges at the bottom right", |
291 | tooltip => "Adjusts the fontsize of the gauges at the bottom right", |
292 | connect_changed => sub { |
292 | connect_changed => sub { |
293 | $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; |
293 | $CFG->{gauge_fontsize} = $_[1]; |
294 | &set_gauge_window_fontsize; |
294 | &set_gauge_window_fontsize; |
295 | } |
295 | } |
296 | ); |
296 | ); |
297 | |
297 | |
298 | $table->add (1, $row++, new CFClient::UI::Button |
298 | $table->add (1, $row++, new CFClient::UI::Button |
… | |
… | |
372 | # local $GAUGES->{win}{parent};#d# |
372 | # local $GAUGES->{win}{parent};#d# |
373 | # use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; |
373 | # use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; |
374 | } |
374 | } |
375 | |
375 | |
376 | sub make_gauge_window { |
376 | sub make_gauge_window { |
377 | my $gh = int ($HEIGHT * $CFG->{gauge_size}); |
377 | my $gh = int $HEIGHT * $CFG->{gauge_size}; |
378 | # my $gw = int ($WIDTH * $CFG->{gauge_w_size}); |
|
|
379 | |
378 | |
380 | my $win = new CFClient::UI::Frame ( |
379 | my $win = new CFClient::UI::Frame ( |
381 | y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh |
380 | req_y => -1, |
|
|
381 | user_w => $WIDTH, |
|
|
382 | user_h => $gh, |
382 | ); |
383 | ); |
|
|
384 | |
383 | $win->add (my $hbox = new CFClient::UI::HBox |
385 | $win->add (my $hbox = new CFClient::UI::HBox |
384 | children => [ |
386 | children => [ |
385 | (new CFClient::UI::HBox expand => 1), |
387 | (new CFClient::UI::HBox expand => 1), |
386 | ($FLOORBOX = new CFClient::UI::VBox), |
388 | (new CFClient::UI::VBox children => [ |
|
|
389 | (new CFClient::UI::Empty expand => 1), |
|
|
390 | (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)), |
|
|
391 | ]), |
387 | (my $vbox = new CFClient::UI::VBox), |
392 | (my $vbox = new CFClient::UI::VBox), |
388 | ], |
393 | ], |
389 | ); |
394 | ); |
390 | |
395 | |
391 | $vbox->add (new CFClient::UI::HBox |
396 | $vbox->add (new CFClient::UI::HBox |
… | |
… | |
668 | $HOST->set_text ($CFG->{host} = $host); |
673 | $HOST->set_text ($CFG->{host} = $host); |
669 | }), |
674 | }), |
670 | (new CFClient::UI::Empty expand => 1), |
675 | (new CFClient::UI::Empty expand => 1), |
671 | ]); |
676 | ]); |
672 | |
677 | |
673 | $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) |
678 | $table->add ($_ + 1, $y, new CFClient::UI::Label |
|
|
679 | ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) |
674 | for 0 .. $#$m; |
680 | for 0 .. $#$m; |
675 | } |
681 | } |
676 | } |
682 | } |
677 | }); |
683 | }); |
678 | } |
684 | } |
… | |
… | |
734 | ); |
740 | ); |
735 | |
741 | |
736 | $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); |
742 | $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); |
737 | $table->add (1, 7, new CFClient::UI::Slider |
743 | $table->add (1, 7, new CFClient::UI::Slider |
738 | req_w => 100, |
744 | req_w => 100, |
739 | range => [$CFG->{mapsize}, 10, 100 + 1, 1], |
745 | range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1], |
740 | tooltip => "This is the size of the portion of the map update the server sends you. " |
746 | tooltip => "This is the size of the portion of the map update the server sends you. " |
741 | ."If you set this to a high value you will be able to see further for example.", |
747 | ."If you set this to a high value you will be able to see further for example.", |
742 | connect_changed => sub { |
748 | connect_changed => sub { |
743 | my ($self, $value) = @_; |
749 | my ($self, $value) = @_; |
744 | |
750 | |
… | |
… | |
812 | |
818 | |
813 | $window |
819 | $window |
814 | } |
820 | } |
815 | |
821 | |
816 | sub make_inventory_window { |
822 | sub make_inventory_window { |
817 | my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; |
823 | my $invwin = new CFClient::UI::FancyFrame |
|
|
824 | user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory"; |
|
|
825 | |
|
|
826 | $invwin->add (my $hb = new CFClient::UI::HBox); |
|
|
827 | |
|
|
828 | $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); |
|
|
829 | $vb1->add (my $lbl = new CFClient::UI::Label); |
|
|
830 | $lbl->set_text ("Player"); |
818 | $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); |
831 | $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); |
|
|
832 | |
|
|
833 | $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); |
|
|
834 | $vb2->add ($INVR_LBL = new CFClient::UI::Label); |
|
|
835 | $INVR_LBL->set_text ("Floor"); |
|
|
836 | $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); |
|
|
837 | |
819 | $invwin |
838 | $invwin |
820 | } |
839 | } |
821 | |
840 | |
822 | sub sdl_init { |
841 | sub sdl_init { |
823 | CFClient::SDL_Init |
842 | CFClient::SDL_Init |
… | |
… | |
845 | |
864 | |
846 | $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# |
865 | $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# |
847 | |
866 | |
848 | ############################################################################# |
867 | ############################################################################# |
849 | |
868 | |
850 | if ($DEBUG_STATUS) { |
869 | unless ($DEBUG_STATUS) { |
851 | # reconfigure all widgets |
|
|
852 | $CFClient::UI::ROOT->reconfigure; |
|
|
853 | |
|
|
854 | } else { |
|
|
855 | # create the widgets |
870 | # create the widgets |
856 | |
871 | |
857 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, text => "hulla", x => 100;#d# |
872 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; |
858 | $DEBUG_STATUS->show; |
873 | $DEBUG_STATUS->show; |
859 | |
874 | |
860 | $STATUS_LINE = new CFClient::UI::Statusbox; |
875 | $STATUSBOX = new CFClient::UI::Statusbox; |
861 | $STATUS_LINE->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, size => 0.8, color => [1, 1, 1, 0.8]); |
876 | $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); |
862 | $STATUS_LINE->show; |
877 | |
|
|
878 | (new CFClient::UI::Frame |
|
|
879 | bg => [0, 0, 0, 0.4], |
|
|
880 | req_y => -1, |
|
|
881 | child => $STATUSBOX, |
|
|
882 | )->show; |
863 | |
883 | |
864 | CFClient::UI::FancyFrame->new ( |
884 | CFClient::UI::FancyFrame->new ( |
865 | border_bg => [1, 1, 1, 192/255], |
885 | border_bg => [1, 1, 1, 192/255], |
866 | bg => [1, 1, 1, 0], |
886 | bg => [1, 1, 1, 0], |
867 | child => ($MAPMAP = new CFClient::MapWidget::MapMap), |
887 | child => ($MAPMAP = new CFClient::MapWidget::MapMap), |
… | |
… | |
899 | status "Configuration Saved"; |
919 | status "Configuration Saved"; |
900 | }); |
920 | }); |
901 | |
921 | |
902 | $BUTTONBAR->show; |
922 | $BUTTONBAR->show; |
903 | |
923 | |
|
|
924 | $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); |
|
|
925 | |
904 | # delay till geometry is constant |
926 | # delay till geometry is constant |
905 | $CFClient::UI::ROOT->on_refresh (startup => sub { |
927 | $CFClient::UI::ROOT->on_post_alloc (startup => sub { |
906 | $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup |
928 | $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup |
|
|
929 | my $widget = $GAUGES->{win}; |
|
|
930 | $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel |
907 | }); |
931 | }); |
908 | force_refresh (); |
932 | force_refresh (); |
909 | } |
933 | } |
910 | } |
934 | } |
911 | |
935 | |
… | |
… | |
972 | my $animate_timer; |
996 | my $animate_timer; |
973 | |
997 | |
974 | my $fps = 9; |
998 | my $fps = 9; |
975 | |
999 | |
976 | sub force_refresh { |
1000 | sub force_refresh { |
977 | $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; |
1001 | $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; |
978 | debug sprintf "%3.2f", $fps; |
1002 | debug sprintf "%3.2f", $fps; |
979 | |
1003 | |
980 | $CFClient::UI::ROOT->draw; |
1004 | $CFClient::UI::ROOT->draw; |
981 | CFClient::SDL_GL_SwapBuffers; |
1005 | CFClient::SDL_GL_SwapBuffers; |
982 | |
1006 | |
… | |
… | |
1015 | |
1039 | |
1016 | @conn::ISA = Crossfire::Protocol::; |
1040 | @conn::ISA = Crossfire::Protocol::; |
1017 | |
1041 | |
1018 | sub conn::stats_update { |
1042 | sub conn::stats_update { |
1019 | my ($self, $stats) = @_; |
1043 | my ($self, $stats) = @_; |
|
|
1044 | |
|
|
1045 | if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) { |
|
|
1046 | my $diff = $exp - $self->{prev_exp}; |
|
|
1047 | $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) |
|
|
1048 | if exists $self->{prev_exp} && $diff; |
|
|
1049 | $self->{prev_exp} = $exp; |
|
|
1050 | } |
1020 | |
1051 | |
1021 | update_stats_window ($stats); |
1052 | update_stats_window ($stats); |
1022 | } |
1053 | } |
1023 | |
1054 | |
1024 | sub conn::user_send { |
1055 | sub conn::user_send { |
… | |
… | |
1323 | [0.74, 0.65, 0.41], |
1354 | [0.74, 0.65, 0.41], |
1324 | ); |
1355 | ); |
1325 | |
1356 | |
1326 | my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; |
1357 | my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; |
1327 | |
1358 | |
1328 | $text =~ s/&/&/g; $text =~ s/</</g; |
1359 | $text = CFClient::UI::Label::escape $text; |
1329 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
1360 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
1330 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
1361 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
1331 | |
1362 | |
1332 | $LOGVIEW->add_paragraph ($color[$color], |
1363 | $LOGVIEW->add_paragraph ($color[$color], |
1333 | join "\n", map "$time $_", split /\n/, $text); |
1364 | join "\n", map "$time $_", split /\n/, $text); |
1334 | $STATUS_LINE->add ($text, color => $color[$color], timeout => 60); |
1365 | |
|
|
1366 | $STATUSBOX->add ($text, |
|
|
1367 | group => $text, |
|
|
1368 | fg => $color[$color], |
|
|
1369 | timeout => 60, |
|
|
1370 | tooltip_font => $::FONT_FIXED, |
|
|
1371 | ); |
1335 | } |
1372 | } |
1336 | |
1373 | |
1337 | sub conn::drawextinfo { |
1374 | sub conn::drawextinfo { |
1338 | my ($self, $color, $type, $subtype, $message) = @_; |
1375 | my ($self, $color, $type, $subtype, $message) = @_; |
1339 | |
1376 | |
… | |
… | |
1343 | sub conn::spell_add { |
1380 | sub conn::spell_add { |
1344 | my ($self, $spell) = @_; |
1381 | my ($self, $spell) = @_; |
1345 | |
1382 | |
1346 | # TODO |
1383 | # TODO |
1347 | # create a widget dynamically, using spell face (CF::Protocol downloads them) |
1384 | # create a widget dynamically, using spell face (CF::Protocol downloads them) |
1348 | $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); |
1385 | $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); |
1349 | $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); |
1386 | $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); |
1350 | } |
1387 | } |
1351 | |
1388 | |
1352 | sub conn::spell_delete { |
1389 | sub conn::spell_delete { |
1353 | my ($self, $spell) = @_; |
1390 | my ($self, $spell) = @_; |
1354 | } |
1391 | } |
1355 | |
1392 | |
1356 | sub conn::addme_success { |
1393 | sub conn::addme_success { |
1357 | my ($self) = @_; |
1394 | my ($self) = @_; |
1358 | |
1395 | |
|
|
1396 | $MAPWIDGET->clr_commands; |
|
|
1397 | |
1359 | for my $skill (values %{$self->{skill_info}}) { |
1398 | for my $skill (values %{$self->{skill_info}}) { |
1360 | $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); |
1399 | $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'"); |
1361 | $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); |
1400 | $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'"); |
1362 | } |
1401 | } |
1363 | |
1402 | |
1364 | $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you"); |
1403 | $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you"); |
1365 | $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players"); |
1404 | $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players"); |
1366 | $MAPWIDGET->add_command ("pet\\_mode sad", "Search & Destroy - tell pets to roam about and attack enemies"); |
1405 | $MAPWIDGET->add_command ("petmode sad", "Search & Destroy - tell pets to roam about and attack enemies"); |
1367 | $MAPWIDGET->add_command ("kill\\_pets", "kill your pets"); |
1406 | $MAPWIDGET->add_command ("killpets", "Kill your pets"); |
|
|
1407 | $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players"); |
|
|
1408 | $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies"); |
|
|
1409 | $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player"); |
|
|
1410 | |
|
|
1411 | my $parser = new Pod::POM; |
|
|
1412 | my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod"); |
|
|
1413 | |
|
|
1414 | for my $head2 ($pod->head2) { |
|
|
1415 | $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
|
|
1416 | or next; |
|
|
1417 | |
|
|
1418 | my $cmd = $1; |
|
|
1419 | my @args = split /\|/, $2; |
|
|
1420 | @args = (".*") unless @args; |
|
|
1421 | |
|
|
1422 | my $text = CFClient::pod_to_pango $head2->content; |
|
|
1423 | |
|
|
1424 | for my $arg (@args) { |
|
|
1425 | $arg = $arg eq ".*" ? "" : " $arg"; |
|
|
1426 | |
|
|
1427 | $MAPWIDGET->add_command ("$cmd$arg", $text); |
|
|
1428 | } |
|
|
1429 | } |
1368 | } |
1430 | } |
1369 | |
1431 | |
1370 | sub conn::eof { |
1432 | sub conn::eof { |
|
|
1433 | $MAPWIDGET->clr_commands; |
|
|
1434 | |
1371 | stop_game; |
1435 | stop_game; |
1372 | } |
1436 | } |
1373 | |
1437 | |
1374 | sub update_floorbox { |
1438 | sub update_floorbox { |
1375 | $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { |
1439 | $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { |
… | |
… | |
1393 | } |
1457 | } |
1394 | |
1458 | |
1395 | sub conn::container_add { |
1459 | sub conn::container_add { |
1396 | my ($self, $tag, $items) = @_; |
1460 | my ($self, $tag, $items) = @_; |
1397 | |
1461 | |
1398 | update_floorbox if $tag == 0; |
1462 | #d# print "container_add: container $tag ($self->{player}{tag})\n"; |
1399 | |
1463 | |
|
|
1464 | if ($tag == 0) { |
|
|
1465 | update_floorbox; |
|
|
1466 | $OPENCONT = 0; |
|
|
1467 | $INVR_LBL->set_text ("Floor"); |
|
|
1468 | $INVR->set_items ($self->{container}{0}); |
|
|
1469 | } elsif ($tag == $self->{player}{tag}) { |
|
|
1470 | $INVR_LBL->set_text ("Player"); |
1400 | $INV->set_items ($self->{container}{$self->{player}{tag}}) |
1471 | $INV->set_items ($self->{container}{$self->{player}{tag}}) |
1401 | if $tag == $self->{player}{tag}; |
1472 | } else { |
|
|
1473 | $OPENCONT = $tag; |
|
|
1474 | $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT})); |
|
|
1475 | $INVR->set_items ($self->{container}{$tag}); |
|
|
1476 | } |
1402 | |
1477 | |
1403 | # $self-<{player}{tag} => player inv |
1478 | # $self-<{player}{tag} => player inv |
1404 | #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; |
1479 | #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; |
1405 | } |
1480 | } |
1406 | |
1481 | |
1407 | sub conn::container_clear { |
1482 | sub conn::container_clear { |
1408 | my ($self, $tag) = @_; |
1483 | my ($self, $tag) = @_; |
1409 | |
1484 | |
1410 | update_floorbox if $tag == 0; |
1485 | #d# print "container_clear: container $tag ($self->{player}{tag})\n"; |
1411 | |
1486 | |
|
|
1487 | if ($tag == 0) { |
|
|
1488 | update_floorbox; |
|
|
1489 | $OPENCONT = 0; |
|
|
1490 | $INVR_LBL->set_text ("Floor"); |
|
|
1491 | $INVR->set_items ($self->{container}{0}); |
|
|
1492 | } elsif ($tag == $self->{player}{tag}) { |
|
|
1493 | $INVR_LBL->set_text ("Player"); |
1412 | $INV->set_items ($self->{container}{$tag}) |
1494 | $INV->set_items ($self->{container}{$tag}) |
1413 | if $tag == $self->{player}{tag}; |
1495 | } else { |
|
|
1496 | $OPENCONT = $tag; |
|
|
1497 | $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT})); |
|
|
1498 | $INVR->set_items ($self->{container}{$tag}); |
|
|
1499 | } |
1414 | |
1500 | |
1415 | # use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; |
1501 | # use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; |
1416 | } |
1502 | } |
1417 | |
1503 | |
1418 | sub conn::item_delete { |
1504 | sub conn::item_delete { |
1419 | my ($self, @items) = @_; |
1505 | my ($self, @items) = @_; |
1420 | |
1506 | |
1421 | for (@items) { |
1507 | for (@items) { |
1422 | update_floorbox if $_->{container} == 0; |
1508 | #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n"; |
1423 | |
1509 | |
|
|
1510 | if ($_->{container} == 0) { |
|
|
1511 | update_floorbox; |
|
|
1512 | $OPENCONT = 0; |
|
|
1513 | $INVR_LBL->set_text ("Floor"); |
|
|
1514 | $INVR->set_items ($self->{container}{0}); |
|
|
1515 | } elsif ($_->{container} == $self->{player}{tag}) { |
|
|
1516 | $INVR_LBL->set_text ("Player"); |
|
|
1517 | $INV->set_items ($self->{container}{$self->{player}{tag}}) |
|
|
1518 | } else { |
|
|
1519 | $OPENCONT = $_->{container}; |
|
|
1520 | $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT})); |
1424 | $INV->set_items ($self->{container}{$_->{container}}) |
1521 | $INVR->set_items ($self->{container}{$_->{container}}); |
1425 | if $_->{container} == $self->{player}{tag}; |
1522 | } |
1426 | } |
1523 | } |
1427 | } |
1524 | } |
1428 | |
1525 | |
1429 | sub conn::item_update { |
1526 | sub conn::item_update { |
1430 | my ($self, $item) = @_; |
1527 | my ($self, $item) = @_; |
1431 | |
1528 | |
1432 | update_floorbox if $item->{container} == 0; |
1529 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n"; |
1433 | |
1530 | |
|
|
1531 | if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) { |
|
|
1532 | $OPENCONT = 0; |
|
|
1533 | $INVR_LBL->set_text ("Floor"); |
|
|
1534 | $INVR->set_items ($self->{container}{0}); |
|
|
1535 | |
|
|
1536 | $item->{widget}->update_item |
|
|
1537 | if $item->{widget}; |
|
|
1538 | } else { |
|
|
1539 | if ($item->{container} == 0) { |
|
|
1540 | update_floorbox; |
|
|
1541 | $OPENCONT = 0; |
|
|
1542 | $INVR_LBL->set_text ("Floor"); |
|
|
1543 | $INVR->set_items ($self->{container}{0}); |
|
|
1544 | } elsif ($item->{container} == $self->{player}{tag}) { |
1434 | $INV->set_items ($self->{container}{$item->{container}}) |
1545 | $INV->set_items ($self->{container}{$item->{container}}) |
1435 | if $item->{container} == $self->{player}{tag}; |
1546 | } |
|
|
1547 | } |
1436 | } |
1548 | } |
1437 | |
1549 | |
1438 | %SDL_CB = ( |
1550 | %SDL_CB = ( |
1439 | CFClient::SDL_QUIT => sub { |
1551 | CFClient::SDL_QUIT => sub { |
1440 | Event::unloop -1; |
1552 | Event::unloop -1; |
… | |
… | |
1531 | DejaVuSansMono-BoldOblique.ttf |
1643 | DejaVuSansMono-BoldOblique.ttf |
1532 | ); |
1644 | ); |
1533 | |
1645 | |
1534 | CFClient::add_font $_ for @fonts; |
1646 | CFClient::add_font $_ for @fonts; |
1535 | |
1647 | |
|
|
1648 | CFClient::pango_init; |
|
|
1649 | |
1536 | $FONT_PROP = new_from_file CFClient::Font $fonts[0]; |
1650 | $FONT_PROP = new_from_file CFClient::Font $fonts[0]; |
1537 | $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; |
1651 | $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; |
1538 | |
1652 | |
1539 | $FONT_PROP->make_default; |
1653 | $FONT_PROP->make_default; |
1540 | } |
1654 | } |
|
|
1655 | |
|
|
1656 | # compare mono (ft) vs. rgba (cairo) |
|
|
1657 | # ft - 1.8s, cairo 3s, even in alpha-only mode |
|
|
1658 | # for my $rgba (0..1) { |
|
|
1659 | # my $t1 = Time::HiRes::time; |
|
|
1660 | # for (1..1000) { |
|
|
1661 | # my $layout = CFClient::Layout->new ($rgba); |
|
|
1662 | # $layout->set_text ("hallo" x 100); |
|
|
1663 | # $layout->render; |
|
|
1664 | # } |
|
|
1665 | # my $t2 = Time::HiRes::time; |
|
|
1666 | # warn $t2-$t1; |
|
|
1667 | # } |
1541 | |
1668 | |
1542 | video_init; |
1669 | video_init; |
1543 | audio_init; |
1670 | audio_init; |
1544 | } |
1671 | } |
1545 | |
1672 | |