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.91 by root, Wed Apr 12 23:15:39 2006 UTC vs.
Revision 1.152 by root, Thu Apr 20 08:11:57 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines