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.192 by root, Fri Apr 28 18:06:13 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;
… …
76our $MAPWIDGET; 81our $MAPWIDGET;
77our $BUTTONBAR; 82our $BUTTONBAR;
78our $LOGVIEW; 83our $LOGVIEW;
79our $CONSOLE; 84our $CONSOLE;
80our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON;
81 87
82our $FLOORBOX; 88our $FLOORBOX;
83our $GAUGES; 89our $GAUGES;
84our $STATWIDS; 90our $STATWIDS;
85 91
… …
89our $SDL_MIXER; 95our $SDL_MIXER;
90our @SOUNDS; # event => file mapping 96our @SOUNDS; # event => file mapping
91our %AUDIO_CHUNKS; # audio files 97our %AUDIO_CHUNKS; # audio files
92 98
93our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
94our $STATUS_LINE; 100our $STATUSBOX;
95our $DEBUG_STATUS; 101our $DEBUG_STATUS;
96 102
97our $INVWIN; 103our $INVWIN;
98our $INV; 104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
99 108
100sub status { 109sub status {
101 $STATUS_LINE->set_text ($_[0]); 110 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
102 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
103} 111}
104 112
105sub debug { 113sub debug {
106 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
107 $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);
108} 117}
109 118
110sub start_game { 119sub start_game {
111 status "logging in..."; 120 status "logging in...";
112 121
113 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 122 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
114 123
115 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
116
117 $MAP = new CFClient::Map $mapsize, $mapsize; 125 $MAP = new CFClient::Map $mapsize, $mapsize;
118 126
119 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
120 128
121 $CONN = new conn 129 $CONN = eval {
130 new conn
122 host => $host, 131 host => $host,
123 port => $port || 13327, 132 port => $port || 13327,
124 user => $CFG->{user}, 133 user => $CFG->{user},
125 pass => $CFG->{password}, 134 pass => $CFG->{password},
126 mapw => $mapsize, 135 mapw => $mapsize,
127 maph => $mapsize, 136 maph => $mapsize,
137 ;
128 ; 138 };
129 139
130 status "login successful"; 140 if ($CONN) {
131
132 CFClient::lowdelay fileno $CONN->{fh}; 141 CFClient::lowdelay fileno $CONN->{fh};
142
143 $LOGIN_BUTTON->set_text ("Logout");
144 status "login successful";
145
146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
149 } else {
150 status "unable to connect";
151 stop_game();
152 }
133} 153}
134 154
135sub stop_game { 155sub stop_game {
156 return unless $CONN;
157
158 status "connection closed";
159 $LOGIN_BUTTON->set_text ("Login");
160 $CONN->destroy;
161 $CONN = 0; # false, does not autovivify
162
163 $BUTTONBAR->{children}[1]->emit ("activate")
164 unless $BUTTONBAR->{children}[1]->{state};
165
166 undef $MAPCACHE;
136 undef $CONN; 167 undef $MAP;
137} 168}
138 169
139sub client_setup { 170sub client_setup {
140 my $dialog = new CFClient::UI::FancyFrame 171 my $dialog = new CFClient::UI::FancyFrame
141 title => "Client Setup", 172 title => "Client Setup",
… …
143 $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]);
144 175
145 $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");
146 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
147 178
148 $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]);
149 $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");
150 181
151 $mode_slider->connect (changed => sub { 182 $mode_slider->connect (changed => sub {
152 my ($self, $value) = @_; 183 my ($self, $value) = @_;
153 184
… …
178 } 209 }
179 ); 210 );
180 211
181 $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");
182 $table->add (1, $row++, new CFClient::UI::Slider 213 $table->add (1, $row++, new CFClient::UI::Slider
183 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 214 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
184 tooltip => "Enlarge or shrink the displayed map", 215 tooltip => "Enlarge or shrink the displayed map",
185 connect_changed => sub { 216 connect_changed => sub {
186 my ($self, $value) = @_; 217 my ($self, $value) = @_;
187 $CFG->{map_scale} = 0.05 * int $value / 0.05; 218 $CFG->{map_scale} = $value;
188 } 219 }
189 ); 220 );
190 221
191 $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");
192 $table->add (1, $row++, new CFClient::UI::CheckBox 223 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
219 } 250 }
220 ); 251 );
221 252
222 $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");
223 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
224 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
225 tooltip => "The font size used by most GUI elements", 256 tooltip => "The font size used by most GUI elements",
226 connect_changed => sub { 257 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
227 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
228# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
229 }
230 ); 258 );
231 259
232 $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");
233 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
234 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
235 tooltip => "The font size used by the server log window only", 263 tooltip => "The font size used by the server log window only",
236 connect_changed => sub { 264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
237 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
238 }
239 ); 265 );
240 266
241 $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");
242 268
243 $table->add (1, $row++, new CFClient::UI::Slider 269 $table->add (1, $row++, new CFClient::UI::Slider
244 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
245 tooltip => "The font size used by the statistics window only", 271 tooltip => "The font size used by the statistics window only",
246 connect_changed => sub { 272 connect_changed => sub {
247 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 273 $CFG->{stat_fontsize} = $_[1];
248 &set_stats_window_fontsize; 274 &set_stats_window_fontsize;
249 } 275 }
250 ); 276 );
251 277
252 $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");
253 $table->add (1, $row++, new CFClient::UI::Slider 279 $table->add (1, $row++, new CFClient::UI::Slider
254 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 280 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
255 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",
256 connect_changed => sub { 282 connect_changed => sub {
257 $CFG->{gauge_size} = $_[1]; 283 $CFG->{gauge_size} = $_[1];
258 my $h = int $HEIGHT * $CFG->{gauge_size}; 284 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
259 $GAUGES->{win}->set_size ($WIDTH, $h);
260 $GAUGES->{win}->move (0, $HEIGHT - $h);
261 } 285 }
262 ); 286 );
263 287
264 $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");
265 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 290 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
267 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 291 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
268 connect_changed => sub { 292 connect_changed => sub {
269 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 293 $CFG->{gauge_fontsize} = $_[1];
270 &set_gauge_window_fontsize; 294 &set_gauge_window_fontsize;
271 } 295 }
272 ); 296 );
273 297
274 $table->add (1, $row++, new CFClient::UI::Button 298 $table->add (1, $row++, new CFClient::UI::Button
… …
348# local $GAUGES->{win}{parent};#d# 372# local $GAUGES->{win}{parent};#d#
349# 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;
350} 374}
351 375
352sub make_gauge_window { 376sub make_gauge_window {
353 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 377 my $gh = int $HEIGHT * $CFG->{gauge_size};
354# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
355 378
356 my $win = new CFClient::UI::Frame ( 379 my $win = new CFClient::UI::Frame (
357 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 380 req_y => -1,
381 user_w => $WIDTH,
382 user_h => $gh,
358 ); 383 );
384
359 $win->add (my $hbox = new CFClient::UI::HBox 385 $win->add (my $hbox = new CFClient::UI::HBox
360 children => [ 386 children => [
361 (new CFClient::UI::HBox expand => 1), 387 (new CFClient::UI::HBox expand => 1),
362 ($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 ]),
363 (my $vbox = new CFClient::UI::VBox), 392 (my $vbox = new CFClient::UI::VBox),
364 ], 393 ],
365 ); 394 );
366 395
367 $vbox->add (new CFClient::UI::HBox 396 $vbox->add (new CFClient::UI::HBox
… …
565 594
566} 595}
567 596
568sub metaserver_dialog { 597sub metaserver_dialog {
569 my $dialog = new CFClient::UI::FancyFrame 598 my $dialog = new CFClient::UI::FancyFrame
570 title => "Metaserver", 599 title => "Server List",
571 child => (my $vbox = new CFClient::UI::VBox); 600 child => (my $vbox = new CFClient::UI::VBox);
572 601
573 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 602 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
574 603
575 $dialog 604 $dialog
… …
644 $HOST->set_text ($CFG->{host} = $host); 673 $HOST->set_text ($CFG->{host} = $host);
645 }), 674 }),
646 (new CFClient::UI::Empty expand => 1), 675 (new CFClient::UI::Empty expand => 1),
647 ]); 676 ]);
648 677
649 $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)
650 for 0 .. $#$m; 680 for 0 .. $#$m;
651 } 681 }
652 } 682 }
653 }); 683 });
654} 684}
… …
677 707
678 $METASERVER = metaserver_dialog; 708 $METASERVER = metaserver_dialog;
679 709
680 $vbox->add (new CFClient::UI::Flopper 710 $vbox->add (new CFClient::UI::Flopper
681 expand => 1, 711 expand => 1,
682 text => "Metaserver", 712 text => "Server List",
683 other => $METASERVER, 713 other => $METASERVER,
684 tooltip => "Show a list of avaible crossfire servers", 714 tooltip => "Show a list of available crossfire servers",
685 connect_open => sub { 715 connect_open => sub {
686 update_metaserver $HOST; 716 update_metaserver $HOST;
687 } 717 }
688 ); 718 );
689 } 719 }
… …
710 ); 740 );
711 741
712 $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");
713 $table->add (1, 7, new CFClient::UI::Slider 743 $table->add (1, 7, new CFClient::UI::Slider
714 req_w => 100, 744 req_w => 100,
715 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 745 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
716 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. "
717 ."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.",
718 connect_changed => sub { 748 connect_changed => sub {
719 my ($self, $value) = @_; 749 my ($self, $value) = @_;
720 750
721 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 751 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
722 }, 752 },
723 ); 753 );
724 754
725 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 755 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
756 expand => 1,
757 align => 0,
758 text => "Login",
759 connect_activate => sub {
760 $CONN ? stop_game
726 start_game; 761 : start_game;
762 },
727 }); 763 );
728 764
729 $dialog 765 $dialog
730} 766}
731 767
732sub message_window { 768sub message_window {
… …
782 818
783 $window 819 $window
784} 820}
785 821
786sub make_inventory_window { 822sub make_inventory_window {
787 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
788 $invwin->add (my $hb = new CFClient::UI::HBox); 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");
789 $hb->add ($INV = new CFClient::UI::Inventory expand => 1); 831 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
832
790 $hb->add (my $rng = new CFClient::UI::Slider vertical => 1); 833 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
791 $INV->set_range ($rng); 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
792 $invwin 838 $invwin
793} 839}
794 840
795sub sdl_init { 841sub sdl_init {
796 CFClient::SDL_Init 842 CFClient::SDL_Init
… …
798} 844}
799 845
800sub video_init { 846sub video_init {
801 sdl_init; 847 sdl_init;
802 848
849 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
850
803 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 851 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
804 $FULLSCREEN = $CFG->{fullscreen}; 852 $FULLSCREEN = $CFG->{fullscreen};
805 $FAST = $CFG->{fast}; 853 $FAST = $CFG->{fast};
806 854
807 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 855 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
808 or die "SDL_SetVideoMode failed!\n"; 856 or die "SDL_SetVideoMode failed!\n";
809 857
810 $SDL_ACTIVE = 1; 858 $SDL_ACTIVE = 1;
811
812 $LAST_REFRESH = time - 0.01; 859 $LAST_REFRESH = time - 0.01;
813 860
814 CFClient::gl_init; 861 CFClient::gl_init;
815 862
816 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 863 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
817 864
865 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
866
818 ############################################################################# 867 #############################################################################
819 868
869 unless ($DEBUG_STATUS) {
870 # create the widgets
871
820 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 872 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
821 $DEBUG_STATUS->show; 873 $DEBUG_STATUS->show;
822 874
823 $STATUS_LINE = new CFClient::UI::Label 875 $STATUSBOX = new CFClient::UI::Statusbox;
824 padding => 0, 876 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
825 y => $HEIGHT - $FONTSIZE * 1.8;
826 $STATUS_LINE->show;
827 877
828 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 878 (new CFClient::UI::Frame
829 padding => 0, 879 bg => [0, 0, 0, 0.4],
830 fontsize => 0.8, 880 req_y => -1,
831 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 881 child => $STATUSBOX,
832 $ALT_ENTER_MESSAGE->show; 882 )->show;
833 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
834 883
835 CFClient::UI::FancyFrame->new ( 884 CFClient::UI::FancyFrame->new (
836 border_bg => [1, 1, 1, 192/255], 885 border_bg => [1, 1, 1, 192/255],
837 bg => [1, 1, 1, 0], 886 bg => [1, 1, 1, 0],
838 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 887 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
839 )->show; 888 )->show;
840 889
841 $MAPWIDGET = new CFClient::MapWidget; 890 $MAPWIDGET = new CFClient::MapWidget;
842 $MAPWIDGET->connect (activate_console => sub { 891 $MAPWIDGET->connect (activate_console => sub {
843 my ($mapwidget, $preset) = @_; 892 my ($mapwidget, $preset) = @_;
844 893
845 if ($CONSOLE) { 894 if ($CONSOLE) {
846 $CONSOLE->{input}->{auto_activated} = 1; 895 $CONSOLE->{input}->{auto_activated} = 1;
847 $CONSOLE->{input}->focus_in; 896 $CONSOLE->{input}->focus_in;
848 897
849 if ($preset && $CONSOLE->{input}->get_text eq '') { 898 if ($preset && $CONSOLE->{input}->get_text eq '') {
850 $CONSOLE->{input}->set_text ($preset); 899 $CONSOLE->{input}->set_text ($preset);
900 }
851 } 901 }
852 } 902 });
853 });
854 $MAPWIDGET->show; 903 $MAPWIDGET->show;
855 $MAPWIDGET->focus_in; 904 $MAPWIDGET->focus_in;
856 905
857 $BUTTONBAR = new CFClient::UI::HBox; 906 $BUTTONBAR = new CFClient::UI::HBox;
858 907
859 $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);
860 $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);
861 $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);
862 911
863 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
864 913
865 $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);
866 $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);
867 916
868 $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 {
869 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 918 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
870 status "Configuration Saved"; 919 status "Configuration Saved";
871 }); 920 });
872 921
873 $BUTTONBAR->show; 922 $BUTTONBAR->show;
874 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 {
875 $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 }
876} 934}
877 935
878sub video_shutdown { 936sub video_shutdown {
879 $CFClient::UI::ROOT->{children} = [];
880 undef $CFClient::UI::GRAB;
881 undef $CFClient::UI::HOVER;
882 undef $SDL_ACTIVE; 937 undef $SDL_ACTIVE;
883} 938}
884 939
885my @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#
886my $bgmusic;#TODO#hack#d# 941my $bgmusic;#TODO#hack#d#
942
943sub audio_channel_finished {
944 my ($channel) = @_;
945
946 warn "channel $channel finished\n";#d#
947}
887 948
888sub audio_music_finished { 949sub audio_music_finished {
889 return unless $CFG->{bgm_enable}; 950 return unless $CFG->{bgm_enable};
890 951
891 # TODO: hack, do play loop and mood music 952 # TODO: hack, do play loop and mood music
… …
895 push @bgmusic, shift @bgmusic; 956 push @bgmusic, shift @bgmusic;
896} 957}
897 958
898sub audio_init { 959sub audio_init {
899 if ($CFG->{audio_enable}) { 960 if ($CFG->{audio_enable}) {
900 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 961 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
901 $SDL_MIXER = !CFClient::Mix_OpenAudio; 962 $SDL_MIXER = !CFClient::Mix_OpenAudio;
902 CFClient::Mix_AllocateChannels 8; 963 CFClient::Mix_AllocateChannels 8;
903 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 964 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
904 965
905 audio_music_finished; 966 audio_music_finished;
… …
932} 993}
933 994
934my %animate_object; 995my %animate_object;
935my $animate_timer; 996my $animate_timer;
936 997
937my $want_refresh;
938my $can_refresh;
939
940my $fps = 9; 998my $fps = 9;
941 999
942sub force_refresh { 1000sub force_refresh {
943 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1001 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
944 debug sprintf "%3.2f", $fps; 1002 debug sprintf "%3.2f", $fps;
945 1003
946 $want_refresh = 0;
947 $can_refresh = 0;
948
949 $CFClient::UI::ROOT->draw; 1004 $CFClient::UI::ROOT->draw;
950
951 CFClient::SDL_GL_SwapBuffers; 1005 CFClient::SDL_GL_SwapBuffers;
952 1006
1007 $WANT_REFRESH = 0;
1008 $CAN_REFRESH = 0;
953 $LAST_REFRESH = $NOW; 1009 $LAST_REFRESH = $NOW;
954} 1010}
955 1011
956my $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 {
957 $NOW = time; 1013 $NOW = time;
… …
959 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1015 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
960 for CFClient::SDL_PollEvent; 1016 for CFClient::SDL_PollEvent;
961 1017
962 if (%animate_object) { 1018 if (%animate_object) {
963 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1019 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
964 $want_refresh++; 1020 $WANT_REFRESH++;
965 } 1021 }
966 1022
967 if ($want_refresh) { 1023 if ($WANT_REFRESH) {
968 force_refresh; 1024 force_refresh;
969 } else { 1025 } else {
970 $can_refresh = 1; 1026 $CAN_REFRESH = 1;
971 } 1027 }
972}); 1028});
973
974sub refresh {
975 $want_refresh++;
976}
977 1029
978sub animation_start { 1030sub animation_start {
979 my ($widget) = @_; 1031 my ($widget) = @_;
980 $animate_object{$widget} = $widget; 1032 $animate_object{$widget} = $widget;
981} 1033}
… …
987 1039
988@conn::ISA = Crossfire::Protocol::; 1040@conn::ISA = Crossfire::Protocol::;
989 1041
990sub conn::stats_update { 1042sub conn::stats_update {
991 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 }
992 1051
993 update_stats_window ($stats); 1052 update_stats_window ($stats);
994} 1053}
995 1054
996sub conn::user_send { 1055sub conn::user_send {
… …
1293 [0.55, 0.41, 0.13], 1352 [0.55, 0.41, 0.13],
1294 [0.99, 0.77, 0.26], 1353 [0.99, 0.77, 0.26],
1295 [0.74, 0.65, 0.41], 1354 [0.74, 0.65, 0.41],
1296 ); 1355 );
1297 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
1298 $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);
1299} 1378}
1300 1379
1301sub conn::spell_add { 1380sub conn::spell_add {
1302 my ($self, $spell) = @_; 1381 my ($self, $spell) = @_;
1303 1382
1304 # TODO 1383 # TODO
1305 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1384 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1306 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1385 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1307 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1386 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1308} 1387}
1309 1388
1310sub conn::spell_delete { 1389sub conn::spell_delete {
1311 my ($self, $spell) = @_; 1390 my ($self, $spell) = @_;
1312} 1391}
1313 1392
1314sub conn::addme_success { 1393sub conn::addme_success {
1315 my ($self) = @_; 1394 my ($self) = @_;
1316 1395
1396 $MAPWIDGET->clr_commands;
1397
1317 for my $skill (values %{$self->{skill_info}}) { 1398 for my $skill (values %{$self->{skill_info}}) {
1318 $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'");
1319 $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'");
1320 } 1401 }
1402
1403 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
1404 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
1405 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
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 }
1430}
1431
1432sub conn::eof {
1433 $MAPWIDGET->clr_commands;
1434
1435 stop_game;
1321} 1436}
1322 1437
1323sub update_floorbox { 1438sub update_floorbox {
1324 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1439 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1440 return unless $CONN;
1441
1325 $FLOORBOX->clear; 1442 $FLOORBOX->clear;
1326 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1443 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1327 1444
1328 my @items = values %{ $CONN->{container}{0} }; 1445 my $count = 4;
1329 1446 for (@{ $CONN->{container}{0} }) {
1330 # we basically have to use the same sorting as everybody else 1447 if (--$count) {
1331 @items = sort { $a->{type} <=> $b->{type} } @items; 1448 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1332 1449 } else {
1333 for my $item (reverse @items) { 1450 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1334 my $desc = $item->{nrof} < 2
1335 ? $item->{name}
1336 : "$item->{nrof} $item->{name_pl}";
1337 # todo: animation widget, face widget, weight(?) etc.
1338 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1339 tooltip => (CFClient::UI::Label->escape ($desc)
1340 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1341 can_hover => 1,
1342 can_events => 1,
1343 connect_button_down => sub {
1344 my ($self, $ev, $x, $y) = @_;
1345
1346 # todo: maybe put examine on 1? but should just be a tooltip :(
1347 if ($ev->{button} == 1) {
1348 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1349 } elsif ($ev->{button} == 2) {
1350 $CONN->send ("apply $item->{tag}");
1351 } elsif ($ev->{button} == 3) {
1352 CFClient::UI::Menu->new (
1353 items => [
1354 ["examine", sub { $CONN->send ("examine $item->{tag}") }],
1355 [
1356 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
1357 sub { $CONN->send ("lock $item->{tag}") },
1358 ],
1359 ["mark", sub { $CONN->send ("mark $item->{tag}") }],
1360 ["apply", sub { $CONN->send ("apply $item->{tag}") }],
1361 ],
1362 )->popup ($ev);
1363 }
1364
1365 1
1366 }, 1451 last;
1367 );
1368
1369 $hbox->add (new CFClient::UI::Face
1370 can_events => 0,
1371 face => $item->{face},
1372 anim => $item->{anim},
1373 animspeed => $item->{animspeed},
1374 );
1375 1452 }
1376 $hbox->add (new CFClient::UI::Label
1377 can_events => 0,
1378 text => $desc,
1379 );
1380 } 1453 }
1381 }); 1454 });
1382 refresh; 1455
1456 $WANT_REFRESH++;
1383} 1457}
1384 1458
1385sub conn::container_add { 1459sub conn::container_add {
1386 my ($self, $id, $items) = @_; 1460 my ($self, $tag, $items) = @_;
1387 1461
1388 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});
1389 if ($self->{player}{tag} == $id) { 1469 } elsif ($tag == $self->{player}{tag}) {
1470 $INVR_LBL->set_text ("Player");
1390 $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});
1391 } 1476 }
1477
1392 # $self-<{player}{tag} => player inv 1478 # $self-<{player}{tag} => player inv
1393 #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}};
1394} 1480}
1395 1481
1396sub conn::container_clear { 1482sub conn::container_clear {
1397 my ($self, $id) = @_; 1483 my ($self, $tag) = @_;
1398 1484
1399 update_floorbox if $id == 0; 1485 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1400 if ($self->{player}{tag} == $id) { 1486
1487 if ($tag == 0) {
1488 update_floorbox;
1489 $OPENCONT = 0;
1490 $INVR_LBL->set_text ("Floor");
1401 $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});
1402 } 1499 }
1403 1500
1404# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1501# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1405} 1502}
1406 1503
1407sub conn::item_delete { 1504sub conn::item_delete {
1408 my ($self, @items) = @_; 1505 my ($self, @items) = @_;
1409 1506
1410 for (@items) { 1507 for (@items) {
1411 update_floorbox if $_->{container} == 0; 1508 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1412 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}));
1413 $INV->set_items ($self->{container}{$_->{container}}); 1521 $INVR->set_items ($self->{container}{$_->{container}});
1414 } 1522 }
1415 } 1523 }
1416} 1524}
1417 1525
1418sub conn::item_update { 1526sub conn::item_update {
1419 my ($self, $item) = @_; 1527 my ($self, $item) = @_;
1420 1528
1421 update_floorbox if $item->{container} == 0; 1529 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1422 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}) {
1423 $INV->set_items ($self->{container}{$item->{container}}); 1545 $INV->set_items ($self->{container}{$item->{container}})
1546 }
1424 } 1547 }
1425} 1548}
1426 1549
1427%SDL_CB = ( 1550%SDL_CB = (
1428 CFClient::SDL_QUIT => sub { 1551 CFClient::SDL_QUIT => sub {
1429 Event::unloop -1; 1552 Event::unloop -1;
1430 }, 1553 },
1431 CFClient::SDL_VIDEORESIZE => sub { 1554 CFClient::SDL_VIDEORESIZE => sub {
1432 }, 1555 },
1433 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1556 CFClient::SDL_VIDEOEXPOSE => sub {
1557 $WANT_REFRESH++;
1558 },
1434 CFClient::SDL_ACTIVEEVENT => sub { 1559 CFClient::SDL_ACTIVEEVENT => sub {
1435# 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#
1436 }, 1561 },
1437 CFClient::SDL_KEYDOWN => sub { 1562 CFClient::SDL_KEYDOWN => sub {
1438 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1563 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1442 video_init; 1567 video_init;
1443 } else { 1568 } else {
1444 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1569 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1445 } 1570 }
1446 }, 1571 },
1447 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1572 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1448 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1573 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1449 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1574 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1450 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1575 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1451 CFClient::SDL_USEREVENT => \&audio_music_finished, 1576 CFClient::SDL_USEREVENT => sub {
1577 if ($_[0]{code} == 1) {
1578 audio_channel_finished $_[0]{data1};
1579 } elsif ($_[0]{code} == 0) {
1580 audio_music_finished;
1581 }
1582 },
1452); 1583);
1453 1584
1454############################################################################# 1585#############################################################################
1455 1586
1456$SIG{INT} = $SIG{TERM} = sub { exit }; 1587$SIG{INT} = $SIG{TERM} = sub { exit };
1457 1588
1458$TILECACHE = CFClient::db_table "tilecache";
1459$FACEMAP = CFClient::db_table "facemap";
1460
1461CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1462
1463my %DEF_CFG = (
1464 sdl_mode => 0,
1465 width => 640,
1466 height => 480,
1467 fullscreen => 0,
1468 fast => 0,
1469 map_scale => 0.5,
1470 fow_enable => 1,
1471 fow_intensity => 0.45,
1472 fow_smooth => 0,
1473 gui_fontsize => 1,
1474 log_fontsize => 1,
1475 gauge_fontsize => 1,
1476 gauge_size => 0.35,
1477 stat_fontsize => 1,
1478 mapsize => 100,
1479 host => "crossfire.schmorp.de",
1480 say_command => 'say',
1481 audio_enable => 1,
1482 bgm_enable => 1,
1483 bgm_volume => 0.25,
1484);
1485
1486while (my ($k, $v) = each %DEF_CFG) {
1487 $CFG->{$k} = $v unless exists $CFG->{$k};
1488}
1489
1490sdl_init;
1491
1492@SDL_MODES = reverse
1493 grep $_->[0] >= 640 && $_->[1] >= 480,
1494 CFClient::SDL_ListModes;
1495
1496@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1497
1498$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1499
1500{ 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 {
1501 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1635 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1502 DejaVuSans.ttf 1636 DejaVuSans.ttf
1503 DejaVuSansMono.ttf 1637 DejaVuSansMono.ttf
1504 DejaVuSans-Bold.ttf 1638 DejaVuSans-Bold.ttf
1505 DejaVuSansMono-Bold.ttf 1639 DejaVuSansMono-Bold.ttf
1506 DejaVuSans-Oblique.ttf 1640 DejaVuSans-Oblique.ttf
1507 DejaVuSansMono-Oblique.ttf 1641 DejaVuSansMono-Oblique.ttf
1508 DejaVuSans-BoldOblique.ttf 1642 DejaVuSans-BoldOblique.ttf
1509 DejaVuSansMono-BoldOblique.ttf 1643 DejaVuSansMono-BoldOblique.ttf
1510 ); 1644 );
1511 1645
1512 CFClient::add_font $_ for @fonts; 1646 CFClient::add_font $_ for @fonts;
1513 1647
1648 CFClient::pango_init;
1649
1514 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1650 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1515 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1651 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1516 1652
1517 $FONT_PROP->make_default; 1653 $FONT_PROP->make_default;
1518} 1654 }
1519 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
1520video_init; 1669 video_init;
1521audio_init; 1670 audio_init;
1671}
1522 1672
1523Event::loop; 1673Event::loop;
1524 1674
1525END { CFClient::SDL_Quit } 1675END { CFClient::SDL_Quit }
1526 1676

Diff Legend

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