… | |
… | |
99 | our $STATUSBOX; |
99 | our $STATUSBOX; |
100 | our $DEBUG_STATUS; |
100 | our $DEBUG_STATUS; |
101 | |
101 | |
102 | our $INVWIN; |
102 | our $INVWIN; |
103 | our $INV; |
103 | our $INV; |
|
|
104 | our $INVR; |
|
|
105 | our $OPENCONT; |
104 | |
106 | |
105 | sub status { |
107 | sub status { |
106 | $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, color => [1, 1, 0, 1]); |
108 | $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]); |
107 | $CFClient::UI::ROOT->on_post_alloc (status_line_positioner => sub { |
|
|
108 | my $widget = $STATUSBOX->{parent}; |
|
|
109 | $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel |
|
|
110 | }); |
|
|
111 | } |
109 | } |
112 | |
110 | |
113 | sub debug { |
111 | sub debug { |
114 | $DEBUG_STATUS->set_text ($_[0]); |
112 | $DEBUG_STATUS->set_text ($_[0]); |
115 | my ($w, $h) = $DEBUG_STATUS->size_request; |
113 | my ($w, $h) = $DEBUG_STATUS->size_request; |
… | |
… | |
168 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
166 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
169 | |
167 | |
170 | $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); |
168 | $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); |
171 | $table->add (1, 0, my $hbox = new CFClient::UI::HBox); |
169 | $table->add (1, 0, my $hbox = new CFClient::UI::HBox); |
172 | |
170 | |
173 | $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); |
171 | $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); |
174 | $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); |
172 | $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); |
175 | |
173 | |
176 | $mode_slider->connect (changed => sub { |
174 | $mode_slider->connect (changed => sub { |
177 | my ($self, $value) = @_; |
175 | my ($self, $value) = @_; |
178 | |
176 | |
… | |
… | |
203 | } |
201 | } |
204 | ); |
202 | ); |
205 | |
203 | |
206 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); |
204 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); |
207 | $table->add (1, $row++, new CFClient::UI::Slider |
205 | $table->add (1, $row++, new CFClient::UI::Slider |
208 | range => [$CFG->{map_scale}, 0.25, 2, 0.05], |
206 | range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05], |
209 | tooltip => "Enlarge or shrink the displayed map", |
207 | tooltip => "Enlarge or shrink the displayed map", |
210 | connect_changed => sub { |
208 | connect_changed => sub { |
211 | my ($self, $value) = @_; |
209 | my ($self, $value) = @_; |
212 | $CFG->{map_scale} = 0.05 * int $value / 0.05; |
210 | $CFG->{map_scale} = $value; |
213 | } |
211 | } |
214 | ); |
212 | ); |
215 | |
213 | |
216 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); |
214 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); |
217 | $table->add (1, $row++, new CFClient::UI::CheckBox |
215 | $table->add (1, $row++, new CFClient::UI::CheckBox |
… | |
… | |
244 | } |
242 | } |
245 | ); |
243 | ); |
246 | |
244 | |
247 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); |
245 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); |
248 | $table->add (1, $row++, new CFClient::UI::Slider |
246 | $table->add (1, $row++, new CFClient::UI::Slider |
249 | range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], |
247 | range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1], |
250 | tooltip => "The font size used by most GUI elements", |
248 | tooltip => "The font size used by most GUI elements", |
251 | connect_changed => sub { |
249 | connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, |
252 | $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; |
|
|
253 | # $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; |
|
|
254 | } |
|
|
255 | ); |
250 | ); |
256 | |
251 | |
257 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); |
252 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); |
258 | $table->add (1, $row++, new CFClient::UI::Slider |
253 | $table->add (1, $row++, new CFClient::UI::Slider |
259 | range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], |
254 | range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1], |
260 | tooltip => "The font size used by the server log window only", |
255 | tooltip => "The font size used by the server log window only", |
261 | connect_changed => sub { |
256 | connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, |
262 | $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10); |
|
|
263 | } |
|
|
264 | ); |
257 | ); |
265 | |
258 | |
266 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); |
259 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); |
267 | |
260 | |
268 | $table->add (1, $row++, new CFClient::UI::Slider |
261 | $table->add (1, $row++, new CFClient::UI::Slider |
269 | range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], |
262 | range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1], |
270 | tooltip => "The font size used by the statistics window only", |
263 | tooltip => "The font size used by the statistics window only", |
271 | connect_changed => sub { |
264 | connect_changed => sub { |
272 | $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; |
265 | $CFG->{stat_fontsize} = $_[1]; |
273 | &set_stats_window_fontsize; |
266 | &set_stats_window_fontsize; |
274 | } |
267 | } |
275 | ); |
268 | ); |
276 | |
269 | |
277 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); |
270 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); |
278 | $table->add (1, $row++, new CFClient::UI::Slider |
271 | $table->add (1, $row++, new CFClient::UI::Slider |
279 | range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], |
272 | range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], |
280 | tooltip => "Adjust the size of the stats gauges at the bottom right", |
273 | tooltip => "Adjust the size of the stats gauges at the bottom right", |
281 | connect_changed => sub { |
274 | connect_changed => sub { |
282 | $CFG->{gauge_size} = $_[1]; |
275 | $CFG->{gauge_size} = $_[1]; |
283 | my $h = int $HEIGHT * $CFG->{gauge_size}; |
276 | $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); |
284 | $GAUGES->{win}->set_size ($WIDTH, $h); |
|
|
285 | $GAUGES->{win}->move (0, $HEIGHT - $h); |
|
|
286 | } |
277 | } |
287 | ); |
278 | ); |
288 | |
279 | |
289 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); |
280 | $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); |
290 | $table->add (1, $row++, new CFClient::UI::Slider |
281 | $table->add (1, $row++, new CFClient::UI::Slider |
291 | range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], |
282 | range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1], |
292 | tooltip => "Adjusts the fontsize of the gauges at the bottom right", |
283 | tooltip => "Adjusts the fontsize of the gauges at the bottom right", |
293 | connect_changed => sub { |
284 | connect_changed => sub { |
294 | $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; |
285 | $CFG->{gauge_fontsize} = $_[1]; |
295 | &set_gauge_window_fontsize; |
286 | &set_gauge_window_fontsize; |
296 | } |
287 | } |
297 | ); |
288 | ); |
298 | |
289 | |
299 | $table->add (1, $row++, new CFClient::UI::Button |
290 | $table->add (1, $row++, new CFClient::UI::Button |
… | |
… | |
373 | # local $GAUGES->{win}{parent};#d# |
364 | # local $GAUGES->{win}{parent};#d# |
374 | # use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; |
365 | # use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; |
375 | } |
366 | } |
376 | |
367 | |
377 | sub make_gauge_window { |
368 | sub make_gauge_window { |
378 | my $gh = int ($HEIGHT * $CFG->{gauge_size}); |
369 | my $gh = int $HEIGHT * $CFG->{gauge_size}; |
379 | # my $gw = int ($WIDTH * $CFG->{gauge_w_size}); |
|
|
380 | |
370 | |
381 | my $win = new CFClient::UI::Frame ( |
371 | my $win = new CFClient::UI::Frame ( |
382 | y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh |
372 | req_y => -1, |
|
|
373 | user_w => $WIDTH, |
|
|
374 | user_h => $gh, |
383 | ); |
375 | ); |
|
|
376 | |
384 | $win->add (my $hbox = new CFClient::UI::HBox |
377 | $win->add (my $hbox = new CFClient::UI::HBox |
385 | children => [ |
378 | children => [ |
386 | (new CFClient::UI::HBox expand => 1), |
379 | (new CFClient::UI::HBox expand => 1), |
387 | (new CFClient::UI::VBox children => [ |
380 | (new CFClient::UI::VBox children => [ |
388 | (new CFClient::UI::Empty expand => 1), |
381 | (new CFClient::UI::Empty expand => 1), |
… | |
… | |
738 | ); |
731 | ); |
739 | |
732 | |
740 | $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); |
733 | $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); |
741 | $table->add (1, 7, new CFClient::UI::Slider |
734 | $table->add (1, 7, new CFClient::UI::Slider |
742 | req_w => 100, |
735 | req_w => 100, |
743 | range => [$CFG->{mapsize}, 10, 100 + 1, 1], |
736 | range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1], |
744 | tooltip => "This is the size of the portion of the map update the server sends you. " |
737 | tooltip => "This is the size of the portion of the map update the server sends you. " |
745 | ."If you set this to a high value you will be able to see further for example.", |
738 | ."If you set this to a high value you will be able to see further for example.", |
746 | connect_changed => sub { |
739 | connect_changed => sub { |
747 | my ($self, $value) = @_; |
740 | my ($self, $value) = @_; |
748 | |
741 | |
… | |
… | |
816 | |
809 | |
817 | $window |
810 | $window |
818 | } |
811 | } |
819 | |
812 | |
820 | sub make_inventory_window { |
813 | sub make_inventory_window { |
821 | my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; |
814 | my $invwin = new CFClient::UI::FancyFrame |
|
|
815 | user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory"; |
|
|
816 | |
|
|
817 | $invwin->add (my $hb = new CFClient::UI::HBox); |
822 | $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); |
818 | $hb->add ($INV = new CFClient::UI::Inventory expand => 1); |
|
|
819 | $hb->add ($INVR = new CFClient::UI::Inventory expand => 1); |
|
|
820 | |
823 | $invwin |
821 | $invwin |
824 | } |
822 | } |
825 | |
823 | |
826 | sub sdl_init { |
824 | sub sdl_init { |
827 | CFClient::SDL_Init |
825 | CFClient::SDL_Init |
… | |
… | |
852 | ############################################################################# |
850 | ############################################################################# |
853 | |
851 | |
854 | unless ($DEBUG_STATUS) { |
852 | unless ($DEBUG_STATUS) { |
855 | # create the widgets |
853 | # create the widgets |
856 | |
854 | |
857 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; |
855 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; |
858 | $DEBUG_STATUS->show; |
856 | $DEBUG_STATUS->show; |
859 | |
857 | |
860 | $STATUSBOX = new CFClient::UI::Statusbox; |
858 | $STATUSBOX = new CFClient::UI::Statusbox; |
861 | $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, size => 0.8, color => [1, 1, 1, 0.8]); |
859 | $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); |
862 | |
860 | |
863 | (new CFClient::UI::Frame |
861 | (new CFClient::UI::Frame |
864 | bg => [0, 0, 0, 0.4], |
862 | bg => [0, 0, 0, 0.4], |
|
|
863 | req_y => -1, |
865 | child => $STATUSBOX, |
864 | child => $STATUSBOX, |
866 | )->show; |
865 | )->show; |
867 | |
866 | |
868 | CFClient::UI::FancyFrame->new ( |
867 | CFClient::UI::FancyFrame->new ( |
869 | border_bg => [1, 1, 1, 192/255], |
868 | border_bg => [1, 1, 1, 192/255], |
870 | bg => [1, 1, 1, 0], |
869 | bg => [1, 1, 1, 0], |
… | |
… | |
903 | status "Configuration Saved"; |
902 | status "Configuration Saved"; |
904 | }); |
903 | }); |
905 | |
904 | |
906 | $BUTTONBAR->show; |
905 | $BUTTONBAR->show; |
907 | |
906 | |
|
|
907 | $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); |
|
|
908 | |
908 | # delay till geometry is constant |
909 | # delay till geometry is constant |
909 | $CFClient::UI::ROOT->on_post_alloc (startup => sub { |
910 | $CFClient::UI::ROOT->on_post_alloc (startup => sub { |
910 | $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup |
911 | $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup |
|
|
912 | my $widget = $GAUGES->{win}; |
|
|
913 | $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel |
911 | }); |
914 | }); |
912 | force_refresh (); |
915 | force_refresh (); |
913 | } |
916 | } |
914 | } |
917 | } |
915 | |
918 | |
… | |
… | |
976 | my $animate_timer; |
979 | my $animate_timer; |
977 | |
980 | |
978 | my $fps = 9; |
981 | my $fps = 9; |
979 | |
982 | |
980 | sub force_refresh { |
983 | sub force_refresh { |
981 | $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; |
984 | $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; |
982 | debug sprintf "%3.2f", $fps; |
985 | debug sprintf "%3.2f", $fps; |
983 | |
986 | |
984 | $CFClient::UI::ROOT->draw; |
987 | $CFClient::UI::ROOT->draw; |
985 | CFClient::SDL_GL_SwapBuffers; |
988 | CFClient::SDL_GL_SwapBuffers; |
986 | |
989 | |
… | |
… | |
1327 | [0.74, 0.65, 0.41], |
1330 | [0.74, 0.65, 0.41], |
1328 | ); |
1331 | ); |
1329 | |
1332 | |
1330 | my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; |
1333 | my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; |
1331 | |
1334 | |
1332 | $text =~ s/&/&/g; $text =~ s/</</g; |
1335 | $text = CFClient::UI::Label::escape $text; |
1333 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
1336 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
1334 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
1337 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
1335 | |
1338 | |
1336 | $LOGVIEW->add_paragraph ($color[$color], |
1339 | $LOGVIEW->add_paragraph ($color[$color], |
1337 | join "\n", map "$time $_", split /\n/, $text); |
1340 | join "\n", map "$time $_", split /\n/, $text); |
1338 | |
1341 | |
1339 | $STATUSBOX->add ($text, |
1342 | $STATUSBOX->add ($text, |
1340 | group => $text, |
1343 | group => $text, |
1341 | color => $color[$color], |
1344 | fg => $color[$color], |
1342 | timeout => 60, |
1345 | timeout => 60, |
1343 | tooltip_font => $::FONT_FIXED, |
1346 | tooltip_font => $::FONT_FIXED, |
1344 | ); |
1347 | ); |
1345 | } |
1348 | } |
1346 | |
1349 | |
… | |
… | |
1364 | } |
1367 | } |
1365 | |
1368 | |
1366 | sub conn::addme_success { |
1369 | sub conn::addme_success { |
1367 | my ($self) = @_; |
1370 | my ($self) = @_; |
1368 | |
1371 | |
|
|
1372 | $MAPWIDGET->clr_commands; |
|
|
1373 | |
1369 | for my $skill (values %{$self->{skill_info}}) { |
1374 | for my $skill (values %{$self->{skill_info}}) { |
1370 | $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); |
1375 | $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); |
1371 | $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); |
1376 | $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); |
1372 | } |
1377 | } |
1373 | |
1378 | |
1374 | $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you"); |
1379 | $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you"); |
1375 | $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players"); |
1380 | $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players"); |
1376 | $MAPWIDGET->add_command ("pet\\_mode sad", "Search & Destroy - tell pets to roam about and attack enemies"); |
1381 | $MAPWIDGET->add_command ("petmode sad", "Search & Destroy - tell pets to roam about and attack enemies"); |
1377 | $MAPWIDGET->add_command ("kill\\_pets", "kill your pets"); |
1382 | $MAPWIDGET->add_command ("killpets", "Kill your pets"); |
|
|
1383 | $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players"); |
|
|
1384 | $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies"); |
|
|
1385 | $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player"); |
|
|
1386 | |
|
|
1387 | # TODO: add documentation on these |
|
|
1388 | for (qw( |
|
|
1389 | afk |
|
|
1390 | apply |
|
|
1391 | body |
|
|
1392 | bowmode |
|
|
1393 | brace |
|
|
1394 | build |
|
|
1395 | disarm |
|
|
1396 | dm |
|
|
1397 | dmhide |
|
|
1398 | drop |
|
|
1399 | dropall |
|
|
1400 | examine |
|
|
1401 | get |
|
|
1402 | gsay |
|
|
1403 | help |
|
|
1404 | hiscore |
|
|
1405 | inventory |
|
|
1406 | invoke |
|
|
1407 | killpets |
|
|
1408 | listen |
|
|
1409 | logs |
|
|
1410 | mapinfo |
|
|
1411 | maps |
|
|
1412 | mark |
|
|
1413 | motd |
|
|
1414 | output-count |
|
|
1415 | output-sync |
|
|
1416 | party |
|
|
1417 | peaceful |
|
|
1418 | petmode |
|
|
1419 | pickup |
|
|
1420 | players |
|
|
1421 | prepare |
|
|
1422 | quests |
|
|
1423 | rename |
|
|
1424 | resistances |
|
|
1425 | rotateshoottype |
|
|
1426 | save |
|
|
1427 | say |
|
|
1428 | search |
|
|
1429 | search-items |
|
|
1430 | showpets |
|
|
1431 | skills |
|
|
1432 | sound |
|
|
1433 | take |
|
|
1434 | throw |
|
|
1435 | time |
|
|
1436 | title |
|
|
1437 | usekeys |
|
|
1438 | version |
|
|
1439 | weather |
|
|
1440 | whereabouts |
|
|
1441 | whereami |
|
|
1442 | who |
|
|
1443 | wimpy |
|
|
1444 | )) { |
|
|
1445 | $MAPWIDGET->add_command ($_, "$_: no help available (yet)"); |
|
|
1446 | } |
|
|
1447 | |
|
|
1448 | #TODO: add " and ' "aliases" etc. |
1378 | } |
1449 | } |
1379 | |
1450 | |
1380 | sub conn::eof { |
1451 | sub conn::eof { |
|
|
1452 | $MAPWIDGET->clr_commands; |
|
|
1453 | |
1381 | stop_game; |
1454 | stop_game; |
1382 | } |
1455 | } |
1383 | |
1456 | |
1384 | sub update_floorbox { |
1457 | sub update_floorbox { |
1385 | $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { |
1458 | $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { |
… | |
… | |
1403 | } |
1476 | } |
1404 | |
1477 | |
1405 | sub conn::container_add { |
1478 | sub conn::container_add { |
1406 | my ($self, $tag, $items) = @_; |
1479 | my ($self, $tag, $items) = @_; |
1407 | |
1480 | |
1408 | update_floorbox if $tag == 0; |
1481 | #d# print "container_add: container $tag ($self->{player}{tag})\n"; |
1409 | |
1482 | |
|
|
1483 | if ($tag == 0) { |
|
|
1484 | update_floorbox; |
|
|
1485 | $OPENCONT = 0; |
|
|
1486 | $INVR->set_items ($self->{container}{0}); |
|
|
1487 | } elsif ($tag == $self->{player}{tag}) { |
1410 | $INV->set_items ($self->{container}{$self->{player}{tag}}) |
1488 | $INV->set_items ($self->{container}{$self->{player}{tag}}) |
1411 | if $tag == $self->{player}{tag}; |
1489 | } else { |
|
|
1490 | $OPENCONT = $tag; |
|
|
1491 | $INVR->set_items ($self->{container}{$tag}); |
|
|
1492 | } |
1412 | |
1493 | |
1413 | # $self-<{player}{tag} => player inv |
1494 | # $self-<{player}{tag} => player inv |
1414 | #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; |
1495 | #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; |
1415 | } |
1496 | } |
1416 | |
1497 | |
1417 | sub conn::container_clear { |
1498 | sub conn::container_clear { |
1418 | my ($self, $tag) = @_; |
1499 | my ($self, $tag) = @_; |
1419 | |
1500 | |
1420 | update_floorbox if $tag == 0; |
1501 | #d# print "container_clear: container $tag ($self->{player}{tag})\n"; |
1421 | |
1502 | |
|
|
1503 | if ($tag == 0) { |
|
|
1504 | update_floorbox; |
|
|
1505 | $OPENCONT = 0; |
|
|
1506 | $INVR->set_items ($self->{container}{0}); |
|
|
1507 | } elsif ($tag == $self->{player}{tag}) { |
1422 | $INV->set_items ($self->{container}{$tag}) |
1508 | $INV->set_items ($self->{container}{$tag}) |
1423 | if $tag == $self->{player}{tag}; |
1509 | } else { |
|
|
1510 | $OPENCONT = $tag; |
|
|
1511 | $INVR->set_items ($self->{container}{$tag}); |
|
|
1512 | } |
1424 | |
1513 | |
1425 | # use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; |
1514 | # use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; |
1426 | } |
1515 | } |
1427 | |
1516 | |
1428 | sub conn::item_delete { |
1517 | sub conn::item_delete { |
1429 | my ($self, @items) = @_; |
1518 | my ($self, @items) = @_; |
1430 | |
1519 | |
1431 | for (@items) { |
1520 | for (@items) { |
1432 | update_floorbox if $_->{container} == 0; |
1521 | #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n"; |
1433 | |
1522 | |
|
|
1523 | if ($_->{container} == 0) { |
|
|
1524 | update_floorbox; |
|
|
1525 | $OPENCONT = 0; |
|
|
1526 | $INVR->set_items ($self->{container}{0}); |
|
|
1527 | } elsif ($_->{container} == $self->{player}{tag}) { |
|
|
1528 | $INV->set_items ($self->{container}{$self->{player}{tag}}) |
|
|
1529 | } else { |
|
|
1530 | $OPENCONT = $_->{container}; |
1434 | $INV->set_items ($self->{container}{$_->{container}}) |
1531 | $INVR->set_items ($self->{container}{$_->{container}}); |
1435 | if $_->{container} == $self->{player}{tag}; |
1532 | } |
1436 | } |
1533 | } |
1437 | } |
1534 | } |
1438 | |
1535 | |
1439 | sub conn::item_update { |
1536 | sub conn::item_update { |
1440 | my ($self, $item) = @_; |
1537 | my ($self, $item) = @_; |
1441 | |
1538 | |
1442 | update_floorbox if $item->{container} == 0; |
1539 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n"; |
1443 | |
1540 | |
|
|
1541 | if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) { |
|
|
1542 | $OPENCONT = 0; |
|
|
1543 | $INVR->set_items ($self->{container}{0}); |
|
|
1544 | } else { |
|
|
1545 | if ($item->{container} == 0) { |
|
|
1546 | update_floorbox; |
|
|
1547 | $OPENCONT = 0; |
|
|
1548 | $INVR->set_items ($self->{container}{0}); |
|
|
1549 | } elsif ($item->{container} == $self->{player}{tag}) { |
1444 | $INV->set_items ($self->{container}{$item->{container}}) |
1550 | $INV->set_items ($self->{container}{$item->{container}}) |
1445 | if $item->{container} == $self->{player}{tag}; |
1551 | } |
|
|
1552 | } |
1446 | } |
1553 | } |
1447 | |
1554 | |
1448 | %SDL_CB = ( |
1555 | %SDL_CB = ( |
1449 | CFClient::SDL_QUIT => sub { |
1556 | CFClient::SDL_QUIT => sub { |
1450 | Event::unloop -1; |
1557 | Event::unloop -1; |
… | |
… | |
1549 | $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; |
1656 | $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; |
1550 | |
1657 | |
1551 | $FONT_PROP->make_default; |
1658 | $FONT_PROP->make_default; |
1552 | } |
1659 | } |
1553 | |
1660 | |
|
|
1661 | # compare mono (ft) vs. rgba (cairo) |
|
|
1662 | # ft - 1.8s, cairo 3s, even in alpha-only mode |
|
|
1663 | # for my $rgba (0..1) { |
|
|
1664 | # my $t1 = Time::HiRes::time; |
|
|
1665 | # for (1..1000) { |
|
|
1666 | # my $layout = CFClient::Layout->new ($rgba); |
|
|
1667 | # $layout->set_text ("hallo" x 100); |
|
|
1668 | # $layout->render; |
|
|
1669 | # } |
|
|
1670 | # my $t2 = Time::HiRes::time; |
|
|
1671 | # warn $t2-$t1; |
|
|
1672 | # } |
|
|
1673 | |
1554 | video_init; |
1674 | video_init; |
1555 | audio_init; |
1675 | audio_init; |
1556 | } |
1676 | } |
1557 | |
1677 | |
1558 | Event::loop; |
1678 | Event::loop; |