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.212 by root, Fri May 12 15:45:42 2006 UTC vs.
Revision 1.230 by root, Fri May 19 23:18:42 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
… …
99our $STATUSBOX; 100our $STATUSBOX;
100our $DEBUG_STATUS; 101our $DEBUG_STATUS;
101 102
102our $INVWIN; 103our $INVWIN;
103our $INV; 104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
104 108
105sub status { 109sub status {
106 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, color => [1, 1, 0, 1]); 110 $STATUSBOX->add (CFClient::UI::Label::escape $_[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} 111}
112 112
113sub debug { 113sub debug {
114 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
115 my ($w, $h) = $DEBUG_STATUS->size_request; 115 my ($w, $h) = $DEBUG_STATUS->size_request;
… …
136 maph => $mapsize, 136 maph => $mapsize,
137 ; 137 ;
138 }; 138 };
139 139
140 if ($CONN) { 140 if ($CONN) {
141 CFClient::lowdelay fileno $CONN->{fh};
142
141 $LOGIN_BUTTON->set_text ("Logout"); 143 $LOGIN_BUTTON->set_text ("Logout");
142
143 status "login successful"; 144 status "login successful";
144 145
145 CFClient::lowdelay fileno $CONN->{fh}; 146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
146 } else { 149 } else {
147 status "unable to connect"; 150 status "unable to connect";
148 stop_game(); 151 stop_game();
149 } 152 }
150} 153}
… …
154 157
155 status "connection closed"; 158 status "connection closed";
156 $LOGIN_BUTTON->set_text ("Login"); 159 $LOGIN_BUTTON->set_text ("Login");
157 $CONN->destroy; 160 $CONN->destroy;
158 $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};
159 165
160 undef $MAPCACHE; 166 undef $MAPCACHE;
161 undef $MAP; 167 undef $MAP;
162} 168}
163 169
… …
168 $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]);
169 175
170 $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");
171 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
172 178
173 $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]);
174 $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");
175 181
176 $mode_slider->connect (changed => sub { 182 $mode_slider->connect (changed => sub {
177 my ($self, $value) = @_; 183 my ($self, $value) = @_;
178 184
… …
203 } 209 }
204 ); 210 );
205 211
206 $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");
207 $table->add (1, $row++, new CFClient::UI::Slider 213 $table->add (1, $row++, new CFClient::UI::Slider
208 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 214 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
209 tooltip => "Enlarge or shrink the displayed map", 215 tooltip => "Enlarge or shrink the displayed map",
210 connect_changed => sub { 216 connect_changed => sub {
211 my ($self, $value) = @_; 217 my ($self, $value) = @_;
212 $CFG->{map_scale} = 0.05 * int $value / 0.05; 218 $CFG->{map_scale} = $value;
213 } 219 }
214 ); 220 );
215 221
216 $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");
217 $table->add (1, $row++, new CFClient::UI::CheckBox 223 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
244 } 250 }
245 ); 251 );
246 252
247 $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");
248 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
249 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
250 tooltip => "The font size used by most GUI elements", 256 tooltip => "The font size used by most GUI elements",
251 connect_changed => sub { 257 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 ); 258 );
256 259
257 $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");
258 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
259 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
260 tooltip => "The font size used by the server log window only", 263 tooltip => "The font size used by the server log window only",
261 connect_changed => sub { 264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
262 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
263 }
264 ); 265 );
265 266
266 $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");
267 268
268 $table->add (1, $row++, new CFClient::UI::Slider 269 $table->add (1, $row++, new CFClient::UI::Slider
269 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
270 tooltip => "The font size used by the statistics window only", 271 tooltip => "The font size used by the statistics window only",
271 connect_changed => sub { 272 connect_changed => sub {
272 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 273 $CFG->{stat_fontsize} = $_[1];
273 &set_stats_window_fontsize; 274 &set_stats_window_fontsize;
274 } 275 }
275 ); 276 );
276 277
277 $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");
278 $table->add (1, $row++, new CFClient::UI::Slider 279 $table->add (1, $row++, new CFClient::UI::Slider
279 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 280 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
280 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",
281 connect_changed => sub { 282 connect_changed => sub {
282 $CFG->{gauge_size} = $_[1]; 283 $CFG->{gauge_size} = $_[1];
283 my $h = int $HEIGHT * $CFG->{gauge_size}; 284 $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 } 285 }
287 ); 286 );
288 287
289 $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");
290 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 290 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
292 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 291 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
293 connect_changed => sub { 292 connect_changed => sub {
294 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 293 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 294 &set_gauge_window_fontsize;
296 } 295 }
297 ); 296 );
298 297
299 $table->add (1, $row++, new CFClient::UI::Button 298 $table->add (1, $row++, new CFClient::UI::Button
… …
373# local $GAUGES->{win}{parent};#d# 372# local $GAUGES->{win}{parent};#d#
374# 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;
375} 374}
376 375
377sub make_gauge_window { 376sub make_gauge_window {
378 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 377 my $gh = int $HEIGHT * $CFG->{gauge_size};
379# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
380 378
381 my $win = new CFClient::UI::Frame ( 379 my $win = new CFClient::UI::Frame (
382 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 380 req_y => -1,
381 user_w => $WIDTH,
382 user_h => $gh,
383 ); 383 );
384
384 $win->add (my $hbox = new CFClient::UI::HBox 385 $win->add (my $hbox = new CFClient::UI::HBox
385 children => [ 386 children => [
386 (new CFClient::UI::HBox expand => 1), 387 (new CFClient::UI::HBox expand => 1),
387 (new CFClient::UI::VBox children => [ 388 (new CFClient::UI::VBox children => [
388 (new CFClient::UI::Empty expand => 1), 389 (new CFClient::UI::Empty expand => 1),
… …
672 $HOST->set_text ($CFG->{host} = $host); 673 $HOST->set_text ($CFG->{host} = $host);
673 }), 674 }),
674 (new CFClient::UI::Empty expand => 1), 675 (new CFClient::UI::Empty expand => 1),
675 ]); 676 ]);
676 677
677 $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)
678 for 0 .. $#$m; 680 for 0 .. $#$m;
679 } 681 }
680 } 682 }
681 }); 683 });
682} 684}
… …
738 ); 740 );
739 741
740 $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");
741 $table->add (1, 7, new CFClient::UI::Slider 743 $table->add (1, 7, new CFClient::UI::Slider
742 req_w => 100, 744 req_w => 100,
743 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 745 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. " 746 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.", 747 ."If you set this to a high value you will be able to see further for example.",
746 connect_changed => sub { 748 connect_changed => sub {
747 my ($self, $value) = @_; 749 my ($self, $value) = @_;
748 750
749 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 751 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
750 }, 752 },
751 ); 753 );
752 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
753 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 769 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
754 expand => 1, 770 expand => 1,
755 align => 0, 771 align => 0,
756 text => "Login", 772 text => "Login",
757 connect_activate => sub { 773 connect_activate => sub {
758 $CONN ? stop_game 774 $CONN ? stop_game
… …
770 bg => [0, 0, 0, 0.5], 786 bg => [0, 0, 0, 0.5],
771 user_w => int $::WIDTH / 3, 787 user_w => int $::WIDTH / 3,
772 user_h => int $::HEIGHT / 5, 788 user_h => int $::HEIGHT / 5,
773 child => (my $vbox = new CFClient::UI::VBox); 789 child => (my $vbox = new CFClient::UI::VBox);
774 790
775 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 791 $vbox->add ($LOGVIEW);
776 expand => 1,
777 font => $FONT_FIXED,
778 fontsize => $::CFG->{log_fontsize},
779 );
780 792
781 $vbox->add (my $input = new CFClient::UI::Entry 793 $vbox->add (my $input = new CFClient::UI::Entry
782 connect_focus_in => sub { 794 connect_focus_in => sub {
783 my ($input, $prev_focus) = @_; 795 my ($input, $prev_focus) = @_;
784 796
… …
816 828
817 $window 829 $window
818} 830}
819 831
820sub make_inventory_window { 832sub make_inventory_window {
821 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");
822 $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
823 $invwin 848 $invwin
824} 849}
825 850
826sub sdl_init { 851sub sdl_init {
827 CFClient::SDL_Init 852 CFClient::SDL_Init
… …
836 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 861 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
837 $FULLSCREEN = $CFG->{fullscreen}; 862 $FULLSCREEN = $CFG->{fullscreen};
838 $FAST = $CFG->{fast}; 863 $FAST = $CFG->{fast};
839 864
840 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 865 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
841 or die "SDL_SetVideoMode failed!\n"; 866 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
842 867
843 $SDL_ACTIVE = 1; 868 $SDL_ACTIVE = 1;
844 $LAST_REFRESH = time - 0.01; 869 $LAST_REFRESH = time - 0.01;
845 870
846 CFClient::gl_init; 871 CFClient::gl_init;
… …
849 874
850 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 875 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
851 876
852 ############################################################################# 877 #############################################################################
853 878
854 if ($DEBUG_STATUS) { 879 unless ($DEBUG_STATUS) {
855 # reconfigure all widgets
856 $CFClient::UI::ROOT->reconfigure;
857
858 } else {
859 # create the widgets 880 # create the widgets
860 881
861 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, text => "hulla", x => 100;#d# 882 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
862 $DEBUG_STATUS->show; 883 $DEBUG_STATUS->show;
863 884
864 $STATUSBOX = new CFClient::UI::Statusbox; 885 $STATUSBOX = new CFClient::UI::Statusbox;
865 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, size => 0.8, color => [1, 1, 1, 0.8]); 886 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
866 887
867 (new CFClient::UI::Frame 888 (new CFClient::UI::Frame
868 bg => [0, 0, 0, 0.4], 889 bg => [0, 0, 0, 0.4],
890 req_y => -1,
869 child => $STATUSBOX, 891 child => $STATUSBOX,
870 )->show; 892 )->show;
871 893
872 CFClient::UI::FancyFrame->new ( 894 CFClient::UI::FancyFrame->new (
873 border_bg => [1, 1, 1, 192/255], 895 border_bg => [1, 1, 1, 192/255],
874 bg => [1, 1, 1, 0], 896 bg => [1, 1, 1, 0],
… …
889 } 911 }
890 }); 912 });
891 $MAPWIDGET->show; 913 $MAPWIDGET->show;
892 $MAPWIDGET->focus_in; 914 $MAPWIDGET->focus_in;
893 915
916 $LOGVIEW = new CFClient::UI::TextView
917 expand => 1,
918 font => $FONT_FIXED,
919 fontsize => $::CFG->{log_fontsize},
920 ;
921
894 $BUTTONBAR = new CFClient::UI::HBox; 922 $BUTTONBAR = new CFClient::UI::HBox;
895 923
896 $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);
897 $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);
898 $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);
… …
907 status "Configuration Saved"; 935 status "Configuration Saved";
908 }); 936 });
909 937
910 $BUTTONBAR->show; 938 $BUTTONBAR->show;
911 939
940 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
941
912 # delay till geometry is constant 942 # delay till geometry is constant
913 $CFClient::UI::ROOT->on_post_alloc (startup => sub { 943 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
914 $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
915 }); 947 });
916 force_refresh (); 948 force_refresh ();
917 } 949 }
918} 950}
919 951
… …
925my $bgmusic;#TODO#hack#d# 957my $bgmusic;#TODO#hack#d#
926 958
927sub audio_channel_finished { 959sub audio_channel_finished {
928 my ($channel) = @_; 960 my ($channel) = @_;
929 961
930 warn "channel $channel finished\n";#d# 962 #warn "channel $channel finished\n";#d#
931} 963}
932 964
933sub audio_music_finished { 965sub audio_music_finished {
934 return unless $CFG->{bgm_enable}; 966 return unless $CFG->{bgm_enable};
935 967
… …
980my $animate_timer; 1012my $animate_timer;
981 1013
982my $fps = 9; 1014my $fps = 9;
983 1015
984sub force_refresh { 1016sub force_refresh {
985 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1017 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
986 debug sprintf "%3.2f", $fps; 1018 debug sprintf "%3.2f", $fps;
987 1019
988 $CFClient::UI::ROOT->draw; 1020 $CFClient::UI::ROOT->draw;
989 CFClient::SDL_GL_SwapBuffers; 1021 CFClient::SDL_GL_SwapBuffers;
990 1022
… …
1021 delete $animate_object{$widget}; 1053 delete $animate_object{$widget};
1022} 1054}
1023 1055
1024@conn::ISA = Crossfire::Protocol::; 1056@conn::ISA = Crossfire::Protocol::;
1025 1057
1058sub conn::new {
1059 my $class = shift;
1060
1061 my $self = $class->Crossfire::Protocol::new (@_);
1062
1063 $MAPWIDGET->clr_commands;
1064
1065 my $parser = new Pod::POM;
1066 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1067
1068 for my $head2 ($pod->head2) {
1069 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1070 or next;
1071
1072 my $cmd = $1;
1073 my @args = split /\|/, $2;
1074 @args = (".*") unless @args;
1075
1076 my $text = CFClient::pod_to_pango $head2->content;
1077
1078 for my $arg (@args) {
1079 $arg = $arg eq ".*" ? "" : " $arg";
1080
1081 $MAPWIDGET->add_command ("$cmd$arg", $text);
1082 }
1083 }
1084
1085 $self
1086}
1087
1026sub conn::stats_update { 1088sub conn::stats_update {
1027 my ($self, $stats) = @_; 1089 my ($self, $stats) = @_;
1090
1091 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1092 my $diff = $exp - $self->{prev_exp};
1093 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1094 if exists $self->{prev_exp} && $diff;
1095 $self->{prev_exp} = $exp;
1096 }
1028 1097
1029 update_stats_window ($stats); 1098 update_stats_window ($stats);
1030} 1099}
1031 1100
1032sub conn::user_send { 1101sub conn::user_send {
… …
1331 [0.74, 0.65, 0.41], 1400 [0.74, 0.65, 0.41],
1332 ); 1401 );
1333 1402
1334 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1403 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1335 1404
1336 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g; 1405 $text = CFClient::UI::Label::escape $text;
1337 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1406 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1338 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1407 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1339 1408
1340 $LOGVIEW->add_paragraph ($color[$color], 1409 $LOGVIEW->add_paragraph ($color[$color],
1341 join "\n", map "$time $_", split /\n/, $text); 1410 join "\n", map "$time $_", split /\n/, $text);
1342 1411
1343 $STATUSBOX->add ($text, 1412 $STATUSBOX->add ($text,
1344 group => $text, 1413 group => $text,
1345 color => $color[$color], 1414 fg => $color[$color],
1346 timeout => 60, 1415 timeout => 60,
1347 tooltip_font => $::FONT_FIXED, 1416 tooltip_font => $::FONT_FIXED,
1348 ); 1417 );
1349} 1418}
1350 1419
… …
1357sub conn::spell_add { 1426sub conn::spell_add {
1358 my ($self, $spell) = @_; 1427 my ($self, $spell) = @_;
1359 1428
1360 # TODO 1429 # TODO
1361 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1430 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1362 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1431 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1363 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1432 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1364} 1433}
1365 1434
1366sub conn::spell_delete { 1435sub conn::spell_delete {
1367 my ($self, $spell) = @_; 1436 my ($self, $spell) = @_;
1368} 1437}
1369 1438
1370sub conn::addme_success { 1439sub conn::addme_success {
1371 my ($self) = @_; 1440 my ($self) = @_;
1372 1441
1442 $self->send ("command output-sync $CFG->{output_sync}");
1443 $self->send ("command output-count $CFG->{output_count}");
1444
1373 for my $skill (values %{$self->{skill_info}}) { 1445 for my $skill (values %{$self->{skill_info}}) {
1374 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1446 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'");
1375 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1447 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
1376 } 1448 }
1377
1378 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1379 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1380 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1381 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1382} 1449}
1383 1450
1384sub conn::eof { 1451sub conn::eof {
1452 $MAPWIDGET->clr_commands;
1453
1385 stop_game; 1454 stop_game;
1386} 1455}
1387 1456
1388sub update_floorbox { 1457sub update_floorbox {
1389 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1458 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
… …
1407} 1476}
1408 1477
1409sub conn::container_add { 1478sub conn::container_add {
1410 my ($self, $tag, $items) = @_; 1479 my ($self, $tag, $items) = @_;
1411 1480
1412 update_floorbox if $tag == 0; 1481 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1413 1482
1483 if ($tag == 0) {
1484 update_floorbox;
1485 $OPENCONT = 0;
1486 $INVR_LBL->set_text ("Floor");
1487 $INVR->set_items ($self->{container}{0});
1488 } elsif ($tag == $self->{player}{tag}) {
1489 $INVR_LBL->set_text ("Player");
1414 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1490 $INV->set_items ($self->{container}{$self->{player}{tag}})
1415 if $tag == $self->{player}{tag}; 1491 } else {
1492 $OPENCONT = $tag;
1493 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1494 $INVR->set_items ($self->{container}{$tag});
1495 }
1416 1496
1417 # $self-<{player}{tag} => player inv 1497 # $self-<{player}{tag} => player inv
1418 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1498 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1419} 1499}
1420 1500
1421sub conn::container_clear { 1501sub conn::container_clear {
1422 my ($self, $tag) = @_; 1502 my ($self, $tag) = @_;
1423 1503
1424 update_floorbox if $tag == 0; 1504 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1425 1505
1506 if ($tag == 0) {
1507 update_floorbox;
1508 $OPENCONT = 0;
1509 $INVR_LBL->set_text ("Floor");
1510 $INVR->set_items ($self->{container}{0});
1511 } elsif ($tag == $self->{player}{tag}) {
1512 $INVR_LBL->set_text ("Player");
1426 $INV->set_items ($self->{container}{$tag}) 1513 $INV->set_items ($self->{container}{$tag})
1427 if $tag == $self->{player}{tag}; 1514 } else {
1515 $OPENCONT = $tag;
1516 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1517 $INVR->set_items ($self->{container}{$tag});
1518 }
1428 1519
1429# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1520# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1430} 1521}
1431 1522
1432sub conn::item_delete { 1523sub conn::item_delete {
1433 my ($self, @items) = @_; 1524 my ($self, @items) = @_;
1434 1525
1435 for (@items) { 1526 for (@items) {
1436 update_floorbox if $_->{container} == 0; 1527 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1437 1528
1529 if ($_->{container} == 0) {
1530 update_floorbox;
1531 $OPENCONT = 0;
1532 $INVR_LBL->set_text ("Floor");
1533 $INVR->set_items ($self->{container}{0});
1534 } elsif ($_->{container} == $self->{player}{tag}) {
1535 $INVR_LBL->set_text ("Player");
1536 $INV->set_items ($self->{container}{$self->{player}{tag}})
1537 } else {
1538 $OPENCONT = $_->{container};
1539 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1438 $INV->set_items ($self->{container}{$_->{container}}) 1540 $INVR->set_items ($self->{container}{$_->{container}});
1439 if $_->{container} == $self->{player}{tag}; 1541 }
1440 } 1542 }
1441} 1543}
1442 1544
1443sub conn::item_update { 1545sub conn::item_update {
1444 my ($self, $item) = @_; 1546 my ($self, $item) = @_;
1445 1547
1446 update_floorbox if $item->{container} == 0; 1548 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1447 1549
1550 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1551 $OPENCONT = 0;
1552 $INVR_LBL->set_text ("Floor");
1553 $INVR->set_items ($self->{container}{0});
1554
1555 $item->{widget}->update_item
1556 if $item->{widget};
1557 } else {
1558 if ($item->{container} == 0) {
1559 update_floorbox;
1560 $OPENCONT = 0;
1561 $INVR_LBL->set_text ("Floor");
1562 $INVR->set_items ($self->{container}{0});
1563 } elsif ($item->{container} == $self->{player}{tag}) {
1448 $INV->set_items ($self->{container}{$item->{container}}) 1564 $INV->set_items ($self->{container}{$item->{container}})
1449 if $item->{container} == $self->{player}{tag}; 1565 }
1566 }
1450} 1567}
1451 1568
1452%SDL_CB = ( 1569%SDL_CB = (
1453 CFClient::SDL_QUIT => sub { 1570 CFClient::SDL_QUIT => sub {
1454 Event::unloop -1; 1571 Event::unloop -1;
… …
1500 sdl_mode => 0, 1617 sdl_mode => 0,
1501 width => 640, 1618 width => 640,
1502 height => 480, 1619 height => 480,
1503 fullscreen => 0, 1620 fullscreen => 0,
1504 fast => 0, 1621 fast => 0,
1505 map_scale => 0.5, 1622 map_scale => 1,
1506 fow_enable => 1, 1623 fow_enable => 1,
1507 fow_intensity => 0.45, 1624 fow_intensity => 0.45,
1508 fow_smooth => 0, 1625 fow_smooth => 0,
1509 gui_fontsize => 1, 1626 gui_fontsize => 1,
1510 log_fontsize => 1, 1627 log_fontsize => 1,
… …
1515 host => "crossfire.schmorp.de", 1632 host => "crossfire.schmorp.de",
1516 say_command => 'say', 1633 say_command => 'say',
1517 audio_enable => 1, 1634 audio_enable => 1,
1518 bgm_enable => 1, 1635 bgm_enable => 1,
1519 bgm_volume => 0.25, 1636 bgm_volume => 0.25,
1637 output_sync => 1,
1638 output_count => 1,
1520 ); 1639 );
1521 1640
1522 while (my ($k, $v) = each %DEF_CFG) { 1641 while (my ($k, $v) = each %DEF_CFG) {
1523 $CFG->{$k} = $v unless exists $CFG->{$k}; 1642 $CFG->{$k} = $v unless exists $CFG->{$k};
1524 } 1643 }
… …
1545 DejaVuSansMono-BoldOblique.ttf 1664 DejaVuSansMono-BoldOblique.ttf
1546 ); 1665 );
1547 1666
1548 CFClient::add_font $_ for @fonts; 1667 CFClient::add_font $_ for @fonts;
1549 1668
1669 CFClient::pango_init;
1670
1550 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1671 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1551 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1672 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1552 1673
1553 $FONT_PROP->make_default; 1674 $FONT_PROP->make_default;
1554 } 1675 }
1676
1677# compare mono (ft) vs. rgba (cairo)
1678# ft - 1.8s, cairo 3s, even in alpha-only mode
1679# for my $rgba (0..1) {
1680# my $t1 = Time::HiRes::time;
1681# for (1..1000) {
1682# my $layout = CFClient::Layout->new ($rgba);
1683# $layout->set_text ("hallo" x 100);
1684# $layout->render;
1685# }
1686# my $t2 = Time::HiRes::time;
1687# warn $t2-$t1;
1688# }
1555 1689
1556 video_init; 1690 video_init;
1557 audio_init; 1691 audio_init;
1558} 1692}
1559 1693
… …
1614 1748
1615Typing B<climb> will display a list of commands with I<climb> in their 1749Typing B<climb> will display a list of commands with I<climb> in their
1616name, such as I<ready_skill climbing> and I<use_skill climbing>. 1750name, such as I<ready_skill climbing> and I<use_skill climbing>.
1617 1751
1618You can abbreviate commands by typing only the first character of every 1752You can abbreviate commands by typing only the first character of every
1619word. For example, typing I<iwor> will likely select I<invoke word of 1753word (or even characters within the word - the client will try to make
1620recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1754a good guess, as long as the characters are in order). For example,
1621will likely select I<ready_skill climbing> and I<usl> will give you 1755typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1622I<use_skill levitation>. 1756will select I<cast create food>. Likewise, I<rscli> will likely select
1757I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1758
1759You can enter space and other text as arguemnt to the command. For
1760example, C<cfoo waybread> will expand to C<cast create food waybread>.
1623 1761
1624=head2 The map overview 1762=head2 The map overview
1625 1763
1626#TODO# 1764#TODO#
1627 1765

Diff Legend

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