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.201 by root, Mon May 8 18:31:01 2006 UTC vs.
Revision 1.225 by root, Wed May 17 16:17:01 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 ($_[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
… …
805 818
806 $window 819 $window
807} 820}
808 821
809sub make_inventory_window { 822sub make_inventory_window {
810 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 823 my $invwin = new CFClient::UI::FancyFrame
824 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
825
826 $invwin->add (my $hb = new CFClient::UI::HBox);
827
828 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
829 $vb1->add (my $lbl = new CFClient::UI::Label);
830 $lbl->set_text ("Player");
811 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); 831 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
832
833 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
834 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
835 $INVR_LBL->set_text ("Floor");
836 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
837
812 $invwin 838 $invwin
813} 839}
814 840
815sub sdl_init { 841sub sdl_init {
816 CFClient::SDL_Init 842 CFClient::SDL_Init
… …
828 854
829 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 855 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
830 or die "SDL_SetVideoMode failed!\n"; 856 or die "SDL_SetVideoMode failed!\n";
831 857
832 $SDL_ACTIVE = 1; 858 $SDL_ACTIVE = 1;
833
834 $LAST_REFRESH = time - 0.01; 859 $LAST_REFRESH = time - 0.01;
835 860
836 CFClient::gl_init; 861 CFClient::gl_init;
837 862
838 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 863 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
839 864
865 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
866
840 ############################################################################# 867 #############################################################################
841 868
869 unless ($DEBUG_STATUS) {
870 # create the widgets
871
842 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 872 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
843 $DEBUG_STATUS->show; 873 $DEBUG_STATUS->show;
844 874
845 $STATUS_LINE = new CFClient::UI::Label 875 $STATUSBOX = new CFClient::UI::Statusbox;
846 padding => 0, 876 $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 877
850 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 878 (new CFClient::UI::Frame
851 padding => 0, 879 bg => [0, 0, 0, 0.4],
852 fontsize => 0.8, 880 req_y => -1,
853 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 881 child => $STATUSBOX,
854 $ALT_ENTER_MESSAGE->show; 882 )->show;
855 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
856 883
857 CFClient::UI::FancyFrame->new ( 884 CFClient::UI::FancyFrame->new (
858 border_bg => [1, 1, 1, 192/255], 885 border_bg => [1, 1, 1, 192/255],
859 bg => [1, 1, 1, 0], 886 bg => [1, 1, 1, 0],
860 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 887 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
861 )->show; 888 )->show;
862 889
863 $MAPWIDGET = new CFClient::MapWidget; 890 $MAPWIDGET = new CFClient::MapWidget;
864 $MAPWIDGET->connect (activate_console => sub { 891 $MAPWIDGET->connect (activate_console => sub {
865 my ($mapwidget, $preset) = @_; 892 my ($mapwidget, $preset) = @_;
866 893
867 if ($CONSOLE) { 894 if ($CONSOLE) {
868 $CONSOLE->{input}->{auto_activated} = 1; 895 $CONSOLE->{input}->{auto_activated} = 1;
869 $CONSOLE->{input}->focus_in; 896 $CONSOLE->{input}->focus_in;
870 897
871 if ($preset && $CONSOLE->{input}->get_text eq '') { 898 if ($preset && $CONSOLE->{input}->get_text eq '') {
872 $CONSOLE->{input}->set_text ($preset); 899 $CONSOLE->{input}->set_text ($preset);
900 }
873 } 901 }
874 } 902 });
875 });
876 $MAPWIDGET->show; 903 $MAPWIDGET->show;
877 $MAPWIDGET->focus_in; 904 $MAPWIDGET->focus_in;
878 905
879 $BUTTONBAR = new CFClient::UI::HBox; 906 $BUTTONBAR = new CFClient::UI::HBox;
880 907
881 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 908 $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); 909 $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); 910 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
884 911
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 912 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 913
887 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 914 $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); 915 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
889 916
890 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 917 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
891 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 918 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
892 status "Configuration Saved"; 919 status "Configuration Saved";
893 }); 920 });
894 921
895 $BUTTONBAR->show; 922 $BUTTONBAR->show;
896 923
924 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
925
926 # delay till geometry is constant
927 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
897 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 928 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
929 my $widget = $GAUGES->{win};
930 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
931 });
932 force_refresh ();
933 }
898} 934}
899 935
900sub video_shutdown { 936sub video_shutdown {
901 $CFClient::UI::ROOT->{children} = [];
902 undef $CFClient::UI::GRAB;
903 undef $CFClient::UI::HOVER;
904 undef $SDL_ACTIVE; 937 undef $SDL_ACTIVE;
905} 938}
906 939
907my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 940my @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# 941my $bgmusic;#TODO#hack#d#
… …
960} 993}
961 994
962my %animate_object; 995my %animate_object;
963my $animate_timer; 996my $animate_timer;
964 997
965my $want_refresh;
966my $can_refresh;
967
968my $fps = 9; 998my $fps = 9;
969 999
970sub force_refresh { 1000sub force_refresh {
971 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1001 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
972 debug sprintf "%3.2f", $fps; 1002 debug sprintf "%3.2f", $fps;
973 1003
974 $want_refresh = 0;
975 $can_refresh = 0;
976
977 $CFClient::UI::ROOT->draw; 1004 $CFClient::UI::ROOT->draw;
978
979 CFClient::SDL_GL_SwapBuffers; 1005 CFClient::SDL_GL_SwapBuffers;
980 1006
1007 $WANT_REFRESH = 0;
1008 $CAN_REFRESH = 0;
981 $LAST_REFRESH = $NOW; 1009 $LAST_REFRESH = $NOW;
982} 1010}
983 1011
984my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1012my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
985 $NOW = time; 1013 $NOW = time;
… …
987 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1015 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
988 for CFClient::SDL_PollEvent; 1016 for CFClient::SDL_PollEvent;
989 1017
990 if (%animate_object) { 1018 if (%animate_object) {
991 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1019 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
992 $want_refresh++; 1020 $WANT_REFRESH++;
993 } 1021 }
994 1022
995 if ($want_refresh) { 1023 if ($WANT_REFRESH) {
996 force_refresh; 1024 force_refresh;
997 } else { 1025 } else {
998 $can_refresh = 1; 1026 $CAN_REFRESH = 1;
999 } 1027 }
1000}); 1028});
1001
1002sub refresh {
1003 $want_refresh++;
1004}
1005 1029
1006sub animation_start { 1030sub animation_start {
1007 my ($widget) = @_; 1031 my ($widget) = @_;
1008 $animate_object{$widget} = $widget; 1032 $animate_object{$widget} = $widget;
1009} 1033}
… …
1015 1039
1016@conn::ISA = Crossfire::Protocol::; 1040@conn::ISA = Crossfire::Protocol::;
1017 1041
1018sub conn::stats_update { 1042sub conn::stats_update {
1019 my ($self, $stats) = @_; 1043 my ($self, $stats) = @_;
1044
1045 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1046 my $diff = $exp - $self->{prev_exp};
1047 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1048 if exists $self->{prev_exp} && $diff;
1049 $self->{prev_exp} = $exp;
1050 }
1020 1051
1021 update_stats_window ($stats); 1052 update_stats_window ($stats);
1022} 1053}
1023 1054
1024sub conn::user_send { 1055sub conn::user_send {
… …
1321 [0.55, 0.41, 0.13], 1352 [0.55, 0.41, 0.13],
1322 [0.99, 0.77, 0.26], 1353 [0.99, 0.77, 0.26],
1323 [0.74, 0.65, 0.41], 1354 [0.74, 0.65, 0.41],
1324 ); 1355 );
1325 1356
1357 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1358
1359 $text = CFClient::UI::Label::escape $text;
1360 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1361 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1362
1326 $LOGVIEW->add_paragraph ($color[$color], $text); 1363 $LOGVIEW->add_paragraph ($color[$color],
1364 join "\n", map "$time $_", split /\n/, $text);
1365
1366 $STATUSBOX->add ($text,
1367 group => $text,
1368 fg => $color[$color],
1369 timeout => 60,
1370 tooltip_font => $::FONT_FIXED,
1371 );
1372}
1373
1374sub conn::drawextinfo {
1375 my ($self, $color, $type, $subtype, $message) = @_;
1376
1377 $self->drawinfo ($color, $message);
1327} 1378}
1328 1379
1329sub conn::spell_add { 1380sub conn::spell_add {
1330 my ($self, $spell) = @_; 1381 my ($self, $spell) = @_;
1331 1382
1332 # TODO 1383 # TODO
1333 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1384 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1334 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1385 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1335 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1386 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1336} 1387}
1337 1388
1338sub conn::spell_delete { 1389sub conn::spell_delete {
1339 my ($self, $spell) = @_; 1390 my ($self, $spell) = @_;
1340} 1391}
1341 1392
1342sub conn::addme_success { 1393sub conn::addme_success {
1343 my ($self) = @_; 1394 my ($self) = @_;
1344 1395
1396 $MAPWIDGET->clr_commands;
1397
1345 for my $skill (values %{$self->{skill_info}}) { 1398 for my $skill (values %{$self->{skill_info}}) {
1346 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1399 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'");
1347 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1400 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
1348 } 1401 }
1349 1402
1350 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you"); 1403 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
1351 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players"); 1404 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
1352 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies"); 1405 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1353 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets"); 1406 $MAPWIDGET->add_command ("killpets", "Kill your pets");
1407 $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
1408 $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
1409 $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
1410
1411 my $parser = new Pod::POM;
1412 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1413
1414 for my $head2 ($pod->head2) {
1415 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1416 or next;
1417
1418 my $cmd = $1;
1419 my @args = split /\|/, $2;
1420 @args = (".*") unless @args;
1421
1422 my $text = CFClient::pod_to_pango $head2->content;
1423
1424 for my $arg (@args) {
1425 $arg = $arg eq ".*" ? "" : " $arg";
1426
1427 $MAPWIDGET->add_command ("$cmd$arg", $text);
1428 }
1429 }
1354} 1430}
1355 1431
1356sub conn::eof { 1432sub conn::eof {
1433 $MAPWIDGET->clr_commands;
1434
1357 stop_game; 1435 stop_game;
1358} 1436}
1359 1437
1360sub update_floorbox { 1438sub update_floorbox {
1361 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1439 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1362 return unless $CONN; 1440 return unless $CONN;
1363 1441
1364 $FLOORBOX->clear; 1442 $FLOORBOX->clear;
1365 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1443 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1366 1444
1367 # we basically have to use the same sorting as everybody else 1445 my $count = 4;
1368 for my $item (@{ $CONN->{container}{0} }) { 1446 for (@{ $CONN->{container}{0} }) {
1447 if (--$count) {
1369 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item); 1448 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1449 } else {
1450 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1451 last;
1452 }
1370 } 1453 }
1371 }); 1454 });
1372 refresh; 1455
1456 $WANT_REFRESH++;
1373} 1457}
1374 1458
1375sub conn::container_add { 1459sub conn::container_add {
1376 my ($self, $id, $items) = @_; 1460 my ($self, $tag, $items) = @_;
1377 1461
1378 update_floorbox if $id == 0; 1462 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1463
1464 if ($tag == 0) {
1465 update_floorbox;
1466 $OPENCONT = 0;
1467 $INVR_LBL->set_text ("Floor");
1468 $INVR->set_items ($self->{container}{0});
1379 if ($self->{player}{tag} == $id) { 1469 } elsif ($tag == $self->{player}{tag}) {
1470 $INVR_LBL->set_text ("Player");
1380 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1471 $INV->set_items ($self->{container}{$self->{player}{tag}})
1472 } else {
1473 $OPENCONT = $tag;
1474 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1475 $INVR->set_items ($self->{container}{$tag});
1381 } 1476 }
1477
1382 # $self-<{player}{tag} => player inv 1478 # $self-<{player}{tag} => player inv
1383 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1479 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1384} 1480}
1385 1481
1386sub conn::container_clear { 1482sub conn::container_clear {
1387 my ($self, $id) = @_; 1483 my ($self, $tag) = @_;
1388 1484
1389 update_floorbox if $id == 0; 1485 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1390 if ($self->{player}{tag} == $id) { 1486
1487 if ($tag == 0) {
1488 update_floorbox;
1489 $OPENCONT = 0;
1490 $INVR_LBL->set_text ("Floor");
1391 $INV->set_items ($self->{container}{$id}); 1491 $INVR->set_items ($self->{container}{0});
1492 } elsif ($tag == $self->{player}{tag}) {
1493 $INVR_LBL->set_text ("Player");
1494 $INV->set_items ($self->{container}{$tag})
1495 } else {
1496 $OPENCONT = $tag;
1497 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1498 $INVR->set_items ($self->{container}{$tag});
1392 } 1499 }
1393 1500
1394# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1501# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1395} 1502}
1396 1503
1397sub conn::item_delete { 1504sub conn::item_delete {
1398 my ($self, @items) = @_; 1505 my ($self, @items) = @_;
1399 1506
1400 for (@items) { 1507 for (@items) {
1401 update_floorbox if $_->{container} == 0; 1508 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1402 if ($self->{player}{tag} == $_->{container}) { 1509
1510 if ($_->{container} == 0) {
1511 update_floorbox;
1512 $OPENCONT = 0;
1513 $INVR_LBL->set_text ("Floor");
1514 $INVR->set_items ($self->{container}{0});
1515 } elsif ($_->{container} == $self->{player}{tag}) {
1516 $INVR_LBL->set_text ("Player");
1517 $INV->set_items ($self->{container}{$self->{player}{tag}})
1518 } else {
1519 $OPENCONT = $_->{container};
1520 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1403 $INV->set_items ($self->{container}{$_->{container}}); 1521 $INVR->set_items ($self->{container}{$_->{container}});
1404 } 1522 }
1405 } 1523 }
1406} 1524}
1407 1525
1408sub conn::item_update { 1526sub conn::item_update {
1409 my ($self, $item) = @_; 1527 my ($self, $item) = @_;
1410 1528
1411 update_floorbox if $item->{container} == 0; 1529 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1412 if ($self->{player}{tag} == $item->{container}) { 1530
1531 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1532 $OPENCONT = 0;
1533 $INVR_LBL->set_text ("Floor");
1534 $INVR->set_items ($self->{container}{0});
1535
1536 $item->{widget}->update_item
1537 if $item->{widget};
1538 } else {
1539 if ($item->{container} == 0) {
1540 update_floorbox;
1541 $OPENCONT = 0;
1542 $INVR_LBL->set_text ("Floor");
1543 $INVR->set_items ($self->{container}{0});
1544 } elsif ($item->{container} == $self->{player}{tag}) {
1413 $INV->set_items ($self->{container}{$item->{container}}); 1545 $INV->set_items ($self->{container}{$item->{container}})
1546 }
1414 } 1547 }
1415} 1548}
1416 1549
1417%SDL_CB = ( 1550%SDL_CB = (
1418 CFClient::SDL_QUIT => sub { 1551 CFClient::SDL_QUIT => sub {
1419 Event::unloop -1; 1552 Event::unloop -1;
1420 }, 1553 },
1421 CFClient::SDL_VIDEORESIZE => sub { 1554 CFClient::SDL_VIDEORESIZE => sub {
1422 }, 1555 },
1423 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1556 CFClient::SDL_VIDEOEXPOSE => sub {
1557 $WANT_REFRESH++;
1558 },
1424 CFClient::SDL_ACTIVEEVENT => sub { 1559 CFClient::SDL_ACTIVEEVENT => sub {
1425# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1560# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1426 }, 1561 },
1427 CFClient::SDL_KEYDOWN => sub { 1562 CFClient::SDL_KEYDOWN => sub {
1428 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1563 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1449 1584
1450############################################################################# 1585#############################################################################
1451 1586
1452$SIG{INT} = $SIG{TERM} = sub { exit }; 1587$SIG{INT} = $SIG{TERM} = sub { exit };
1453 1588
1454CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1455
1456$TILECACHE = CFClient::db_table "tilecache";
1457$FACEMAP = CFClient::db_table "facemap";
1458
1459my %DEF_CFG = (
1460 sdl_mode => 0,
1461 width => 640,
1462 height => 480,
1463 fullscreen => 0,
1464 fast => 0,
1465 map_scale => 0.5,
1466 fow_enable => 1,
1467 fow_intensity => 0.45,
1468 fow_smooth => 0,
1469 gui_fontsize => 1,
1470 log_fontsize => 1,
1471 gauge_fontsize => 1,
1472 gauge_size => 0.35,
1473 stat_fontsize => 1,
1474 mapsize => 100,
1475 host => "crossfire.schmorp.de",
1476 say_command => 'say',
1477 audio_enable => 1,
1478 bgm_enable => 1,
1479 bgm_volume => 0.25,
1480);
1481
1482while (my ($k, $v) = each %DEF_CFG) {
1483 $CFG->{$k} = $v unless exists $CFG->{$k};
1484}
1485
1486sdl_init;
1487
1488@SDL_MODES = reverse
1489 grep $_->[0] >= 640 && $_->[1] >= 480,
1490 CFClient::SDL_ListModes;
1491
1492@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1493
1494$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1495
1496{ 1589{
1590 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1591
1592 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1593
1594 $TILECACHE = CFClient::db_table "tilecache";
1595 $FACEMAP = CFClient::db_table "facemap";
1596
1597 my %DEF_CFG = (
1598 sdl_mode => 0,
1599 width => 640,
1600 height => 480,
1601 fullscreen => 0,
1602 fast => 0,
1603 map_scale => 0.5,
1604 fow_enable => 1,
1605 fow_intensity => 0.45,
1606 fow_smooth => 0,
1607 gui_fontsize => 1,
1608 log_fontsize => 1,
1609 gauge_fontsize=> 1,
1610 gauge_size => 0.35,
1611 stat_fontsize => 1,
1612 mapsize => 100,
1613 host => "crossfire.schmorp.de",
1614 say_command => 'say',
1615 audio_enable => 1,
1616 bgm_enable => 1,
1617 bgm_volume => 0.25,
1618 );
1619
1620 while (my ($k, $v) = each %DEF_CFG) {
1621 $CFG->{$k} = $v unless exists $CFG->{$k};
1622 }
1623
1624 sdl_init;
1625
1626 @SDL_MODES = reverse
1627 grep $_->[0] >= 640 && $_->[1] >= 480,
1628 CFClient::SDL_ListModes;
1629
1630 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1631
1632 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1633
1634 {
1497 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1635 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1498 DejaVuSans.ttf 1636 DejaVuSans.ttf
1499 DejaVuSansMono.ttf 1637 DejaVuSansMono.ttf
1500 DejaVuSans-Bold.ttf 1638 DejaVuSans-Bold.ttf
1501 DejaVuSansMono-Bold.ttf 1639 DejaVuSansMono-Bold.ttf
1502 DejaVuSans-Oblique.ttf 1640 DejaVuSans-Oblique.ttf
1503 DejaVuSansMono-Oblique.ttf 1641 DejaVuSansMono-Oblique.ttf
1504 DejaVuSans-BoldOblique.ttf 1642 DejaVuSans-BoldOblique.ttf
1505 DejaVuSansMono-BoldOblique.ttf 1643 DejaVuSansMono-BoldOblique.ttf
1506 ); 1644 );
1507 1645
1508 CFClient::add_font $_ for @fonts; 1646 CFClient::add_font $_ for @fonts;
1509 1647
1648 CFClient::pango_init;
1649
1510 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1650 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1511 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1651 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1512 1652
1513 $FONT_PROP->make_default; 1653 $FONT_PROP->make_default;
1514} 1654 }
1515 1655
1656# compare mono (ft) vs. rgba (cairo)
1657# ft - 1.8s, cairo 3s, even in alpha-only mode
1658# for my $rgba (0..1) {
1659# my $t1 = Time::HiRes::time;
1660# for (1..1000) {
1661# my $layout = CFClient::Layout->new ($rgba);
1662# $layout->set_text ("hallo" x 100);
1663# $layout->render;
1664# }
1665# my $t2 = Time::HiRes::time;
1666# warn $t2-$t1;
1667# }
1668
1516video_init; 1669 video_init;
1517audio_init; 1670 audio_init;
1671}
1518 1672
1519Event::loop; 1673Event::loop;
1520 1674
1521END { CFClient::SDL_Quit } 1675END { CFClient::SDL_Quit }
1522 1676

Diff Legend

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