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.83 by root, Wed Apr 12 15:35:55 2006 UTC vs.
Revision 1.138 by elmex, Tue Apr 18 21:37:48 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use Glib; 6use Time::HiRes 'time';
7use Gtk2 -init; 7use Event;
8 8
9use SDL; 9use SDL;
10use SDL::App; 10use SDL::App;
11use SDL::Event; 11use SDL::Event;
12use SDL::Surface; 12use SDL::Surface;
13
14use SDL::Mixer;
15use SDL::Sound;
16use SDL::Music;
17
13use SDL::OpenGL; 18use SDL::OpenGL;
14use SDL::OpenGL::Constants;
15 19
16use Crossfire; 20use Crossfire;
17use Crossfire::Protocol; 21use Crossfire::Protocol;
18 22
23use Compress::LZF;
24
19use CFClient; 25use CFClient;
20use CFClient::UI; 26use CFClient::UI;
21 27
22our $VERSION = '0.1'; 28our $VERSION = '0.1';
23 29
24my $MAX_FPS = 60; 30my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame 31my $MIN_FPS = 5; # unused as of yet
26 32
33our $META_SERVER = "crossfire.real-time.com:13326";
34
35our $FACEMAP;
36our $TILECACHE;
27our $FACECACHE; 37our $MAPCACHE;
38
39our $LAST_REFRESH;
40our $NOW;
28 41
29our $CFG; 42our $CFG;
30our $CONN; 43our $CONN;
31our $FAST; # fast, low-quality mode 44our $FAST; # fast, low-quality mode, possibly useful for software-rendering
32 45
33our @SDL_MODES; 46our @SDL_MODES;
34our $WIDTH; 47our $WIDTH;
35our $HEIGHT; 48our $HEIGHT;
36our $FULLSCREEN; 49our $FULLSCREEN;
50our $FONTSIZE;
37 51
38our $NOW; 52our $MAP;
39
40our $MAPWIDGET; 53our $MAPWIDGET;
41our $FONTSIZE; 54our $BUTTONBAR;
55our $LOGVIEW;
56our $CONSOLE;
57our $METASERVER;
42 58
59our $GAUGES;
60
43our $SDL_TIMER; 61our $SDL_ACTIVE;
44our $SDL_APP;
45our $SDL_EV; 62our $SDL_EV;
46our %SDL_CB; 63our %SDL_CB;
64
65our $SDL_MIXER;
66our @SOUNDS; # event => file mapping
67our %AUDIO_CHUNKS; # audio files
47 68
48our $ALT_ENTER_MESSAGE; 69our $ALT_ENTER_MESSAGE;
49our $STATUS_LINE; 70our $STATUS_LINE;
50our $DEBUG_STATUS; 71our $DEBUG_STATUS;
51 72
52my $last_refresh;
53my %ANIMATE;
54my $refresh_handler;
55
56sub status { 73sub status {
57 $STATUS_LINE->set_text ($_[0]); 74 $STATUS_LINE->set_text ($_[0]);
58 my ($w, $h) = $STATUS_LINE->size_request;
59 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 75 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
60} 76}
61 77
62sub debug { 78sub debug {
63 $DEBUG_STATUS->set_text ($_[0]); 79 $DEBUG_STATUS->set_text ($_[0]);
64 my ($w, $h) = $DEBUG_STATUS->size_request; 80 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
65 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
66} 81}
67 82
68sub config_dialog { 83sub start_game {
69 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100, 84 status "logging in...";
70 child => (my $vbox = new CFClient::UI::VBox);
71 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
72 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
73 85
74 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 86 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
75 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
76 87
77 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 88 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
78 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
79 89
80 $mode_slider->connect (changed => sub { 90 $MAP = new CFClient::Map $mapsize, $mapsize;
81 my ($self, $value) = @_;
82 91
83 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 92 my ($host, $port) = split /:/, $CFG->{host};
84 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
85 });
86 $mode_slider->emit (changed => $mode_slider->{range}[0]);
87
88 $table->add (1, 1, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
89 destroy_screen ();
90 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
91 $FULLSCREEN = $CFG->{fullscreen};
92 init_screen ();
93 });
94 93
95 $vbox->add (new CFClient::UI::Label align => 0, text => "Server");
96 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
98 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
99
100 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
101 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
102
103 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
104 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
105
106 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
107 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
108
109 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
110 $table->add (1, 6, new CFClient::UI::Slider
111 req_w => 100,
112 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
113 connect_changed => sub {
114 my ($self, $value) = @_;
115
116 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
117 },
118 );
119
120 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
121 warn "login\n";
122 });
123
124 $vbox->add (my $hbox = new CFClient::UI::HBox);
125
126 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
127 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
128 status "Configuration Saved";
129 });
130 $CFClient::UI::TOPLEVEL->add ($dialog);
131}
132
133sub init_screen {
134 $SDL_APP = new SDL::App
135 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
136 -title => "Crossfire+ Client",
137 -width => $WIDTH,
138 -height => $HEIGHT,
139 -opengl => 1,
140 -red_size => 5,
141 -green_size => 5,
142 -blue_size => 5,
143 -alpha_size => 0,
144 -double_buffer => 1,
145 -fullscreen => $FULLSCREEN,
146 -resizeable => 0;
147
148 $SDL_EV = new SDL::Event;
149 $SDL_EV->set_unicode (1);
150
151 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
152 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
153 while $SDL_EV->poll;
154
155 1
156 };
157
158 $last_refresh = SDL::GetTicks;
159
160 CFClient::gl_init;
161
162 $FONTSIZE = int $HEIGHT / 40;
163
164 #############################################################################
165
166 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
167 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
168
169 $STATUS_LINE = new CFClient::UI::Label
170 padding => 0,
171 y => $HEIGHT * 49 / 50 - $FONTSIZE;
172 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
173
174 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
175 padding => 0,
176 y => $HEIGHT * 49 / 50,
177 height => $HEIGHT / 50,
178 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
179 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
180
181 $MAPWIDGET = new CFClient::UI::MapWidget;
182 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
183 $MAPWIDGET->focus_in;
184
185 config_dialog;
186}
187
188sub destroy_screen {
189 $CFClient::UI::TOPLEVEL->{children} = [];
190 remove Glib::Source $SDL_TIMER;
191 undef $SDL_APP;
192 undef $SDL_EV;
193 SDL::Quit;
194}
195
196sub start_game {
197 $WIDTH = $CFG->{width};
198 $HEIGHT = $CFG->{height};
199 $FULLSCREEN = 0;
200
201 init_screen;
202
203 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
204
205 $CONN = new conn 94 $CONN = new conn
206 host => $CFG->{host}, 95 host => $host,
207 port => $CFG->{port}, 96 port => $port || 13327,
208 user => $CFG->{user}, 97 user => $CFG->{user},
209 pass => $CFG->{password}, 98 pass => $CFG->{password},
210 mapw => $mapsize, 99 mapw => $mapsize,
211 maph => $mapsize, 100 maph => $mapsize,
212 ; 101 ;
213 102
103 status "login successful";
104
214 CFClient::lowdelay fileno $CONN->{fh}; 105 CFClient::lowdelay fileno $CONN->{fh};
215} 106}
216 107
217sub stop_game { 108sub stop_game {
218 remove Glib::Source $refresh_handler if $refresh_handler;
219 undef $refresh_handler;
220
221 undef $CONN; 109 undef $CONN;
222 destroy_screen;
223} 110}
224 111
225sub force_refresh { 112sub client_setup {
226 glViewport 0, 0, $WIDTH, $HEIGHT; 113 my $dialog = new CFClient::UI::FancyFrame
114 child => (my $vbox = new CFClient::UI::VBox);
115 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
116 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
227 117
228 glMatrixMode GL_PROJECTION; 118 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
229 glLoadIdentity; 119 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
230 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
231 glMatrixMode GL_MODELVIEW;
232 glLoadIdentity;
233 120
234 glClear GL_COLOR_BUFFER_BIT; 121 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
122 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
235 123
236 $CFClient::UI::TOPLEVEL->draw; 124 $mode_slider->connect (changed => sub {
125 my ($self, $value) = @_;
237 126
238 SDL::GLSwapBuffers; 127 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
239} 128 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
129 });
130 $mode_slider->emit (changed => $mode_slider->{range}[0]);
240 131
241my $FPS; 132 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
133 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
134 my ($self, $value) = @_;
135 $CFG->{fullscreen} = $value;
136 });
242 137
243sub refresh { 138 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast &amp; Ugly");
244 $refresh_handler ||= add Glib::Idle sub { 139 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
245 if ($SDL_APP) { 140 my ($self, $value) = @_;
246 $NOW = SDL::GetTicks; 141 $CFG->{fast} = $value;
142 });
247 143
248 if ($NOW - $last_refresh < $TICKS_PER_FRAME) { 144 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
249 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh); 145 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
250 $NOW = SDL::GetTicks; 146 my ($self, $value) = @_;
147 $CFG->{fow_enable} = $value;
148 });
149
150 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
151 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
152 my ($self, $value) = @_;
153 $CFG->{fow_intensity} = $value;
154 });
155
156 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
157 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
158 my ($self, $value) = @_;
159 $CFG->{fow_smooth} = $value;
160 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
161 });
162
163 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
164 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
165 my ($self, $value) = @_;
166 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
167 });
168
169 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
170 video_shutdown ();
171 video_init ();
172 });
173
174 $table->add (0, 8, new CFClient::UI::Label align => 1, text => "Sound");
175 $table->add (1, 8, new CFClient::UI::CheckBox state => $CFG->{sound}, connect_changed => sub {
176 my ($self, $value) = @_;
177 $CFG->{sound} = $value;
178 });
179 $table->add (0, 9, new CFClient::UI::Label align => 1, text => "Bg. Music");
180 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{bg_music_enable}, connect_changed => sub {
181 my ($self, $value) = @_;
182 $CFG->{bg_music_enable} = $value;
183 });
184 $table->add (1, 10, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
185 audio_shutdown ();
186 audio_init ();
187 });
188
189 $dialog
190}
191
192sub metaserver_dialog {
193 my $dialog = new CFClient::UI::FancyFrame
194 child => (my $vbox = new CFClient::UI::VBox);
195
196 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
197
198 $dialog
199}
200
201sub update_metaserver {
202 my ($HOST) = @_;
203
204 status "fetching metaserver list...";
205
206 my $buf;
207
208 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
209
210 Event->io (fd => $fh, poll => 'r', cb => sub {
211 my $res = sysread $fh, $buf, 8192, length $buf;
212
213 if (!defined $res) {
214 $_[0]->w->cancel;
215 status "metaserver: $!";
216 } elsif ($res == 0) {
217 $_[0]->w->cancel;
218 status "server list retrieved";
219
220 my $table = $METASERVER->{table};
221
222 $table->clear;
223
224 my @col = qw(Use #Users Host Uptime Version Description);
225 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
226 for 0 .. $#col;
227
228 my @align = qw(1 0 1 1 -1);
229
230 my $y = 0;
231 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
232 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
233
234 for ($desc) {
235 s/<br>/\n/gi;
236 s/<li>/\n· /gi;
237 s/<.*?>//sgi;
238 s/&/&amp;/g;
239 s/</&lt;/g;
240 s/>/&gt;/g;
241 }
242
243 $uptime = sprintf "%dd %02d:%02d:%02d",
244 (int $m->[8] / 86400),
245 (int $m->[8] / 3600) % 24,
246 (int $m->[8] / 60) % 60,
247 $m->[8] % 60;
248
249 $m = [$users, $host, $uptime, $version, $desc];
250
251 $y++;
252
253 $table->add (0, $y, new CFClient::UI::VBox children => [
254 (new CFClient::UI::Button text => " ", connect_activate => sub {
255 $HOST->set_text ($CFG->{host} = $host);
256 }),
257 (new CFClient::UI::Empty expand => 1),
258 ]);
259
260 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
261 for 0 .. $#$m;
251 } 262 }
252 263 }
253 my $interval = ($NOW - $last_refresh) * 0.001; 264 });
254 $last_refresh = $NOW; 265}
255 266
256 if ($interval) { 267sub server_setup {
257 $FPS ||= 1 / $interval; 268 my $dialog = new CFClient::UI::FancyFrame
258 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1; 269 child => (my $vbox = new CFClient::UI::VBox);
259 debug sprintf "%5.02f", $FPS; 270
271 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
272 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
273 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
274
275 {
276 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
277
278 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
279 my ($self, $value) = @_;
280 $CFG->{host} = $value;
281 });
282
283 $METASERVER = metaserver_dialog;
284
285 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
286 update_metaserver $HOST;
287 });
288 }
289
290 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
291 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
292 my ($self, $value) = @_;
293 $CFG->{user} = $value;
294 });
295
296 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
297 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
298 my ($self, $value) = @_;
299 $CFG->{password} = $value;
300 });
301
302 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
303 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
304 my ($self, $value) = @_;
305 $CFG->{say_command} = $value;
306 });
307
308 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
309 $table->add (1, 7, new CFClient::UI::Slider
310 req_w => 100,
311 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
312 connect_changed => sub {
313 my ($self, $value) = @_;
314
315 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
316 },
317 );
318
319 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
320 start_game;
321 });
322
323 $dialog
324}
325
326sub message_window {
327 my $window = new CFClient::UI::FancyFrame
328 border_bg => [1, 1, 1, 0.5],
329 bg => [0.3, 0.3, 0.3, 0.8],
330 user_w => int $::WIDTH / 3,
331 user_h => int $::HEIGHT / 5,
332 child => (my $vbox = new CFClient::UI::VBox);
333
334 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
335 expand => 1,
336 fontsize => $::CFG->{log_fontsize},
337 );
338
339 $vbox->add (my $input = new CFClient::UI::Entry
340 connect_focus_in => sub {
341 my ($input, $prev_focus) = @_;
342
343 delete $input->{refocus_map};
344
345 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
346 $input->{refocus_map} = 1;
260 } 347 }
348 delete $input->{auto_activated};
349 },
350 connect_activate => sub {
351 my ($input, $text) = @_;
352 $input->set_text ('');
261 353
262 force_refresh; 354 if ($text =~ /^\/(.*)/) {
263 $_->animate ($interval) for grep $_, values %ANIMATE; 355 $::CONN->user_send ($1);
264
265 if (%ANIMATE) {
266 1
267 } else { 356 } else {
268 undef $refresh_handler; 357 my $say_cmd = $::CFG->{say_command} || 'say';
358 $::CONN->user_send ("$say_cmd $text");
359 }
360 if ($input->{refocus_map}) {
361 delete $input->{refocus_map};
362 $MAPWIDGET->focus_in
363 }
364 },
365 connect_escape => sub {
366 $MAPWIDGET->focus_in
367 },
368 );
369
370 $CONSOLE = {
371 window => $window,
372 input => $input
373 };
374
375 $window
376}
377
378sub sdl_init {
379 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
380 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
381 and die "SDL::Init failed!\n";
382}
383
384sub video_init {
385 sdl_init;
386
387 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
388 $FULLSCREEN = $CFG->{fullscreen};
389 $FAST = $CFG->{fast};
390
391 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
392 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
393 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
394 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
395
396 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
397 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
398 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
399 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
400
401 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
402 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
403 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
404
405 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
406 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
407 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
408 or die "SDL::SetVideoMode failed!\n";
409
410 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
411
412 $SDL_EV = new SDL::Event;
413 $SDL_EV->set_unicode (1);
414
415 $SDL_ACTIVE = 1;
416
417 $LAST_REFRESH = time - 0.01;
418
419 CFClient::gl_init;
420
421 $FONTSIZE = int $HEIGHT / 40;
422
423 #############################################################################
424
425 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
426 $CFClient::UI::ROOT->add ($DEBUG_STATUS);
427
428 $STATUS_LINE = new CFClient::UI::Label
429 padding => 0,
430 y => $HEIGHT * 44 / 45 - $FONTSIZE;
431 $CFClient::UI::ROOT->add ($STATUS_LINE);
432
433 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
434 padding => 0,
435 y => $HEIGHT * 44 / 45,
436 fontsize => $HEIGHT / 45,
437 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
438 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
439
440 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
441 $MAPWIDGET->focus_in;
442 $MAPWIDGET->connect (activate_console => sub {
443 my ($mapwidget, $preset) = @_;
444
445 if ($CONSOLE) {
446 $CONSOLE->{input}->{auto_activated} = 1;
447 $CONSOLE->{input}->focus_in;
448
449 if ($preset && $CONSOLE->{input}->get_text eq '') {
450 $CONSOLE->{input}->set_text ($preset);
451 }
452 }
453 });
454
455 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
456
457 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
458 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
459 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
460
461 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
462 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
463 status "Configuration Saved";
464 });
465
466 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
467
468 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
469 $tgw->add (my $hbox = new CFClient::UI::HBox ());
470
471 $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
472 $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
473 $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
474 $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
475
476 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
477 $CFClient::UI::ROOT->add ($tgw);
478}
479
480sub video_shutdown {
481 $CFClient::UI::ROOT->{children} = [];
482 undef $SDL_ACTIVE;
483 undef $SDL_EV;
484}
485
486my $bgmusic;#TODO#hack#d#
487
488sub audio_init {
489 if ($CFG->{sound} || 1) {
490 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
491 $SDL_MIXER = new SDL::Mixer;
492 $SDL_MIXER->allocate_channels (8);
493
494 if ($CFG->{bg_music_enable}) {
495 $bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
496 $SDL_MIXER->play_music ($bgmusic, -1);
497 }
498
499 while (<$fh>) {
500 next if /^\s*#/;
501 next if /^\s*$/;
502
503 my ($file, $volume, $event) = split /\s+/, $_, 3;
504
505 push @SOUNDS, "$volume,$file";
506
507 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
508 my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";
509 $chunk->volume ($volume * 128 / 100);
510 $chunk
269 0 511 };
270 } 512 }
271 } else { 513 } else {
272 undef $refresh_handler; 514 status "unable to open sound config: $!";
273 0
274 } 515 }
275 }; 516 }
517}
518
519sub audio_shutdown {
520 undef $SDL_MIXER;
521 @SOUNDS = ();
522 %AUDIO_CHUNKS = ();
523}
524
525my %animate_object;
526my $animate_timer;
527
528my $want_refresh;
529my $can_refresh;
530
531my $fps = 9;
532
533sub force_refresh {
534 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
535 debug sprintf "%3.2f", $fps;
536
537 $want_refresh = 0;
538 $can_refresh = 0;
539
540 $CFClient::UI::ROOT->draw;
541
542 SDL::GLSwapBuffers;
543
544 $LAST_REFRESH = $NOW;
545}
546
547my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
548 $NOW = time;
549
550 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
551 while $SDL_EV->poll;
552
553 if (%animate_object) {
554 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
555 $want_refresh++;
556 }
557
558 if ($want_refresh) {
559 force_refresh;
560 } else {
561 $can_refresh = 1;
562 }
563});
564
565sub refresh {
566 $want_refresh++;
276} 567}
277 568
278sub animation_start { 569sub animation_start {
279 my ($widget) = @_; 570 my ($widget) = @_;
280 $ANIMATE{$widget} = $widget; 571 $animate_object{$widget} = $widget;
281 Scalar::Util::weaken $ANIMATE{$widget};
282
283 refresh;
284} 572}
285 573
286sub animation_stop { 574sub animation_stop {
287 my ($widget) = @_; 575 my ($widget) = @_;
288 delete $ANIMATE{$widget}; 576 delete $animate_object{$widget};
577}
578
579@conn::ISA = Crossfire::Protocol::;
580
581sub conn::stats_update {
582 my ($self, $stats) = @_;
583
584 # i love text protocols!!!
585 # FIXME: the stats are somehow weird
586 my $hp = $stats->{1};
587 my $hp_m = $stats->{2};
588 my $sp = $stats->{3};
589 my $sp_m = $stats->{4};
590 my $fo = $stats->{18};
591 my $fo_m = 1000;
592 my $gr = $stats->{23};
593 my $gr_m = $stats->{24};
594
595 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
596 $GAUGES->{hp}->set_value ($hp, $hp_m);
597 $GAUGES->{mana}->set_value ($sp, $sp_m);
598 $GAUGES->{food}->set_value ($fo, $fo_m);
599 $GAUGES->{grace}->set_value ($gr, $gr_m);
600}
601
602sub conn::user_send {
603 my ($self, $command) = @_;
604
605 $self->send_command ($command);
606 status $command;
607}
608
609sub conn::map_scroll {
610 my ($self, $dx, $dy) = @_;
611
612 $MAP->scroll ($dx, $dy);
613}
614
615sub conn::feed_map1a {
616 my ($self, $data) = @_;
617
618# $self->Crossfire::Protocol::feed_map1a ($data);
619
620 $MAP->map1a_update ($data);
621 $MAPWIDGET->update;
622}
623
624sub conn::flush_map {
625 my ($self) = @_;
626
627 my $map_info = delete $self->{map_info}
628 or return;
629
630 my ($hash, $x, $y, $w, $h) = @$map_info;
631
632 my $data = $MAP->get_rect ($x, $y, $w, $h);
633 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
634
635 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
636
637}
638
639sub conn::map_clear {
640 my ($self) = @_;
641
642 $self->flush_map;
643 delete $self->{neigh};
644
645 $MAP->clear;
646}
647
648
649sub conn::load_map($$$) {
650 my ($self, $hash, $x, $y) = @_;
651
652 if (defined (my $data = $MAPCACHE->get ($hash))) {
653 $data = Compress::LZF::decompress $data;
654 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
655 for my $id ($MAP->set_rect ($x, $y, $data)) {
656 my $data = $TILECACHE->get ($id)
657 or next;
658
659 $self->set_texture ($id => $data);
660 }
661 }
662}
663
664sub conn::flood_fill {
665 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
666
667 # the server does not allow map paths > 6
668 return if 6 <= length $path;
669
670 for my $tile (1..4) {
671 next if $self->{neigh}{$hash}[$tile];
672 next unless $flags & (1 << ($tile - 1));
673
674 my $neigh = $self->{neigh}{$hash} ||= [];
675
676 $self->send_mapinfo ("spatial $path$tile", sub {
677 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
678
679 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
680 return if $mode ne "spatial";
681
682 $x += $MAP->ox;
683 $y += $MAP->oy;
684
685 $self->load_map ($hash, $x, $y)
686 unless $self->{neigh}{$hash}[5]++;#d#
687
688 $neigh->[$tile] = [$x, $y, $w, $h];
689
690 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
691 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
692 });
693 }
694}
695
696sub conn::map_change {
697 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
698
699 $self->flush_map;
700
701 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
702
703 my $mapmapw = 250;
704 my $mapmaph = 250;
705
706 $self->flood_fill ("", $hash, $flags,
707 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
708 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
709
710 $x += $ox;
711 $y += $oy;
712
713 $self->{map_info} = [$hash, $x, $y, $w, $h];
714
715 $self->load_map ($hash, $x, $y);
716}
717
718sub conn::face_find {
719 my ($self, $facenum, $face) = @_;
720
721 my $hash = "$face->{chksum},$face->{name}";
722
723 my $id = $FACEMAP->get ($hash);
724
725 unless ($id) {
726 # create new id for face
727 # i love transactions
728 for (1..100) {
729 my $txn = $CFClient::DB_ENV->txn_begin;
730 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
731 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
732 $id++;
733 if ($FACEMAP->put (id => $id) == 0
734 && $FACEMAP->put ($hash => $id) == 0) {
735 $txn->txn_commit;
736
737 goto gotid;
738 }
739 }
740 $txn->abort;
741 }
742
743 CFClient::fatal "maximum number of transaction retries reached - database problems?";
744 }
745
746gotid:
747 $face->{id} = $id;
748 $MAP->set_face ($facenum => $id);
749 $TILECACHE->get ($id)
750}
751
752sub conn::face_update {
753 my ($self, $facenum, $face) = @_;
754
755 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
756
757 $self->set_texture ($face->{id} => delete $face->{image});
758}
759
760sub conn::set_texture {
761 my ($self, $id, $data) = @_;
762
763 $self->{texture}[$id] ||= do {
764 my $tex =
765 new_from_image CFClient::Texture
766 $data, minify => 1;
767
768 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
769 $MAPWIDGET->update;
770
771 $tex
772 };
773}
774
775sub conn::sound_play {
776 my ($self, $x, $y, $soundnum, $type) = @_;
777
778 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
779 or return;
780
781 $SDL_MIXER->play_channel (-1, $chunk);
782 warn "sound $x,$y,$soundnum,$type\n";#d#
783}
784
785sub conn::query {
786 my ($self, $flags, $prompt) = @_;
787
788 #TODO
789 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
790}
791
792sub conn::drawinfo {
793 my ($self, $color, $text) = @_;
794
795 my @color = (
796 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
797 [1.00, 1.00, 1.00],
798 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
799 [1.00, 0.00, 0.00],
800 [1.00, 0.54, 0.00],
801 [0.11, 0.56, 1.00],
802 [0.93, 0.46, 0.00],
803 [0.18, 0.54, 0.34],
804 [0.56, 0.73, 0.56],
805 [0.80, 0.80, 0.80],
806 [0.55, 0.41, 0.13],
807 [0.99, 0.77, 0.26],
808 [0.74, 0.65, 0.41],
809 );
810
811 $LOGVIEW->add_paragraph ($color[$color], $text);
289} 812}
290 813
291%SDL_CB = ( 814%SDL_CB = (
292 SDL_QUIT() => sub { 815 SDL_QUIT() => sub {
293 main_quit Gtk2; 816 Event::unloop -1;
294 }, 817 },
295 SDL_VIDEORESIZE() => sub { 818 SDL_VIDEORESIZE() => sub {
296 }, 819 },
297 SDL_VIDEOEXPOSE() => sub { 820 SDL_VIDEOEXPOSE() => sub {
298 refresh; 821 refresh;
299 }, 822 },
300 SDL_KEYDOWN() => sub { 823 SDL_KEYDOWN() => sub {
301 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 824 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
302 # alt-enter 825 # alt-enter
303 $FULLSCREEN = !$FULLSCREEN; 826 video_shutdown;
304 destroy_screen; 827 $CFG->{fullscreen} = !$CFG->{fullscreen};
305 init_screen; 828 video_init;
306 } else { 829 } else {
307 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 830 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
308 } 831 }
309 }, 832 },
310 SDL_KEYUP() => sub { 833 SDL_KEYUP() => sub {
322 SDL_ACTIVEEVENT() => sub { 845 SDL_ACTIVEEVENT() => sub {
323# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 846# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
324 }, 847 },
325); 848);
326 849
327@conn::ISA = Crossfire::Protocol::;
328
329sub conn::map_update {
330 my ($self, $dirty) = @_;
331
332 $MAPWIDGET->update;
333}
334
335sub conn::map_scroll {
336 my ($self, $dx, $dy) = @_;
337
338# refresh;
339}
340
341sub conn::map_clear {
342 my ($self) = @_;
343
344# refresh;
345}
346
347sub conn::face_find {
348 my ($self, $face) = @_;
349
350 $FACECACHE->{"$face->{chksum},$face->{name}"}
351}
352
353sub conn::face_update {
354 my ($self, $face) = @_;
355
356 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
357
358 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
359}
360
361sub conn::query {
362 my ($self, $flags, $prompt) = @_;
363
364 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
365}
366
367sub gtk_add_cfg_field {
368 my ($tbl, $cfg, $klbl, $key, $value) = @_;
369 my $i = $cfg->{_i}++;
370 $tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
371 $tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
372 if ($key eq 'password') {
373 $ent->set_invisible_char ("*");
374 $ent->set (visibility => 0)
375 }
376 $ent->set_text ($value);
377 $ent->signal_connect (changed => sub {
378 my ($ent) = @_;
379 $cfg->{$key} = $ent->get_text;
380 # TODO: Mapsize should be a slider in the game gui
381 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
382 $cfg->{$key} = 100;
383 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
384 $cfg->{$key} = 50;
385 }
386 });
387}
388
389sub run_config_dialog {
390 my (%events) = @_;
391
392 my $w = Gtk2::Window->new;
393
394 my @cfg = (
395 [qw/Host host/],
396 [qw/Port port/],
397 [qw/Mapsize% mapsize/],
398 [qw/Username user/],
399 [qw/Password password/],
400 );
401
402 my $cfg = {};
403
404 $w->add (my $vb = Gtk2::VBox->new);
405 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
406 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
407 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
408 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
409 my $i = 0;
410 my $act = 0;
411 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
412 if ($_ eq $selmode) { $act = $i }
413 $cb->append_text ($_);
414 $i++;
415 }
416 $cb->set_active ($act);
417 $cb->signal_connect (changed => sub {
418 my ($cb) = @_;
419 my $txt = $cb->get_active_text;
420 if ($txt =~ m/(\d+)x(\d+)/) {
421 $::CFG->{width} = $1;
422 $::CFG->{height} = $2;
423 }
424 });
425
426 $cfg->{_i} = 1;
427 for (@cfg) {
428 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
429 }
430
431 $vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
432 $hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
433 $cb->signal_connect (clicked => sub {
434 for (keys %$cfg) {
435 $::CFG->{$_} = $cfg->{$_}
436 if $_ ne '_i';
437 }
438 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
439 });
440 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
441 $cb->signal_connect (clicked => sub {
442 for (keys %$cfg) {
443 $::CFG->{$_} = $cfg->{$_}
444 if $_ ne '_i';
445 }
446 my $cb = $events{login} || sub {};
447 $cb->($::CFG->{user}, $::CFG->{password});
448 });
449 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
450 $cb->signal_connect (clicked => sub {
451 my $cb = $events{logout} || sub {};
452 $cb->();
453 });
454 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
455 $cb->signal_connect (clicked => sub { $w->destroy });
456
457 $w->show_all;
458
459 $w->signal_connect (destroy => sub { Gtk2->main_quit });
460}
461
462
463############################################################################# 850#############################################################################
464 851
465SDL::Init SDL_INIT_EVERYTHING; 852$SIG{INT} = $SIG{TERM} = sub { exit };
466 853
467@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)], 854$TILECACHE = CFClient::db_table "tilecache";
468 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE }; 855$FACEMAP = CFClient::db_table "facemap";
469 856
470CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 857CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
471 858
472$CFG ||= { 859my %DEF_CFG = (
860 sdl_mode => 0,
473 width => 640, 861 width => 640,
474 height => 480, 862 height => 480,
475 fullscreen => 0, 863 fullscreen => 0,
476 sdl_mode => 0, 864 fast => 0,
865 fow_enable => 1,
866 fow_intensity => 0.45,
867 fow_smooth => 0,
868 log_fontsize => 14,
477 mapsize => 100, 869 mapsize => 100,
478 host => "crossfire.schmorp.de", 870 host => "crossfire.schmorp.de",
479 port => 13327, 871 say_command => 'say',
480}; 872 sound => 1,
873 bg_music_enable => 1,
874);
875
876while (my ($k, $v) = each %DEF_CFG) {
877 $CFG->{$k} = $v unless exists $CFG->{$k};
878}
879
880sdl_init;
881
882@SDL_MODES = reverse
883 grep $_->[0] >= 640 && $_->[1] >= 480,
884 map [SDL::RectW ($_), SDL::RectH ($_)],
885 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
886
887@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
888
889$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
481 890
482{ 891{
483 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 892 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
484 893
485 CFClient::add_font $_ for @fonts; 894 CFClient::add_font $_ for @fonts;
486 CFClient::set_font $fonts[0]; 895 CFClient::set_font $fonts[0];
487} 896}
488 897
489$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 898video_init;
899audio_init;
490 900
491run_config_dialog 901Event::loop;
492 login => sub { start_game },
493 logout => sub { stop_game };
494 902
495main Gtk2; 903END { SDL::Quit }
496 904
497Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
498 905

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines