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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.202 by root, Mon May 8 20:39:35 2006 UTC vs.
Revision 1.234 by root, Mon May 22 02:19:18 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6# do things only needed for single-binary version (par)
6BEGIN { 7BEGIN {
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
27unshift @INC, $ENV{PAR_TEMP}; 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
30use Event; 31use Event;
31 32
32use Crossfire; 33use Crossfire;
33use Crossfire::Protocol; 34use Crossfire::Protocol;
34 35
… …
37use CFClient; 38use CFClient;
38use CFClient::UI; 39use CFClient::UI;
39use CFClient::MapWidget; 40use CFClient::MapWidget;
40 41
41$Event::DIED = sub { 42$Event::DIED = sub {
43 # TODO: display dialog box or so
42 CFClient::error $_[1]; 44 CFClient::error $_[1];
43}; 45};
44 46
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 47#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46 48
… …
59our $NOW; 61our $NOW;
60 62
61our $CFG; 63our $CFG;
62our $CONN; 64our $CONN;
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 65our $FAST; # fast, low-quality mode, possibly useful for software-rendering
66
67our $WANT_REFRESH;
68our $CAN_REFRESH;
64 69
65our @SDL_MODES; 70our @SDL_MODES;
66our $WIDTH; 71our $WIDTH;
67our $HEIGHT; 72our $HEIGHT;
68our $FULLSCREEN; 73our $FULLSCREEN;
… …
90our $SDL_MIXER; 95our $SDL_MIXER;
91our @SOUNDS; # event => file mapping 96our @SOUNDS; # event => file mapping
92our %AUDIO_CHUNKS; # audio files 97our %AUDIO_CHUNKS; # audio files
93 98
94our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
95our $STATUS_LINE; 100our $STATUSBOX;
96our $DEBUG_STATUS; 101our $DEBUG_STATUS;
97 102
98our $INVWIN; 103our $INVWIN;
99our $INV; 104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
100 108
101sub status { 109sub status {
102 $STATUS_LINE->set_text ($_[0]); 110 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
103 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
104} 111}
105 112
106sub debug { 113sub debug {
107 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
108 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 115 my ($w, $h) = $DEBUG_STATUS->size_request;
116 $DEBUG_STATUS->move ($WIDTH - $w, 0);
109} 117}
110 118
111sub start_game { 119sub start_game {
112 status "logging in..."; 120 status "logging in...";
113 121
… …
128 maph => $mapsize, 136 maph => $mapsize,
129 ; 137 ;
130 }; 138 };
131 139
132 if ($CONN) { 140 if ($CONN) {
141 CFClient::lowdelay fileno $CONN->{fh};
142
133 $LOGIN_BUTTON->set_text ("Logout"); 143 $LOGIN_BUTTON->set_text ("Logout");
134
135 status "login successful"; 144 status "login successful";
136 145
137 CFClient::lowdelay fileno $CONN->{fh}; 146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
138 } else { 149 } else {
139 status "unable to connect"; 150 status "unable to connect";
140 stop_game(); 151 stop_game();
141 } 152 }
142} 153}
… …
146 157
147 status "connection closed"; 158 status "connection closed";
148 $LOGIN_BUTTON->set_text ("Login"); 159 $LOGIN_BUTTON->set_text ("Login");
149 $CONN->destroy; 160 $CONN->destroy;
150 $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};
151 165
152 undef $MAPCACHE; 166 undef $MAPCACHE;
153 undef $MAP; 167 undef $MAP;
154} 168}
155 169
… …
160 $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]);
161 175
162 $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");
163 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
164 178
165 $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]);
166 $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");
167 181
168 $mode_slider->connect (changed => sub { 182 $mode_slider->connect (changed => sub {
169 my ($self, $value) = @_; 183 my ($self, $value) = @_;
170 184
… …
195 } 209 }
196 ); 210 );
197 211
198 $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");
199 $table->add (1, $row++, new CFClient::UI::Slider 213 $table->add (1, $row++, new CFClient::UI::Slider
200 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 214 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
201 tooltip => "Enlarge or shrink the displayed map", 215 tooltip => "Enlarge or shrink the displayed map",
202 connect_changed => sub { 216 connect_changed => sub {
203 my ($self, $value) = @_; 217 my ($self, $value) = @_;
204 $CFG->{map_scale} = 0.05 * int $value / 0.05; 218 $CFG->{map_scale} = $value;
205 } 219 }
206 ); 220 );
207 221
208 $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");
209 $table->add (1, $row++, new CFClient::UI::CheckBox 223 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
236 } 250 }
237 ); 251 );
238 252
239 $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");
240 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
241 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
242 tooltip => "The font size used by most GUI elements", 256 tooltip => "The font size used by most GUI elements",
243 connect_changed => sub { 257 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
244 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
245# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
246 }
247 ); 258 );
248 259
249 $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");
250 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
251 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
252 tooltip => "The font size used by the server log window only", 263 tooltip => "The font size used by the server log window only",
253 connect_changed => sub { 264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
254 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
255 }
256 ); 265 );
257 266
258 $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");
259 268
260 $table->add (1, $row++, new CFClient::UI::Slider 269 $table->add (1, $row++, new CFClient::UI::Slider
261 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
262 tooltip => "The font size used by the statistics window only", 271 tooltip => "The font size used by the statistics window only",
263 connect_changed => sub { 272 connect_changed => sub {
264 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 273 $CFG->{stat_fontsize} = $_[1];
265 &set_stats_window_fontsize; 274 &set_stats_window_fontsize;
266 } 275 }
267 ); 276 );
268 277
269 $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");
270 $table->add (1, $row++, new CFClient::UI::Slider 279 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 280 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
272 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",
273 connect_changed => sub { 282 connect_changed => sub {
274 $CFG->{gauge_size} = $_[1]; 283 $CFG->{gauge_size} = $_[1];
275 my $h = int $HEIGHT * $CFG->{gauge_size}; 284 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
276 $GAUGES->{win}->set_size ($WIDTH, $h);
277 $GAUGES->{win}->move (0, $HEIGHT - $h);
278 } 285 }
279 ); 286 );
280 287
281 $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");
282 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
283 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 290 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
284 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 291 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
285 connect_changed => sub { 292 connect_changed => sub {
286 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 293 $CFG->{gauge_fontsize} = $_[1];
287 &set_gauge_window_fontsize; 294 &set_gauge_window_fontsize;
288 } 295 }
289 ); 296 );
290 297
291 $table->add (1, $row++, new CFClient::UI::Button 298 $table->add (1, $row++, new CFClient::UI::Button
… …
365# local $GAUGES->{win}{parent};#d# 372# local $GAUGES->{win}{parent};#d#
366# 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;
367} 374}
368 375
369sub make_gauge_window { 376sub make_gauge_window {
370 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 377 my $gh = int $HEIGHT * $CFG->{gauge_size};
371# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
372 378
373 my $win = new CFClient::UI::Frame ( 379 my $win = new CFClient::UI::Frame (
374 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 380 req_y => -1,
381 user_w => $WIDTH,
382 user_h => $gh,
375 ); 383 );
384
376 $win->add (my $hbox = new CFClient::UI::HBox 385 $win->add (my $hbox = new CFClient::UI::HBox
377 children => [ 386 children => [
378 (new CFClient::UI::HBox expand => 1), 387 (new CFClient::UI::HBox expand => 1),
379 ($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 ]),
380 (my $vbox = new CFClient::UI::VBox), 392 (my $vbox = new CFClient::UI::VBox),
381 ], 393 ],
382 ); 394 );
383 395
384 $vbox->add (new CFClient::UI::HBox 396 $vbox->add (new CFClient::UI::HBox
… …
661 $HOST->set_text ($CFG->{host} = $host); 673 $HOST->set_text ($CFG->{host} = $host);
662 }), 674 }),
663 (new CFClient::UI::Empty expand => 1), 675 (new CFClient::UI::Empty expand => 1),
664 ]); 676 ]);
665 677
666 $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)
667 for 0 .. $#$m; 680 for 0 .. $#$m;
668 } 681 }
669 } 682 }
670 }); 683 });
671} 684}
… …
727 ); 740 );
728 741
729 $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");
730 $table->add (1, 7, new CFClient::UI::Slider 743 $table->add (1, 7, new CFClient::UI::Slider
731 req_w => 100, 744 req_w => 100,
732 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 745 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
733 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. "
734 ."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.",
735 connect_changed => sub { 748 connect_changed => sub {
736 my ($self, $value) = @_; 749 my ($self, $value) = @_;
737 750
738 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 751 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
739 }, 752 },
740 ); 753 );
741 754
755 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
756 $table->add (1, 8, new CFClient::UI::Entry
757 text => $CFG->{output_count},
758 tooltip => "Should be set to 1 unless you know what you are doing",
759 connect_changed => sub { $CFG->{output_count} = $_[1] },
760 );
761
762 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
763 $table->add (1, 9, new CFClient::UI::Entry
764 text => $CFG->{output_sync},
765 tooltip => "Should be set to 1 unless you know what you are doing",
766 connect_changed => sub { $CFG->{output_sync} = $_[1] },
767 );
768
742 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 769 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
743 expand => 1, 770 expand => 1,
744 align => 0, 771 align => 0,
745 text => "Login", 772 text => "Login",
746 connect_activate => sub { 773 connect_activate => sub {
747 $CONN ? stop_game 774 $CONN ? stop_game
… …
759 bg => [0, 0, 0, 0.5], 786 bg => [0, 0, 0, 0.5],
760 user_w => int $::WIDTH / 3, 787 user_w => int $::WIDTH / 3,
761 user_h => int $::HEIGHT / 5, 788 user_h => int $::HEIGHT / 5,
762 child => (my $vbox = new CFClient::UI::VBox); 789 child => (my $vbox = new CFClient::UI::VBox);
763 790
764 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 791 $vbox->add ($LOGVIEW);
765 expand => 1,
766 font => $FONT_FIXED,
767 fontsize => $::CFG->{log_fontsize},
768 );
769 792
770 $vbox->add (my $input = new CFClient::UI::Entry 793 $vbox->add (my $input = new CFClient::UI::Entry
771 connect_focus_in => sub { 794 connect_focus_in => sub {
772 my ($input, $prev_focus) = @_; 795 my ($input, $prev_focus) = @_;
773 796
… …
805 828
806 $window 829 $window
807} 830}
808 831
809sub make_inventory_window { 832sub make_inventory_window {
810 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 833 my $invwin = new CFClient::UI::FancyFrame
834 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
835
836 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
837
838 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
839 $vb1->add (my $lbl = new CFClient::UI::Label);
840 $lbl->set_text ("Player");
811 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); 841 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
842
843 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
844 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
845 $INVR_LBL->set_text ("Floor");
846 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
847
812 $invwin 848 $invwin
813} 849}
814 850
815sub sdl_init { 851sub sdl_init {
816 CFClient::SDL_Init 852 CFClient::SDL_Init
… …
825 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 861 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
826 $FULLSCREEN = $CFG->{fullscreen}; 862 $FULLSCREEN = $CFG->{fullscreen};
827 $FAST = $CFG->{fast}; 863 $FAST = $CFG->{fast};
828 864
829 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 865 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
830 or die "SDL_SetVideoMode failed!\n"; 866 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
831 867
832 $SDL_ACTIVE = 1; 868 $SDL_ACTIVE = 1;
833 $LAST_REFRESH = time - 0.01; 869 $LAST_REFRESH = time - 0.01;
834 870
835 CFClient::gl_init; 871 CFClient::gl_init;
… …
838 874
839 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 875 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
840 876
841 ############################################################################# 877 #############################################################################
842 878
843 if ($DEBUG_STATUS) { 879 unless ($DEBUG_STATUS) {
844 # reconfigure all widgets
845 $CFClient::UI::ROOT->reconfigure;
846
847 } else {
848 # create the widgets 880 # create the widgets
849 881
850 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 882 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
851 $DEBUG_STATUS->show; 883 $DEBUG_STATUS->show;
852 884
853 $STATUS_LINE = new CFClient::UI::Label 885 $STATUSBOX = new CFClient::UI::Statusbox;
854 padding => 0, 886 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
855 y => $HEIGHT - $FONTSIZE * 1.8;
856 $STATUS_LINE->show;
857 887
858 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 888 (new CFClient::UI::Frame
859 padding => 0, 889 bg => [0, 0, 0, 0.4],
860 fontsize => 0.8, 890 req_y => -1,
861 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 891 child => $STATUSBOX,
862 $ALT_ENTER_MESSAGE->show; 892 )->show;
863 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
864 893
865 CFClient::UI::FancyFrame->new ( 894 CFClient::UI::FancyFrame->new (
866 border_bg => [1, 1, 1, 192/255], 895 border_bg => [1, 1, 1, 192/255],
867 bg => [1, 1, 1, 0], 896 bg => [1, 1, 1, 0],
868 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 897 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
… …
882 } 911 }
883 }); 912 });
884 $MAPWIDGET->show; 913 $MAPWIDGET->show;
885 $MAPWIDGET->focus_in; 914 $MAPWIDGET->focus_in;
886 915
916 $LOGVIEW = new CFClient::UI::TextView
917 expand => 1,
918 font => $FONT_FIXED,
919 fontsize => $::CFG->{log_fontsize},
920 ;
921
887 $BUTTONBAR = new CFClient::UI::HBox; 922 $BUTTONBAR = new CFClient::UI::HBox;
888 923
889 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 924 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
890 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 925 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
891 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 926 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
… …
900 status "Configuration Saved"; 935 status "Configuration Saved";
901 }); 936 });
902 937
903 $BUTTONBAR->show; 938 $BUTTONBAR->show;
904 939
940 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
941
942 # delay till geometry is constant
943 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
905 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 944 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
945 my $widget = $GAUGES->{win};
946 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
947 });
948 force_refresh ();
906 } 949 }
907} 950}
908 951
909sub video_shutdown { 952sub video_shutdown {
910 undef $SDL_ACTIVE; 953 undef $SDL_ACTIVE;
… …
914my $bgmusic;#TODO#hack#d# 957my $bgmusic;#TODO#hack#d#
915 958
916sub audio_channel_finished { 959sub audio_channel_finished {
917 my ($channel) = @_; 960 my ($channel) = @_;
918 961
919 warn "channel $channel finished\n";#d# 962 #warn "channel $channel finished\n";#d#
920} 963}
921 964
922sub audio_music_finished { 965sub audio_music_finished {
923 return unless $CFG->{bgm_enable}; 966 return unless $CFG->{bgm_enable};
924 967
… …
966} 1009}
967 1010
968my %animate_object; 1011my %animate_object;
969my $animate_timer; 1012my $animate_timer;
970 1013
971my $want_refresh;
972my $can_refresh;
973
974my $fps = 9; 1014my $fps = 9;
975 1015
1016my %demo;#d#
1017
976sub force_refresh { 1018sub force_refresh {
977 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1019 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
978 debug sprintf "%3.2f", $fps; 1020 debug sprintf "%3.2f", $fps;
979 1021
980 $want_refresh = 0;
981 $can_refresh = 0;
982
983 $CFClient::UI::ROOT->draw; 1022 $CFClient::UI::ROOT->draw;
984 1023
1024 $WANT_REFRESH = 0;
1025 $CAN_REFRESH = 0;
1026 $LAST_REFRESH = $NOW;
1027
10280 && do {
1029 # some weird model-drawing code, just a joke right now
1030 use CFClient::OpenGL;
1031
1032 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1033 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1034 $demo{r} ||= do {
1035 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1036 $mod->{v} = pack "f*", @{$mod->{v}};
1037 $_ = [scalar @$_, pack "S!*", @$_]
1038 for values %{$mod->{g}};
1039 $mod
1040 };
1041
1042 my $r = $demo{r} or die;
1043
1044 glDepthMask 1;
1045 glClear GL_DEPTH_BUFFER_BIT;
1046 glEnable GL_TEXTURE_2D;
1047 glEnable GL_DEPTH_TEST;
1048 glEnable GL_CULL_FACE;
1049 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1050
1051 glMatrixMode GL_PROJECTION;
1052 glLoadIdentity;
1053 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1054 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1055 glMatrixMode GL_MODELVIEW;
1056 glLoadIdentity;
1057
1058 glPushMatrix;
1059 glTranslate 0, 0, -800;
1060 glScale 1, -1, 1;
1061 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1062 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1063 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1064 glScale 50, 50, 50;
1065
1066 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1067 while (my ($k, $v) = each %{$r->{g}}) {
1068 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1069 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1070 }
1071
1072 glPopMatrix;
1073
1074 glShadeModel GL_FLAT;
1075 glDisable GL_DEPTH_TEST;
1076 glDisable GL_TEXTURE_2D;
1077 glDepthMask 0;
1078
1079 $WANT_REFRESH++;
1080};
1081
985 CFClient::SDL_GL_SwapBuffers; 1082 CFClient::SDL_GL_SwapBuffers;
986
987 $LAST_REFRESH = $NOW;
988} 1083}
989 1084
990my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1085my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
991 $NOW = time; 1086 $NOW = time;
992 1087
993 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1088 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
994 for CFClient::SDL_PollEvent; 1089 for CFClient::SDL_PollEvent;
995 1090
996 if (%animate_object) { 1091 if (%animate_object) {
997 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1092 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
998 $want_refresh++; 1093 $WANT_REFRESH++;
999 } 1094 }
1000 1095
1001 if ($want_refresh) { 1096 if ($WANT_REFRESH) {
1002 force_refresh; 1097 force_refresh;
1003 } else { 1098 } else {
1004 $can_refresh = 1; 1099 $CAN_REFRESH = 1;
1005 } 1100 }
1006}); 1101});
1007
1008sub refresh {
1009 $want_refresh++;
1010}
1011 1102
1012sub animation_start { 1103sub animation_start {
1013 my ($widget) = @_; 1104 my ($widget) = @_;
1014 $animate_object{$widget} = $widget; 1105 $animate_object{$widget} = $widget;
1015} 1106}
… …
1019 delete $animate_object{$widget}; 1110 delete $animate_object{$widget};
1020} 1111}
1021 1112
1022@conn::ISA = Crossfire::Protocol::; 1113@conn::ISA = Crossfire::Protocol::;
1023 1114
1115sub conn::new {
1116 my $class = shift;
1117
1118 my $self = $class->Crossfire::Protocol::new (@_);
1119
1120 $MAPWIDGET->clr_commands;
1121
1122 my $parser = new Pod::POM;
1123 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1124
1125 for my $head2 ($pod->head2) {
1126 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1127 or next;
1128
1129 my $cmd = $1;
1130 my @args = split /\|/, $2;
1131 @args = (".*") unless @args;
1132
1133 my $text = CFClient::pod_to_pango $head2->content;
1134
1135 for my $arg (@args) {
1136 $arg = $arg eq ".*" ? "" : " $arg";
1137
1138 $MAPWIDGET->add_command ("$cmd$arg", $text);
1139 }
1140 }
1141
1142 $self
1143}
1144
1024sub conn::stats_update { 1145sub conn::stats_update {
1025 my ($self, $stats) = @_; 1146 my ($self, $stats) = @_;
1147
1148 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1149 my $diff = $exp - $self->{prev_exp};
1150 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1151 if exists $self->{prev_exp} && $diff;
1152 $self->{prev_exp} = $exp;
1153 }
1026 1154
1027 update_stats_window ($stats); 1155 update_stats_window ($stats);
1028} 1156}
1029 1157
1030sub conn::user_send { 1158sub conn::user_send {
… …
1085 $self->set_texture ($id => $data); 1213 $self->set_texture ($id => $data);
1086 } 1214 }
1087 } 1215 }
1088} 1216}
1089 1217
1218# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1219# (server resource,s latency, bandwidth), so this hack is warranted.
1220# the right fix is to make real tiled maps with an overview file
1221sub conn::send_mapinfo {
1222 my ($self, $data, $cb) = @_;
1223
1224 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1225 my ($wx, $wy) = ($1, $2);
1226
1227 if ($data =~ /^spatial ([1-4]+)$/) {
1228 my @dx = (0, 0, 1, 0, -1);
1229 my @dy = (0, -1, 0, 1, 0);
1230 my ($dx, $dy);
1231
1232 for (split //, $1) {
1233 $dx += $dx[$_];
1234 $dy += $dy[$_];
1235 }
1236
1237 $cb->(spatial => 15,
1238 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1239 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1240 50, 50,
1241 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1242 );
1243
1244 return;
1245 }
1246 }
1247
1248 $self->SUPER::send_mapinfo ($data, $cb);
1249}
1250
1090# this method does a "flood fill" into every tile direction 1251# this method does a "flood fill" into every tile direction
1091# it assumes that tiles are arranged in a rectangular grid, 1252# it assumes that tiles are arranged in a rectangular grid,
1092# i.e. a map is the same as the left of the right map etc. 1253# i.e. a map is the same as the left of the right map etc.
1093# failure to comply are harmless and result in display errors 1254# failure to comply are harmless and result in display errors
1094# at worst. 1255# at worst.
1095sub conn::flood_fill { 1256sub conn::flood_fill {
1096 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1257 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1097 1258
1098 # the server does not allow map paths > 6 1259 # the server does not allow map paths > 6
1099 return if 7 <= length $path; 1260 return if 7 <= length $path;
1100 1261
1101 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1262 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1102 1263
1103 for ( 1264 for (
1104 [1, 0, -1], 1265 [1, 3, 0, -1],
1105 [2, 1, 0], 1266 [2, 4, 1, 0],
1106 [3, 0, 1], 1267 [3, 1, 0, 1],
1107 [4, -1, 0], 1268 [4, 2, -1, 0],
1108 ) { 1269 ) {
1109 my ($tile, $dx, $dy) = @$_; 1270 my ($tile, $tile2, $dx, $dy) = @$_;
1271
1272 next if $block & (1 << $tile);
1273 my $block = $block | (1 << $tile2);
1110 1274
1111 my $gx = $gx + $dx; 1275 my $gx = $gx + $dx;
1112 my $gy = $gy + $dy; 1276 my $gy = $gy + $dy;
1113 1277
1114 next unless $flags & (1 << ($tile - 1)); 1278 next unless $flags & (1 << ($tile - 1));
… …
1116 1280
1117 my $neigh = $self->{neigh_map}{$hash} ||= []; 1281 my $neigh = $self->{neigh_map}{$hash} ||= [];
1118 if (my $info = $neigh->[$tile]) { 1282 if (my $info = $neigh->[$tile]) {
1119 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1283 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1120 1284
1121 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1285 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1122 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1286 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1123 1287
1124 } else { 1288 } else {
1125 $self->send_mapinfo ("spatial $path$tile", sub { 1289 $self->send_mapinfo ("spatial $path$tile", sub {
1126 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1290 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1127 1291
1128 return if $mode ne "spatial"; 1292 return if $mode ne "spatial";
1129 1293
1130 $x += $MAP->ox; 1294 $x += $MAP->ox;
1131 $y += $MAP->oy; 1295 $y += $MAP->oy;
1132 1296
1133 $self->load_map ($hash, $x, $y) 1297 $self->load_map ($hash, $x, $y)
1134 unless $self->{neigh_map}{$hash}[5]++;#d# 1298 unless $self->{neigh_map}{$hash}[5]++;#d#
1135 1299
1136 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1300 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1137 1301
1138 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1302 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1139 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1303 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1140 }); 1304 });
1141 } 1305 }
1142 } 1306 }
1143} 1307}
… …
1156 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1320 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1157 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1321 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1158 ]; 1322 ];
1159 1323
1160 delete $self->{neigh_grid}; 1324 delete $self->{neigh_grid};
1161 $self->flood_fill (0, 0, "", $hash, $flags);
1162 1325
1163 $x += $ox; 1326 $x += $ox;
1164 $y += $oy; 1327 $y += $oy;
1165 1328
1166 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1329 $self->{map_info} = [$hash, $x, $y, $w, $h];
1167 1330
1168 my $map = $self->{map_info}[0];
1169 $map =~ s/^.*?\/([^\/]+)$/\1/; 1331 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1170 $STATWIDS->{map}->set_text ("Map: " . $map); 1332 $STATWIDS->{map}->set_text ("Map: " . $map);
1171 1333
1172 $self->load_map ($hash, $x, $y); 1334 $self->load_map ($hash, $x, $y);
1335 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1173} 1336}
1174 1337
1175sub conn::face_find { 1338sub conn::face_find {
1176 my ($self, $facenum, $face) = @_; 1339 my ($self, $facenum, $face) = @_;
1177 1340
… …
1327 [0.55, 0.41, 0.13], 1490 [0.55, 0.41, 0.13],
1328 [0.99, 0.77, 0.26], 1491 [0.99, 0.77, 0.26],
1329 [0.74, 0.65, 0.41], 1492 [0.74, 0.65, 0.41],
1330 ); 1493 );
1331 1494
1495 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1496
1497 $text = CFClient::UI::Label::escape $text;
1498 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1499 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1500
1332 $LOGVIEW->add_paragraph ($color[$color], $text); 1501 $LOGVIEW->add_paragraph ($color[$color],
1502 join "\n", map "$time $_", split /\n/, $text);
1503
1504 $STATUSBOX->add ($text,
1505 group => $text,
1506 fg => $color[$color],
1507 timeout => 60,
1508 tooltip_font => $::FONT_FIXED,
1509 );
1510}
1511
1512sub conn::drawextinfo {
1513 my ($self, $color, $type, $subtype, $message) = @_;
1514
1515 $self->drawinfo ($color, $message);
1333} 1516}
1334 1517
1335sub conn::spell_add { 1518sub conn::spell_add {
1336 my ($self, $spell) = @_; 1519 my ($self, $spell) = @_;
1337 1520
1338 # TODO 1521 # TODO
1339 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1522 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1340 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1523 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1341 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1524 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1342} 1525}
1343 1526
1344sub conn::spell_delete { 1527sub conn::spell_delete {
1345 my ($self, $spell) = @_; 1528 my ($self, $spell) = @_;
1346} 1529}
1347 1530
1348sub conn::addme_success { 1531sub conn::addme_success {
1349 my ($self) = @_; 1532 my ($self) = @_;
1350 1533
1534 $self->send ("command output-sync $CFG->{output_sync}");
1535 $self->send ("command output-count $CFG->{output_count}");
1536
1537 my $parser = new Pod::POM;
1538 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1539
1540 my %skill_tooltip;
1541
1542 for my $head2 ($pod->head2) {
1543 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1544 }
1545
1351 for my $skill (values %{$self->{skill_info}}) { 1546 for my $skill (values %{$self->{skill_info}}) {
1352 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1547 $MAPWIDGET->add_command ("ready_skill $skill",
1353 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1548 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1549 . $skill_tooltip{$skill});
1550 $MAPWIDGET->add_command ("use_skill $skill",
1551 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1552 . $skill_tooltip{$skill});
1354 } 1553 }
1355
1356 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1357 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1358 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1359 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1360} 1554}
1361 1555
1362sub conn::eof { 1556sub conn::eof {
1557 $MAPWIDGET->clr_commands;
1558
1363 stop_game; 1559 stop_game;
1364} 1560}
1365 1561
1366sub update_floorbox { 1562sub update_floorbox {
1367 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1563 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1368 return unless $CONN; 1564 return unless $CONN;
1369 1565
1370 $FLOORBOX->clear; 1566 $FLOORBOX->clear;
1371 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1567 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1372 1568
1373 # we basically have to use the same sorting as everybody else 1569 my $count = 4;
1374 for my $item (@{ $CONN->{container}{0} }) { 1570 for (@{ $CONN->{container}{0} }) {
1571 if (--$count) {
1375 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item); 1572 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1573 } else {
1574 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1575 last;
1576 }
1376 } 1577 }
1377 }); 1578 });
1378 refresh; 1579
1580 $WANT_REFRESH++;
1379} 1581}
1380 1582
1381sub conn::container_add { 1583sub conn::container_add {
1382 my ($self, $id, $items) = @_; 1584 my ($self, $tag, $items) = @_;
1383 1585
1384 update_floorbox if $id == 0; 1586 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1587
1588 if ($tag == 0) {
1589 update_floorbox;
1590 $OPENCONT = 0;
1591 $INVR_LBL->set_text ("Floor");
1592 $INVR->set_items ($self->{container}{0});
1385 if ($self->{player}{tag} == $id) { 1593 } elsif ($tag == $self->{player}{tag}) {
1594 $INVR_LBL->set_text ("Player");
1386 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1595 $INV->set_items ($self->{container}{$self->{player}{tag}})
1596 } else {
1597 $OPENCONT = $tag;
1598 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1599 $INVR->set_items ($self->{container}{$tag});
1387 } 1600 }
1601
1388 # $self-<{player}{tag} => player inv 1602 # $self-<{player}{tag} => player inv
1389 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1603 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1390} 1604}
1391 1605
1392sub conn::container_clear { 1606sub conn::container_clear {
1393 my ($self, $id) = @_; 1607 my ($self, $tag) = @_;
1394 1608
1395 update_floorbox if $id == 0; 1609 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1396 if ($self->{player}{tag} == $id) { 1610
1611 if ($tag == 0) {
1612 update_floorbox;
1613 $OPENCONT = 0;
1614 $INVR_LBL->set_text ("Floor");
1397 $INV->set_items ($self->{container}{$id}); 1615 $INVR->set_items ($self->{container}{0});
1616 } elsif ($tag == $self->{player}{tag}) {
1617 $INVR_LBL->set_text ("Player");
1618 $INV->set_items ($self->{container}{$tag})
1619 } else {
1620 $OPENCONT = $tag;
1621 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1622 $INVR->set_items ($self->{container}{$tag});
1398 } 1623 }
1399 1624
1400# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1625# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1401} 1626}
1402 1627
1403sub conn::item_delete { 1628sub conn::item_delete {
1404 my ($self, @items) = @_; 1629 my ($self, @items) = @_;
1405 1630
1406 for (@items) { 1631 for (@items) {
1407 update_floorbox if $_->{container} == 0; 1632 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1408 if ($self->{player}{tag} == $_->{container}) { 1633
1634 if ($_->{container} == 0) {
1635 update_floorbox;
1636 $OPENCONT = 0;
1637 $INVR_LBL->set_text ("Floor");
1638 $INVR->set_items ($self->{container}{0});
1639 } elsif ($_->{container} == $self->{player}{tag}) {
1640 $INVR_LBL->set_text ("Player");
1641 $INV->set_items ($self->{container}{$self->{player}{tag}})
1642 } else {
1643 $OPENCONT = $_->{container};
1644 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1409 $INV->set_items ($self->{container}{$_->{container}}); 1645 $INVR->set_items ($self->{container}{$_->{container}});
1410 } 1646 }
1411 } 1647 }
1412} 1648}
1413 1649
1414sub conn::item_update { 1650sub conn::item_update {
1415 my ($self, $item) = @_; 1651 my ($self, $item) = @_;
1416 1652
1417 update_floorbox if $item->{container} == 0; 1653 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1418 if ($self->{player}{tag} == $item->{container}) { 1654
1655 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1656 $OPENCONT = 0;
1657 $INVR_LBL->set_text ("Floor");
1658 $INVR->set_items ($self->{container}{0});
1659
1660 $item->{widget}->update_item
1661 if $item->{widget};
1662 } else {
1663 if ($item->{container} == 0) {
1664 update_floorbox;
1665 $OPENCONT = 0;
1666 $INVR_LBL->set_text ("Floor");
1667 $INVR->set_items ($self->{container}{0});
1668 } elsif ($item->{container} == $self->{player}{tag}) {
1419 $INV->set_items ($self->{container}{$item->{container}}); 1669 $INV->set_items ($self->{container}{$item->{container}})
1670 }
1420 } 1671 }
1421} 1672}
1422 1673
1423%SDL_CB = ( 1674%SDL_CB = (
1424 CFClient::SDL_QUIT => sub { 1675 CFClient::SDL_QUIT => sub {
1425 Event::unloop -1; 1676 Event::unloop -1;
1426 }, 1677 },
1427 CFClient::SDL_VIDEORESIZE => sub { 1678 CFClient::SDL_VIDEORESIZE => sub {
1428 }, 1679 },
1429 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1680 CFClient::SDL_VIDEOEXPOSE => sub {
1681 $WANT_REFRESH++;
1682 },
1430 CFClient::SDL_ACTIVEEVENT => sub { 1683 CFClient::SDL_ACTIVEEVENT => sub {
1431# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1684# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1432 }, 1685 },
1433 CFClient::SDL_KEYDOWN => sub { 1686 CFClient::SDL_KEYDOWN => sub {
1434 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1687 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1455 1708
1456############################################################################# 1709#############################################################################
1457 1710
1458$SIG{INT} = $SIG{TERM} = sub { exit }; 1711$SIG{INT} = $SIG{TERM} = sub { exit };
1459 1712
1460CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1461
1462$TILECACHE = CFClient::db_table "tilecache";
1463$FACEMAP = CFClient::db_table "facemap";
1464
1465my %DEF_CFG = (
1466 sdl_mode => 0,
1467 width => 640,
1468 height => 480,
1469 fullscreen => 0,
1470 fast => 0,
1471 map_scale => 0.5,
1472 fow_enable => 1,
1473 fow_intensity => 0.45,
1474 fow_smooth => 0,
1475 gui_fontsize => 1,
1476 log_fontsize => 1,
1477 gauge_fontsize => 1,
1478 gauge_size => 0.35,
1479 stat_fontsize => 1,
1480 mapsize => 100,
1481 host => "crossfire.schmorp.de",
1482 say_command => 'say',
1483 audio_enable => 1,
1484 bgm_enable => 1,
1485 bgm_volume => 0.25,
1486);
1487
1488while (my ($k, $v) = each %DEF_CFG) {
1489 $CFG->{$k} = $v unless exists $CFG->{$k};
1490}
1491
1492sdl_init;
1493
1494@SDL_MODES = reverse
1495 grep $_->[0] >= 640 && $_->[1] >= 480,
1496 CFClient::SDL_ListModes;
1497
1498@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1499
1500$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1501
1502{ 1713{
1714 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1715
1716 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1717
1718 $TILECACHE = CFClient::db_table "tilecache";
1719 $FACEMAP = CFClient::db_table "facemap";
1720
1721 my %DEF_CFG = (
1722 sdl_mode => 0,
1723 width => 640,
1724 height => 480,
1725 fullscreen => 0,
1726 fast => 0,
1727 map_scale => 1,
1728 fow_enable => 1,
1729 fow_intensity => 0.45,
1730 fow_smooth => 0,
1731 gui_fontsize => 1,
1732 log_fontsize => 1,
1733 gauge_fontsize=> 1,
1734 gauge_size => 0.35,
1735 stat_fontsize => 1,
1736 mapsize => 100,
1737 host => "crossfire.schmorp.de",
1738 say_command => 'say',
1739 audio_enable => 1,
1740 bgm_enable => 1,
1741 bgm_volume => 0.25,
1742 output_sync => 1,
1743 output_count => 1,
1744 );
1745
1746 while (my ($k, $v) = each %DEF_CFG) {
1747 $CFG->{$k} = $v unless exists $CFG->{$k};
1748 }
1749
1750 sdl_init;
1751
1752 @SDL_MODES = reverse
1753 grep $_->[0] >= 640 && $_->[1] >= 480,
1754 CFClient::SDL_ListModes;
1755
1756 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1757
1758 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1759
1760 {
1503 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1761 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1504 DejaVuSans.ttf 1762 DejaVuSans.ttf
1505 DejaVuSansMono.ttf 1763 DejaVuSansMono.ttf
1506 DejaVuSans-Bold.ttf 1764 DejaVuSans-Bold.ttf
1507 DejaVuSansMono-Bold.ttf 1765 DejaVuSansMono-Bold.ttf
1508 DejaVuSans-Oblique.ttf 1766 DejaVuSans-Oblique.ttf
1509 DejaVuSansMono-Oblique.ttf 1767 DejaVuSansMono-Oblique.ttf
1510 DejaVuSans-BoldOblique.ttf 1768 DejaVuSans-BoldOblique.ttf
1511 DejaVuSansMono-BoldOblique.ttf 1769 DejaVuSansMono-BoldOblique.ttf
1512 ); 1770 );
1513 1771
1514 CFClient::add_font $_ for @fonts; 1772 CFClient::add_font $_ for @fonts;
1515 1773
1774 CFClient::pango_init;
1775
1516 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1776 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1517 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1777 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1518 1778
1519 $FONT_PROP->make_default; 1779 $FONT_PROP->make_default;
1520} 1780 }
1521 1781
1782# compare mono (ft) vs. rgba (cairo)
1783# ft - 1.8s, cairo 3s, even in alpha-only mode
1784# for my $rgba (0..1) {
1785# my $t1 = Time::HiRes::time;
1786# for (1..1000) {
1787# my $layout = CFClient::Layout->new ($rgba);
1788# $layout->set_text ("hallo" x 100);
1789# $layout->render;
1790# }
1791# my $t2 = Time::HiRes::time;
1792# warn $t2-$t1;
1793# }
1794
1522video_init; 1795 video_init;
1523audio_init; 1796 audio_init;
1797}
1524 1798
1525Event::loop; 1799Event::loop;
1526 1800
1527END { CFClient::SDL_Quit } 1801END { CFClient::SDL_Quit }
1528 1802
… …
1579 1853
1580Typing B<climb> will display a list of commands with I<climb> in their 1854Typing B<climb> will display a list of commands with I<climb> in their
1581name, such as I<ready_skill climbing> and I<use_skill climbing>. 1855name, such as I<ready_skill climbing> and I<use_skill climbing>.
1582 1856
1583You can abbreviate commands by typing only the first character of every 1857You can abbreviate commands by typing only the first character of every
1584word. For example, typing I<iwor> will likely select I<invoke word of 1858word (or even characters within the word - the client will try to make
1585recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1859a good guess, as long as the characters are in order). For example,
1586will likely select I<ready_skill climbing> and I<usl> will give you 1860typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1587I<use_skill levitation>. 1861will select I<cast create food>. Likewise, I<rscli> will likely select
1862I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1863
1864You can enter space and other text as arguemnt to the command. For
1865example, C<cfoo waybread> will expand to C<cast create food waybread>.
1588 1866
1589=head2 The map overview 1867=head2 The map overview
1590 1868
1591#TODO# 1869#TODO#
1592 1870

Diff Legend

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