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.200 by root, Mon May 8 17:23:08 2006 UTC vs.
Revision 1.231 by root, Sun May 21 00:02:02 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
834 $LAST_REFRESH = time - 0.01; 869 $LAST_REFRESH = time - 0.01;
835 870
836 CFClient::gl_init; 871 CFClient::gl_init;
837 872
838 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 873 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
839 874
875 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
876
840 ############################################################################# 877 #############################################################################
841 878
879 unless ($DEBUG_STATUS) {
880 # create the widgets
881
842 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 882 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
843 $DEBUG_STATUS->show; 883 $DEBUG_STATUS->show;
844 884
845 $STATUS_LINE = new CFClient::UI::Label 885 $STATUSBOX = new CFClient::UI::Statusbox;
846 padding => 0, 886 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
847 y => $HEIGHT - $FONTSIZE * 1.8;
848 $STATUS_LINE->show;
849 887
850 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 888 (new CFClient::UI::Frame
851 padding => 0, 889 bg => [0, 0, 0, 0.4],
852 fontsize => 0.8, 890 req_y => -1,
853 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 891 child => $STATUSBOX,
854 $ALT_ENTER_MESSAGE->show; 892 )->show;
855 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
856 893
857 CFClient::UI::FancyFrame->new ( 894 CFClient::UI::FancyFrame->new (
858 border_bg => [1, 1, 1, 192/255], 895 border_bg => [1, 1, 1, 192/255],
859 bg => [1, 1, 1, 0], 896 bg => [1, 1, 1, 0],
860 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 897 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
861 )->show; 898 )->show;
862 899
863 $MAPWIDGET = new CFClient::MapWidget; 900 $MAPWIDGET = new CFClient::MapWidget;
864 $MAPWIDGET->connect (activate_console => sub { 901 $MAPWIDGET->connect (activate_console => sub {
865 my ($mapwidget, $preset) = @_; 902 my ($mapwidget, $preset) = @_;
866 903
867 if ($CONSOLE) { 904 if ($CONSOLE) {
868 $CONSOLE->{input}->{auto_activated} = 1; 905 $CONSOLE->{input}->{auto_activated} = 1;
869 $CONSOLE->{input}->focus_in; 906 $CONSOLE->{input}->focus_in;
870 907
871 if ($preset && $CONSOLE->{input}->get_text eq '') { 908 if ($preset && $CONSOLE->{input}->get_text eq '') {
872 $CONSOLE->{input}->set_text ($preset); 909 $CONSOLE->{input}->set_text ($preset);
910 }
873 } 911 }
874 } 912 });
875 });
876 $MAPWIDGET->show; 913 $MAPWIDGET->show;
877 $MAPWIDGET->focus_in; 914 $MAPWIDGET->focus_in;
878 915
916 $LOGVIEW = new CFClient::UI::TextView
917 expand => 1,
918 font => $FONT_FIXED,
919 fontsize => $::CFG->{log_fontsize},
920 ;
921
879 $BUTTONBAR = new CFClient::UI::HBox; 922 $BUTTONBAR = new CFClient::UI::HBox;
880 923
881 $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);
882 $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);
883 $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);
884 927
885 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 928 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
886 929
887 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 930 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
888 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 931 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
889 932
890 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 933 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
891 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 934 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
892 status "Configuration Saved"; 935 status "Configuration Saved";
893 }); 936 });
894 937
895 $BUTTONBAR->show; 938 $BUTTONBAR->show;
896 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 {
897 $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 ();
949 }
898} 950}
899 951
900sub video_shutdown { 952sub video_shutdown {
901 $CFClient::UI::ROOT->{children} = [];
902 undef $CFClient::UI::GRAB;
903 undef $CFClient::UI::HOVER;
904 undef $SDL_ACTIVE; 953 undef $SDL_ACTIVE;
905} 954}
906 955
907my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 956my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
908my $bgmusic;#TODO#hack#d# 957my $bgmusic;#TODO#hack#d#
909 958
910sub audio_channel_finished { 959sub audio_channel_finished {
911 my ($channel) = @_; 960 my ($channel) = @_;
912 961
913 warn "channel $channel finished\n";#d# 962 #warn "channel $channel finished\n";#d#
914} 963}
915 964
916sub audio_music_finished { 965sub audio_music_finished {
917 return unless $CFG->{bgm_enable}; 966 return unless $CFG->{bgm_enable};
918 967
… …
960} 1009}
961 1010
962my %animate_object; 1011my %animate_object;
963my $animate_timer; 1012my $animate_timer;
964 1013
965my $want_refresh;
966my $can_refresh;
967
968my $fps = 9; 1014my $fps = 9;
969 1015
1016my %demo;#d#
1017
970sub force_refresh { 1018sub force_refresh {
971 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1019 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
972 debug sprintf "%3.2f", $fps; 1020 debug sprintf "%3.2f", $fps;
973 1021
974 $want_refresh = 0;
975 $can_refresh = 0;
976
977 $CFClient::UI::ROOT->draw; 1022 $CFClient::UI::ROOT->draw;
978 1023
10240 && do {
1025 # some weird model-drawing code, just a joke right now
1026 use CFClient::OpenGL;
1027
1028 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1029 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1030 $demo{r} ||= do {
1031 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1032 $mod->{v} = pack "f*", @{$mod->{v}};
1033 $_ = [scalar @$_, pack "S!*", @$_]
1034 for values %{$mod->{g}};
1035 $mod
1036 };
1037
1038 my $r = $demo{r} or die;
1039
1040 glDepthMask 1;
1041 glClear GL_DEPTH_BUFFER_BIT;
1042 glEnable GL_TEXTURE_2D;
1043 glEnable GL_DEPTH_TEST;
1044 glDisable GL_CULL_FACE;
1045 glShadeModel GL_SMOOTH;
1046
1047 glMatrixMode GL_PROJECTION;
1048 glLoadIdentity;
1049 glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1050 glMatrixMode GL_MODELVIEW;
1051 glLoadIdentity;
1052
1053 glPushMatrix;
1054 glTranslate $::WIDTH * 0.5, $::HEIGHT * 0.5;
1055 glRotate $NOW * 1000 % 36000 / 20, 0, 1, 0;
1056 glScale 50, 50, 50;
1057
1058 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1059 while (my ($k, $v) = each %{$r->{g}}) {
1060 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1061 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1062 }
1063 glPopMatrix;
1064
1065 glShadeModel GL_FLAT;
1066 glDisable GL_DEPTH_TEST;
1067 glDisable GL_TEXTURE_2D;
1068 glDepthMask 0;
1069
1070 $WANT_REFRESH++;
1071};
1072
979 CFClient::SDL_GL_SwapBuffers; 1073 CFClient::SDL_GL_SwapBuffers;
980 1074
1075 $WANT_REFRESH = 0;
1076 $CAN_REFRESH = 0;
981 $LAST_REFRESH = $NOW; 1077 $LAST_REFRESH = $NOW;
982} 1078}
983 1079
984my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1080my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
985 $NOW = time; 1081 $NOW = time;
… …
987 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1083 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
988 for CFClient::SDL_PollEvent; 1084 for CFClient::SDL_PollEvent;
989 1085
990 if (%animate_object) { 1086 if (%animate_object) {
991 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1087 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
992 $want_refresh++; 1088 $WANT_REFRESH++;
993 } 1089 }
994 1090
995 if ($want_refresh) { 1091 if ($WANT_REFRESH) {
996 force_refresh; 1092 force_refresh;
997 } else { 1093 } else {
998 $can_refresh = 1; 1094 $CAN_REFRESH = 1;
999 } 1095 }
1000}); 1096});
1001
1002sub refresh {
1003 $want_refresh++;
1004}
1005 1097
1006sub animation_start { 1098sub animation_start {
1007 my ($widget) = @_; 1099 my ($widget) = @_;
1008 $animate_object{$widget} = $widget; 1100 $animate_object{$widget} = $widget;
1009} 1101}
… …
1013 delete $animate_object{$widget}; 1105 delete $animate_object{$widget};
1014} 1106}
1015 1107
1016@conn::ISA = Crossfire::Protocol::; 1108@conn::ISA = Crossfire::Protocol::;
1017 1109
1110sub conn::new {
1111 my $class = shift;
1112
1113 my $self = $class->Crossfire::Protocol::new (@_);
1114
1115 $MAPWIDGET->clr_commands;
1116
1117 my $parser = new Pod::POM;
1118 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1119
1120 for my $head2 ($pod->head2) {
1121 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1122 or next;
1123
1124 my $cmd = $1;
1125 my @args = split /\|/, $2;
1126 @args = (".*") unless @args;
1127
1128 my $text = CFClient::pod_to_pango $head2->content;
1129
1130 for my $arg (@args) {
1131 $arg = $arg eq ".*" ? "" : " $arg";
1132
1133 $MAPWIDGET->add_command ("$cmd$arg", $text);
1134 }
1135 }
1136
1137 $self
1138}
1139
1018sub conn::stats_update { 1140sub conn::stats_update {
1019 my ($self, $stats) = @_; 1141 my ($self, $stats) = @_;
1142
1143 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1144 my $diff = $exp - $self->{prev_exp};
1145 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1146 if exists $self->{prev_exp} && $diff;
1147 $self->{prev_exp} = $exp;
1148 }
1020 1149
1021 update_stats_window ($stats); 1150 update_stats_window ($stats);
1022} 1151}
1023 1152
1024sub conn::user_send { 1153sub conn::user_send {
… …
1195 } 1324 }
1196 1325
1197gotid: 1326gotid:
1198 $face->{id} = $id; 1327 $face->{id} = $id;
1199 $MAP->set_face ($facenum => $id); 1328 $MAP->set_face ($facenum => $id);
1329 $self->{faceid}[$facenum] = $id;#d#
1200 $TILECACHE->get ($id) 1330 $TILECACHE->get ($id)
1201} 1331}
1202 1332
1203sub conn::face_update { 1333sub conn::face_update {
1204 my ($self, $facenum, $face) = @_; 1334 my ($self, $facenum, $face) = @_;
… …
1320 [0.55, 0.41, 0.13], 1450 [0.55, 0.41, 0.13],
1321 [0.99, 0.77, 0.26], 1451 [0.99, 0.77, 0.26],
1322 [0.74, 0.65, 0.41], 1452 [0.74, 0.65, 0.41],
1323 ); 1453 );
1324 1454
1455 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1456
1457 $text = CFClient::UI::Label::escape $text;
1458 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1459 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1460
1325 $LOGVIEW->add_paragraph ($color[$color], $text); 1461 $LOGVIEW->add_paragraph ($color[$color],
1462 join "\n", map "$time $_", split /\n/, $text);
1463
1464 $STATUSBOX->add ($text,
1465 group => $text,
1466 fg => $color[$color],
1467 timeout => 60,
1468 tooltip_font => $::FONT_FIXED,
1469 );
1470}
1471
1472sub conn::drawextinfo {
1473 my ($self, $color, $type, $subtype, $message) = @_;
1474
1475 $self->drawinfo ($color, $message);
1326} 1476}
1327 1477
1328sub conn::spell_add { 1478sub conn::spell_add {
1329 my ($self, $spell) = @_; 1479 my ($self, $spell) = @_;
1330 1480
1331 # TODO 1481 # TODO
1332 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1482 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1333 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1483 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1334 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1484 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1335} 1485}
1336 1486
1337sub conn::spell_delete { 1487sub conn::spell_delete {
1338 my ($self, $spell) = @_; 1488 my ($self, $spell) = @_;
1339} 1489}
1340 1490
1341sub conn::addme_success { 1491sub conn::addme_success {
1342 my ($self) = @_; 1492 my ($self) = @_;
1343 1493
1494 $self->send ("command output-sync $CFG->{output_sync}");
1495 $self->send ("command output-count $CFG->{output_count}");
1496
1344 for my $skill (values %{$self->{skill_info}}) { 1497 for my $skill (values %{$self->{skill_info}}) {
1345 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1498 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'");
1346 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1499 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
1347 } 1500 }
1348
1349 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1350 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1351 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1352 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1353} 1501}
1354 1502
1355sub conn::eof { 1503sub conn::eof {
1504 $MAPWIDGET->clr_commands;
1505
1356 stop_game; 1506 stop_game;
1357} 1507}
1358 1508
1359sub update_floorbox { 1509sub update_floorbox {
1360 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1510 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1361 return unless $CONN; 1511 return unless $CONN;
1362 1512
1363 $FLOORBOX->clear; 1513 $FLOORBOX->clear;
1364 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1514 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1365 1515
1366 # we basically have to use the same sorting as everybody else 1516 my $count = 4;
1367 for my $item (@{ $CONN->{container}{0} }) { 1517 for (@{ $CONN->{container}{0} }) {
1518 if (--$count) {
1368 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item); 1519 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1520 } else {
1521 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1522 last;
1523 }
1369 } 1524 }
1370 }); 1525 });
1371 refresh; 1526
1527 $WANT_REFRESH++;
1372} 1528}
1373 1529
1374sub conn::container_add { 1530sub conn::container_add {
1375 my ($self, $id, $items) = @_; 1531 my ($self, $tag, $items) = @_;
1376 1532
1377 update_floorbox if $id == 0; 1533 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1534
1535 if ($tag == 0) {
1536 update_floorbox;
1537 $OPENCONT = 0;
1538 $INVR_LBL->set_text ("Floor");
1539 $INVR->set_items ($self->{container}{0});
1378 if ($self->{player}{tag} == $id) { 1540 } elsif ($tag == $self->{player}{tag}) {
1541 $INVR_LBL->set_text ("Player");
1379 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1542 $INV->set_items ($self->{container}{$self->{player}{tag}})
1543 } else {
1544 $OPENCONT = $tag;
1545 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1546 $INVR->set_items ($self->{container}{$tag});
1380 } 1547 }
1548
1381 # $self-<{player}{tag} => player inv 1549 # $self-<{player}{tag} => player inv
1382 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1550 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1383} 1551}
1384 1552
1385sub conn::container_clear { 1553sub conn::container_clear {
1386 my ($self, $id) = @_; 1554 my ($self, $tag) = @_;
1387 1555
1388 update_floorbox if $id == 0; 1556 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1389 if ($self->{player}{tag} == $id) { 1557
1558 if ($tag == 0) {
1559 update_floorbox;
1560 $OPENCONT = 0;
1561 $INVR_LBL->set_text ("Floor");
1390 $INV->set_items ($self->{container}{$id}); 1562 $INVR->set_items ($self->{container}{0});
1563 } elsif ($tag == $self->{player}{tag}) {
1564 $INVR_LBL->set_text ("Player");
1565 $INV->set_items ($self->{container}{$tag})
1566 } else {
1567 $OPENCONT = $tag;
1568 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1569 $INVR->set_items ($self->{container}{$tag});
1391 } 1570 }
1392 1571
1393# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1572# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1394} 1573}
1395 1574
1396sub conn::item_delete { 1575sub conn::item_delete {
1397 my ($self, @items) = @_; 1576 my ($self, @items) = @_;
1398 1577
1399 for (@items) { 1578 for (@items) {
1400 update_floorbox if $_->{container} == 0; 1579 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1401 if ($self->{player}{tag} == $_->{container}) { 1580
1581 if ($_->{container} == 0) {
1582 update_floorbox;
1583 $OPENCONT = 0;
1584 $INVR_LBL->set_text ("Floor");
1585 $INVR->set_items ($self->{container}{0});
1586 } elsif ($_->{container} == $self->{player}{tag}) {
1587 $INVR_LBL->set_text ("Player");
1588 $INV->set_items ($self->{container}{$self->{player}{tag}})
1589 } else {
1590 $OPENCONT = $_->{container};
1591 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1402 $INV->set_items ($self->{container}{$_->{container}}); 1592 $INVR->set_items ($self->{container}{$_->{container}});
1403 } 1593 }
1404 } 1594 }
1405} 1595}
1406 1596
1407sub conn::item_update { 1597sub conn::item_update {
1408 my ($self, $item) = @_; 1598 my ($self, $item) = @_;
1409 1599
1410 update_floorbox if $item->{container} == 0; 1600 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1411 if ($self->{player}{tag} == $item->{container}) { 1601
1602 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1603 $OPENCONT = 0;
1604 $INVR_LBL->set_text ("Floor");
1605 $INVR->set_items ($self->{container}{0});
1606
1607 $item->{widget}->update_item
1608 if $item->{widget};
1609 } else {
1610 if ($item->{container} == 0) {
1611 update_floorbox;
1612 $OPENCONT = 0;
1613 $INVR_LBL->set_text ("Floor");
1614 $INVR->set_items ($self->{container}{0});
1615 } elsif ($item->{container} == $self->{player}{tag}) {
1412 $INV->set_items ($self->{container}{$item->{container}}); 1616 $INV->set_items ($self->{container}{$item->{container}})
1617 }
1413 } 1618 }
1414} 1619}
1415 1620
1416%SDL_CB = ( 1621%SDL_CB = (
1417 CFClient::SDL_QUIT => sub { 1622 CFClient::SDL_QUIT => sub {
1418 Event::unloop -1; 1623 Event::unloop -1;
1419 }, 1624 },
1420 CFClient::SDL_VIDEORESIZE => sub { 1625 CFClient::SDL_VIDEORESIZE => sub {
1421 }, 1626 },
1422 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1627 CFClient::SDL_VIDEOEXPOSE => sub {
1628 $WANT_REFRESH++;
1629 },
1423 CFClient::SDL_ACTIVEEVENT => sub { 1630 CFClient::SDL_ACTIVEEVENT => sub {
1424# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1631# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1425 }, 1632 },
1426 CFClient::SDL_KEYDOWN => sub { 1633 CFClient::SDL_KEYDOWN => sub {
1427 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1634 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1448 1655
1449############################################################################# 1656#############################################################################
1450 1657
1451$SIG{INT} = $SIG{TERM} = sub { exit }; 1658$SIG{INT} = $SIG{TERM} = sub { exit };
1452 1659
1453CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1454
1455$TILECACHE = CFClient::db_table "tilecache";
1456$FACEMAP = CFClient::db_table "facemap";
1457
1458my %DEF_CFG = (
1459 sdl_mode => 0,
1460 width => 640,
1461 height => 480,
1462 fullscreen => 0,
1463 fast => 0,
1464 map_scale => 0.5,
1465 fow_enable => 1,
1466 fow_intensity => 0.45,
1467 fow_smooth => 0,
1468 gui_fontsize => 1,
1469 log_fontsize => 1,
1470 gauge_fontsize => 1,
1471 gauge_size => 0.35,
1472 stat_fontsize => 1,
1473 mapsize => 100,
1474 host => "crossfire.schmorp.de",
1475 say_command => 'say',
1476 audio_enable => 1,
1477 bgm_enable => 1,
1478 bgm_volume => 0.25,
1479);
1480
1481while (my ($k, $v) = each %DEF_CFG) {
1482 $CFG->{$k} = $v unless exists $CFG->{$k};
1483}
1484
1485sdl_init;
1486
1487@SDL_MODES = reverse
1488 grep $_->[0] >= 640 && $_->[1] >= 480,
1489 CFClient::SDL_ListModes;
1490
1491@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1492
1493$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1494
1495{ 1660{
1661 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1662
1663 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1664
1665 $TILECACHE = CFClient::db_table "tilecache";
1666 $FACEMAP = CFClient::db_table "facemap";
1667
1668 my %DEF_CFG = (
1669 sdl_mode => 0,
1670 width => 640,
1671 height => 480,
1672 fullscreen => 0,
1673 fast => 0,
1674 map_scale => 1,
1675 fow_enable => 1,
1676 fow_intensity => 0.45,
1677 fow_smooth => 0,
1678 gui_fontsize => 1,
1679 log_fontsize => 1,
1680 gauge_fontsize=> 1,
1681 gauge_size => 0.35,
1682 stat_fontsize => 1,
1683 mapsize => 100,
1684 host => "crossfire.schmorp.de",
1685 say_command => 'say',
1686 audio_enable => 1,
1687 bgm_enable => 1,
1688 bgm_volume => 0.25,
1689 output_sync => 1,
1690 output_count => 1,
1691 );
1692
1693 while (my ($k, $v) = each %DEF_CFG) {
1694 $CFG->{$k} = $v unless exists $CFG->{$k};
1695 }
1696
1697 sdl_init;
1698
1699 @SDL_MODES = reverse
1700 grep $_->[0] >= 640 && $_->[1] >= 480,
1701 CFClient::SDL_ListModes;
1702
1703 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1704
1705 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1706
1707 {
1496 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1708 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1497 DejaVuSans.ttf 1709 DejaVuSans.ttf
1498 DejaVuSansMono.ttf 1710 DejaVuSansMono.ttf
1499 DejaVuSans-Bold.ttf 1711 DejaVuSans-Bold.ttf
1500 DejaVuSansMono-Bold.ttf 1712 DejaVuSansMono-Bold.ttf
1501 DejaVuSans-Oblique.ttf 1713 DejaVuSans-Oblique.ttf
1502 DejaVuSansMono-Oblique.ttf 1714 DejaVuSansMono-Oblique.ttf
1503 DejaVuSans-BoldOblique.ttf 1715 DejaVuSans-BoldOblique.ttf
1504 DejaVuSansMono-BoldOblique.ttf 1716 DejaVuSansMono-BoldOblique.ttf
1505 ); 1717 );
1506 1718
1507 CFClient::add_font $_ for @fonts; 1719 CFClient::add_font $_ for @fonts;
1508 1720
1721 CFClient::pango_init;
1722
1509 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1723 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1510 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1724 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1511 1725
1512 $FONT_PROP->make_default; 1726 $FONT_PROP->make_default;
1513} 1727 }
1514 1728
1729# compare mono (ft) vs. rgba (cairo)
1730# ft - 1.8s, cairo 3s, even in alpha-only mode
1731# for my $rgba (0..1) {
1732# my $t1 = Time::HiRes::time;
1733# for (1..1000) {
1734# my $layout = CFClient::Layout->new ($rgba);
1735# $layout->set_text ("hallo" x 100);
1736# $layout->render;
1737# }
1738# my $t2 = Time::HiRes::time;
1739# warn $t2-$t1;
1740# }
1741
1515video_init; 1742 video_init;
1516audio_init; 1743 audio_init;
1744}
1517 1745
1518Event::loop; 1746Event::loop;
1519 1747
1520END { CFClient::SDL_Quit } 1748END { CFClient::SDL_Quit }
1521 1749
… …
1572 1800
1573Typing B<climb> will display a list of commands with I<climb> in their 1801Typing B<climb> will display a list of commands with I<climb> in their
1574name, such as I<ready_skill climbing> and I<use_skill climbing>. 1802name, such as I<ready_skill climbing> and I<use_skill climbing>.
1575 1803
1576You can abbreviate commands by typing only the first character of every 1804You can abbreviate commands by typing only the first character of every
1577word. For example, typing I<iwor> will likely select I<invoke word of 1805word (or even characters within the word - the client will try to make
1578recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1806a good guess, as long as the characters are in order). For example,
1579will likely select I<ready_skill climbing> and I<usl> will give you 1807typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1580I<use_skill levitation>. 1808will select I<cast create food>. Likewise, I<rscli> will likely select
1809I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1810
1811You can enter space and other text as arguemnt to the command. For
1812example, C<cfoo waybread> will expand to C<cast create food waybread>.
1581 1813
1582=head2 The map overview 1814=head2 The map overview
1583 1815
1584#TODO# 1816#TODO#
1585 1817

Diff Legend

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