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.116 by root, Sun Apr 16 07:25:30 2006 UTC vs.
Revision 1.151 by root, Thu Apr 20 07:27:11 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
18use Compress::LZF; 12use Compress::LZF;
19 13
20use CFClient; 14use CFClient;
21use CFClient::UI; 15use CFClient::UI;
16use CFClient::MapWidget;
22 17
23our $VERSION = '0.1'; 18our $VERSION = '0.1';
24 19
25my $MAX_FPS = 60; 20my $MAX_FPS = 60;
26my $MIN_FPS = 5; # unused as of yet 21my $MIN_FPS = 5; # unused as of yet
… …
49our $BUTTONBAR; 44our $BUTTONBAR;
50our $LOGVIEW; 45our $LOGVIEW;
51our $CONSOLE; 46our $CONSOLE;
52our $METASERVER; 47our $METASERVER;
53 48
49our $GAUGES;
50
54our $SDL_ACTIVE; 51our $SDL_ACTIVE;
55our $SDL_EV;
56our %SDL_CB; 52our %SDL_CB;
53
54our $SDL_MIXER;
55our @SOUNDS; # event => file mapping
56our %AUDIO_CHUNKS; # audio files
57 57
58our $ALT_ENTER_MESSAGE; 58our $ALT_ENTER_MESSAGE;
59our $STATUS_LINE; 59our $STATUS_LINE;
60our $DEBUG_STATUS; 60our $DEBUG_STATUS;
61 61
62sub status { 62sub status {
63 $STATUS_LINE->set_text ($_[0]); 63 $STATUS_LINE->set_text ($_[0]);
64 my ($w, $h) = $STATUS_LINE->size_request;
65 $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});
66} 65}
67 66
68sub debug { 67sub debug {
69 $DEBUG_STATUS->set_text ($_[0]); 68 $DEBUG_STATUS->set_text ($_[0]);
70 my ($w, $h) = $DEBUG_STATUS->size_request; 69 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
71 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
72} 70}
73 71
74sub start_game { 72sub start_game {
75 status "logging in..."; 73 status "logging in...";
76 74
… …
100 undef $CONN; 98 undef $CONN;
101} 99}
102 100
103sub client_setup { 101sub client_setup {
104 my $dialog = new CFClient::UI::FancyFrame 102 my $dialog = new CFClient::UI::FancyFrame
103 title => "Client Setup",
105 child => (my $vbox = new CFClient::UI::VBox); 104 child => (my $vbox = new CFClient::UI::VBox);
106 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
107 $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]);
108 106
109 $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");
110 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 108 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
111 109
112 $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]);
113 $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");
114 112
115 $mode_slider->connect (changed => sub { 113 $mode_slider->connect (changed => sub {
116 my ($self, $value) = @_; 114 my ($self, $value) = @_;
117 115
118 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 116 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
119 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 117 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
120 }); 118 });
121 $mode_slider->emit (changed => $mode_slider->{range}[0]); 119 $mode_slider->emit (changed => $mode_slider->{range}[0]);
122 120
123 $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");
124 $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 {
125 my ($self, $value) = @_; 123 my ($self, $value) = @_;
126 $CFG->{fullscreen} = $value; 124 $CFG->{fullscreen} = $value;
127 }); 125 });
128 126
129 $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");
130 $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 {
131 my ($self, $value) = @_; 129 my ($self, $value) = @_;
132 $CFG->{fast} = $value; 130 $CFG->{fast} = $value;
133 }); 131 });
134 132
135 $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");
136 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 134 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
137 my ($self, $value) = @_; 135 my ($self, $value) = @_;
138 $CFG->{fow_enable} = $value; 136 $CFG->{fow_enable} = $value;
139 }); 137 });
140 138
141 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); 139 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
142 $table->add (1, 4, 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 {
143 my ($self, $value) = @_; 141 my ($self, $value) = @_;
144 $CFG->{fow_intensity} = $value; 142 $CFG->{fow_intensity} = $value;
145 }); 143 });
146 144
147 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 145 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
148 $table->add (1, 5, 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 {
149 my ($self, $value) = @_; 147 my ($self, $value) = @_;
150 $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;
151 }); 150 });
152 151
153 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 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");
154 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 159 $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
155 my ($self, $value) = @_;
156 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 160 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
157 }); 161 });
158 162
159 $table->add (1, 7, 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 {
160 destroy_screen (); 164 video_shutdown ();
161 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];
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 ();
162 }); 189 });
163 190
164 $dialog 191 $dialog
165} 192}
166 193
167sub metaserver_dialog { 194sub metaserver_dialog {
168 my $dialog = new CFClient::UI::FancyFrame 195 my $dialog = new CFClient::UI::FancyFrame
196 title => "Metaserver",
169 child => (my $vbox = new CFClient::UI::VBox); 197 child => (my $vbox = new CFClient::UI::VBox);
170 198
171 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 199 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
172 200
173 $dialog 201 $dialog
… …
230 $HOST->set_text ($CFG->{host} = $host); 258 $HOST->set_text ($CFG->{host} = $host);
231 }), 259 }),
232 (new CFClient::UI::Empty expand => 1), 260 (new CFClient::UI::Empty expand => 1),
233 ]); 261 ]);
234 262
235 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) 263 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
236 for 0 .. $#$m; 264 for 0 .. $#$m;
237 } 265 }
238 } 266 }
239 }); 267 });
240} 268}
241 269
242sub server_setup { 270sub server_setup {
243 my $dialog = new CFClient::UI::FancyFrame 271 my $dialog = new CFClient::UI::FancyFrame
272 title => "Server Setup",
244 child => (my $vbox = new CFClient::UI::VBox); 273 child => (my $vbox = new CFClient::UI::VBox);
245 274
246 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
247 $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]);
248 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port"); 276 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
249 277
250 { 278 {
251 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 279 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
252 280
253 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { 281 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
254 my ($self, $value) = @_; 282 my ($self, $value) = @_;
255 $CFG->{host} = $value; 283 $CFG->{host} = $value;
256 }); 284 });
257 285
258 $METASERVER = metaserver_dialog; 286 $METASERVER = metaserver_dialog;
259 287
260 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub { 288 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
261 update_metaserver $HOST; 289 update_metaserver $HOST;
262 }); 290 });
263 } 291 }
264 292
265 $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");
266 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { 294 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
267 my ($self, $value) = @_; 295 my ($self, $value) = @_;
268 $CFG->{user} = $value; 296 $CFG->{user} = $value;
269 }); 297 });
270 298
271 $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");
272 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 300 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
273 my ($self, $value) = @_; 301 my ($self, $value) = @_;
274 $CFG->{password} = $value; 302 $CFG->{password} = $value;
275 }); 303 });
276 304
277 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 305 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
278 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 306 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
279 my ($self, $value) = @_; 307 my ($self, $value) = @_;
280 $CFG->{say_command} = $value; 308 $CFG->{say_command} = $value;
281 }); 309 });
282 310
283 $table->add (0, 7, 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");
284 $table->add (1, 7, new CFClient::UI::Slider 312 $table->add (1, 7, new CFClient::UI::Slider
285 req_w => 100, 313 req_w => 100,
286 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 314 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
287 connect_changed => sub { 315 connect_changed => sub {
288 my ($self, $value) = @_; 316 my ($self, $value) = @_;
… …
298 $dialog 326 $dialog
299} 327}
300 328
301sub message_window { 329sub message_window {
302 my $window = new CFClient::UI::FancyFrame 330 my $window = new CFClient::UI::FancyFrame
331 title => "Messages",
303 border_bg => [1, 1, 1, 0.5], 332 border_bg => [1, 1, 1, 0.5],
304 bg => [0.3, 0.3, 0.3, 0.8], 333 bg => [0.3, 0.3, 0.3, 0.8],
305 user_w => $::WIDTH/4, 334 user_w => int $::WIDTH / 3,
306 user_h => $::HEIGHT, 335 user_h => int $::HEIGHT / 5,
307 child => (my $vbox = new CFClient::UI::VBox); 336 child => (my $vbox = new CFClient::UI::VBox);
308 337
309 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 338 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
310 expand => 1, 339 expand => 1,
311 fontsize => $::CFG->{log_fontsize}, 340 fontsize => $::CFG->{log_fontsize},
312 ); 341 );
313 342
314 $vbox->add (my $input = new CFClient::UI::LineEntry 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 },
315 connect_activate => sub { 354 connect_activate => sub {
316 my ($input, $text) = @_; 355 my ($input, $text) = @_;
317 $input->set_text (''); 356 $input->set_text ('');
318 357
319 if ($text =~ /^\/(.*)/) { 358 if ($text =~ /^\/(.*)/) {
320 $::CONN->user_send ("command $1"); 359 $::CONN->user_send ($1);
321 } else { 360 } else {
322 my $say_cmd = $::CFG->{say_command} || 'say'; 361 my $say_cmd = $::CFG->{say_command} || 'say';
323 $::CONN->user_send ("command $say_cmd $text"); 362 $::CONN->user_send ("$say_cmd $text");
363 }
364 if ($input->{refocus_map}) {
365 delete $input->{refocus_map};
366 $MAPWIDGET->focus_in
324 } 367 }
325 }, 368 },
326 connect_escape => sub { 369 connect_escape => sub {
327 $MAPWIDGET->focus_in 370 $MAPWIDGET->focus_in
328 }, 371 },
… …
335 378
336 $window 379 $window
337} 380}
338 381
339sub sdl_init { 382sub sdl_init {
340 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 383 CFClient::SDL_Init
341 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
342 and die "SDL::Init failed!\n"; 384 and die "SDL::Init failed!\n";
343} 385}
344 386
345sub init_screen { 387sub video_init {
346 sdl_init; 388 sdl_init;
347 389
348 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 390 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
349 $FULLSCREEN = $CFG->{fullscreen}; 391 $FULLSCREEN = $CFG->{fullscreen};
350 $FAST = $CFG->{fast}; 392 $FAST = $CFG->{fast};
351 393
352 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 394 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
353 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
354 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
355 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
356
357 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
358 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
359 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
360 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
361
362 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
363 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
364 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
365
366 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
367 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
368 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
369 or die "SDL::SetVideoMode failed!\n"; 395 or die "SDL_SetVideoMode failed!\n";
370
371 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
372
373 $SDL_EV = new SDL::Event;
374 $SDL_EV->set_unicode (1);
375 396
376 $SDL_ACTIVE = 1; 397 $SDL_ACTIVE = 1;
377 398
378 $LAST_REFRESH = time - 0.01; 399 $LAST_REFRESH = time - 0.01;
379 400
380 CFClient::gl_init; 401 CFClient::gl_init;
381 402
382 $FONTSIZE = int $HEIGHT / 40; 403 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
383 404
384 ############################################################################# 405 #############################################################################
385 406
386 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 407 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
387 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 408 $DEBUG_STATUS->show;
388 409
389 $STATUS_LINE = new CFClient::UI::Label 410 $STATUS_LINE = new CFClient::UI::Label
390 padding => 0, 411 padding => 0,
391 y => $HEIGHT * 44 / 45 - $FONTSIZE; 412 y => $HEIGHT - $FONTSIZE * 1.8;
392 $CFClient::UI::ROOT->add ($STATUS_LINE); 413 $STATUS_LINE->show;
393 414
394 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 415 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
395 padding => 0, 416 padding => 0,
396 y => $HEIGHT * 44 / 45, 417 fontsize => 0.8,
397 height => $HEIGHT / 45,
398 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 418 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
399 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 419 $ALT_ENTER_MESSAGE->show;
420 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
400 421
401 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 422 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
402 $MAPWIDGET->focus_in; 423 $MAPWIDGET->focus_in;
403 $MAPWIDGET->connect (activate_console => sub { 424 $MAPWIDGET->connect (activate_console => sub {
404 my ($mapwidget, $preset) = @_; 425 my ($mapwidget, $preset) = @_;
405 426
406 if ($CONSOLE) { 427 if ($CONSOLE) {
428 $CONSOLE->{input}->{auto_activated} = 1;
407 $CONSOLE->{input}->focus_in; 429 $CONSOLE->{input}->focus_in;
408 430
409 if ($preset && $CONSOLE->{input}->get_text eq '') { 431 if ($preset && $CONSOLE->{input}->get_text eq '') {
410 $CONSOLE->{input}->set_text ($preset); 432 $CONSOLE->{input}->set_text ($preset);
411 } 433 }
… …
421 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 443 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
422 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 444 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
423 status "Configuration Saved"; 445 status "Configuration Saved";
424 }); 446 });
425 447
426 $BUTTONBAR->{children}[0]->emit ("activate"); 448 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
427}
428 449
429sub destroy_screen { 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 {
430 $CFClient::UI::ROOT->{children} = []; 463 $CFClient::UI::ROOT->{children} = [];
431 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;
432 undef $SDL_EV; 505 undef $SDL_MIXER;
433 SDL::Quit; 506 @SOUNDS = ();
507 %AUDIO_CHUNKS = ();
434} 508}
435 509
436my %animate_object; 510my %animate_object;
437my $animate_timer; 511my $animate_timer;
438 512
… …
448 $want_refresh = 0; 522 $want_refresh = 0;
449 $can_refresh = 0; 523 $can_refresh = 0;
450 524
451 $CFClient::UI::ROOT->draw; 525 $CFClient::UI::ROOT->draw;
452 526
453 SDL::GLSwapBuffers; 527 CFClient::SDL_GL_SwapBuffers;
454 528
455 $LAST_REFRESH = $NOW; 529 $LAST_REFRESH = $NOW;
456} 530}
457 531
458my $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 {
459 $NOW = time; 533 $NOW = time;
460 534
461 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 535 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
462 while $SDL_EV->poll; 536 for CFClient::SDL_PollEvent;
463 537
464 if (%animate_object) { 538 if (%animate_object) {
465 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 539 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
466 $want_refresh++; 540 $want_refresh++;
467 } 541 }
… …
487 delete $animate_object{$widget}; 561 delete $animate_object{$widget};
488} 562}
489 563
490@conn::ISA = Crossfire::Protocol::; 564@conn::ISA = Crossfire::Protocol::;
491 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
492sub conn::user_send { 587sub conn::user_send {
493 my ($self, $command) = @_; 588 my ($self, $command) = @_;
494 589
495 $self->send ($command); 590 $self->send_command ($command);
496 status $command; 591 status $command;
592}
593
594sub conn::map_scroll {
595 my ($self, $dx, $dy) = @_;
596
597 $MAP->scroll ($dx, $dy);
497} 598}
498 599
499sub conn::feed_map1a { 600sub conn::feed_map1a {
500 my ($self, $data) = @_; 601 my ($self, $data) = @_;
501 602
502# $self->Crossfire::Protocol::feed_map1a ($data); 603# $self->Crossfire::Protocol::feed_map1a ($data);
503 604
504 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
505 $MAP->map1a_update ($data); 605 $MAP->map1a_update ($data);
506 $MAPWIDGET->update; 606 $MAPWIDGET->update;
507} 607}
508 608
509sub conn::flush_map { 609sub conn::flush_map {
… …
523 623
524sub conn::map_clear { 624sub conn::map_clear {
525 my ($self) = @_; 625 my ($self) = @_;
526 626
527 $self->flush_map; 627 $self->flush_map;
628 delete $self->{neigh_map};
528 629
529 $MAP->clear; 630 $MAP->clear;
530} 631}
531 632
532sub conn::map_info {
533 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
534 633
535 $self->flush_map; 634sub conn::load_map($$$) {
536 635 my ($self, $hash, $x, $y) = @_;
537 $x = $::MAP->ox - $x;
538 $y = $::MAP->oy - $y;
539
540 $self->{map_info} = [$hash, $x, $y, $w, $h];
541 636
542 if (defined (my $data = $MAPCACHE->get ($hash))) { 637 if (defined (my $data = $MAPCACHE->get ($hash))) {
543 $data = Compress::LZF::decompress $data; 638 $data = Compress::LZF::decompress $data;
544 warn sprintf "LOADmap[%s] length %d\n", $hash, length $data;#d# 639 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
545 for my $id ($MAP->set_rect ($x, $y, $data)) { 640 for my $id ($MAP->set_rect ($x, $y, $data)) {
546 my $data = $TILECACHE->get ($id) 641 my $data = $TILECACHE->get ($id)
547 or next; 642 or next;
548 643
549 $self->set_texture ($id => $data); 644 $self->set_texture ($id => $data);
550 } 645 }
551 } 646 }
647}
648
649sub conn::flood_fill {
650 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
651
652 # the server does not allow map paths > 6
653 return if 6 <= length $path;
654
655 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
656
657 for (
658 [1, 0, -1],
659 [2, 1, 0],
660 [3, 0, 1],
661 [4, -1, 0],
662 ) {
663 my ($tile, $dx, $dy) = @$_;
664
665 my $gx = $gx + $dx;
666 my $gy = $gy + $dy;
667
668 next unless $flags & (1 << ($tile - 1));
669 next if $self->{neigh_grid}{$gx, $gy}++;
670
671 my $neigh = $self->{neigh_map}{$hash} ||= [];
672 if (my $info = $neigh->[$tile]) {
673 my ($flags, $x, $y, $w, $h, $hash) = @$info;
674
675 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
676 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
677
678 } else {
679 $self->send_mapinfo ("spatial $path$tile", sub {
680 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
681
682 return if $mode ne "spatial";
683
684 $x += $MAP->ox;
685 $y += $MAP->oy;
686
687 $self->load_map ($hash, $x, $y)
688 unless $self->{neigh_map}{$hash}[5]++;#d#
689
690 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
691
692 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
693 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
694 });
695 }
696 }
697}
698
699sub conn::map_change {
700 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
701
702 $self->flush_map;
703
704 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
705
706 my $mapmapw = 250;
707 my $mapmaph = 250;
708
709 $self->{neigh_rect} = [
710 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
711 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5,
712 ];
713
714 delete $self->{neigh_grid};
715 $self->flood_fill (0, 0, "", $hash, $flags);
716
717 $x += $ox;
718 $y += $oy;
719
720 $self->{map_info} = [$hash, $x, $y, $w, $h];
721
722 $self->load_map ($hash, $x, $y);
552} 723}
553 724
554sub conn::face_find { 725sub conn::face_find {
555 my ($self, $facenum, $face) = @_; 726 my ($self, $facenum, $face) = @_;
556 727
… …
606 777
607 $tex 778 $tex
608 }; 779 };
609} 780}
610 781
782sub conn::sound_play {
783 my ($self, $x, $y, $soundnum, $type) = @_;
784
785 $SDL_MIXER
786 or return;
787
788 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
789 or return;
790
791 $chunk->play;
792# warn "sound $x,$y,$soundnum,$type\n";#d#
793}
794
611sub conn::query { 795sub conn::query {
612 my ($self, $flags, $prompt) = @_; 796 my ($self, $flags, $prompt) = @_;
613 797
614 #TODO 798 #TODO, display dialog with relevant information
615 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 799 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
616} 800}
617 801
618sub conn::drawinfo { 802sub conn::drawinfo {
619 my ($self, $color, $text) = @_; 803 my ($self, $color, $text) = @_;
620 804
621 my @color = ( 805 my @color = (
622 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 806 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
623 [1.00, 1.00, 1.00], 807 [1.00, 1.00, 1.00],
624 [0.50, 0.50, 1.00], # changed 808 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
625 [1.00, 0.00, 0.00], 809 [1.00, 0.00, 0.00],
626 [1.00, 0.54, 0.00], 810 [1.00, 0.54, 0.00],
627 [0.11, 0.56, 1.00], 811 [0.11, 0.56, 1.00],
628 [0.93, 0.46, 0.00], 812 [0.93, 0.46, 0.00],
629 [0.18, 0.54, 0.34], 813 [0.18, 0.54, 0.34],
… …
635 ); 819 );
636 820
637 $LOGVIEW->add_paragraph ($color[$color], $text); 821 $LOGVIEW->add_paragraph ($color[$color], $text);
638} 822}
639 823
824sub conn::spell_add {
825 my ($self, $spell) = @_;
826
827 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
828 });
829 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
830 });
831}
832
833sub conn::spell_delete {
834 my ($self, $spell) = @_;
835}
836
837sub conn::addme_success {
838 my ($self) = @_;
839
840 for my $skill (values %{$self->{skill_info}}) {
841 $MAPWIDGET->add_command ("ready_skill $skill", "", sub {
842 });
843 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
844 });
845 }
846}
847
640%SDL_CB = ( 848%SDL_CB = (
641 SDL_QUIT() => sub { 849 CFClient::SDL_QUIT => sub {
642 Event::unloop -1; 850 Event::unloop -1;
643 }, 851 },
644 SDL_VIDEORESIZE() => sub { 852 CFClient::SDL_VIDEORESIZE => sub {
645 }, 853 },
646 SDL_VIDEOEXPOSE() => sub { 854 CFClient::SDL_VIDEOEXPOSE => sub {
647 refresh; 855 refresh;
648 }, 856 },
649 SDL_KEYDOWN() => sub { 857 CFClient::SDL_KEYDOWN => sub {
650 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 858 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
651 # alt-enter 859 # alt-enter
652 destroy_screen; 860 video_shutdown;
653 $CFG->{fullscreen} = !$CFG->{fullscreen}; 861 $CFG->{fullscreen} = !$CFG->{fullscreen};
654 init_screen; 862 video_init;
655 } else { 863 } else {
656 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 864 CFClient::UI::feed_sdl_key_down_event ($_[0]);
657 } 865 }
658 }, 866 },
659 SDL_KEYUP() => sub { 867 CFClient::SDL_KEYUP => sub {
660 CFClient::UI::feed_sdl_key_up_event ($SDL_EV); 868 CFClient::UI::feed_sdl_key_up_event ($_[0]);
661 }, 869 },
662 SDL_MOUSEMOTION() => sub { 870 CFClient::SDL_MOUSEMOTION => sub {
663 CFClient::UI::feed_sdl_motion_event ($SDL_EV); 871 CFClient::UI::feed_sdl_motion_event ($_[0]);
664 }, 872 },
665 SDL_MOUSEBUTTONDOWN() => sub { 873 CFClient::SDL_MOUSEBUTTONDOWN => sub {
666 CFClient::UI::feed_sdl_button_down_event ($SDL_EV); 874 CFClient::UI::feed_sdl_button_down_event ($_[0]);
667 }, 875 },
668 SDL_MOUSEBUTTONUP() => sub { 876 CFClient::SDL_MOUSEBUTTONUP => sub {
669 CFClient::UI::feed_sdl_button_up_event ($SDL_EV); 877 CFClient::UI::feed_sdl_button_up_event ($_[0]);
670 }, 878 },
671 SDL_ACTIVEEVENT() => sub { 879 CFClient::SDL_ACTIVEEVENT => sub {
672# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 880# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
673 }, 881 },
674); 882);
675 883
676############################################################################# 884#############################################################################
885
886$SIG{INT} = $SIG{TERM} = sub { exit };
677 887
678$TILECACHE = CFClient::db_table "tilecache"; 888$TILECACHE = CFClient::db_table "tilecache";
679$FACEMAP = CFClient::db_table "facemap"; 889$FACEMAP = CFClient::db_table "facemap";
680 890
681CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 891CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
… …
687 fullscreen => 0, 897 fullscreen => 0,
688 fast => 0, 898 fast => 0,
689 fow_enable => 1, 899 fow_enable => 1,
690 fow_intensity => 0.45, 900 fow_intensity => 0.45,
691 fow_smooth => 0, 901 fow_smooth => 0,
902 gui_fontsize => 1,
692 log_fontsize => 14, 903 log_fontsize => 14,
693 mapsize => 100, 904 mapsize => 100,
694 host => "crossfire.schmorp.de", 905 host => "crossfire.schmorp.de",
695 say_command => 'say', 906 say_command => 'say',
907 audio_enable => 1,
908 bgm_enable => 1,
909 bgm_volume => 0.25,
696); 910);
697 911
698while (my ($k, $v) = each %DEF_CFG) { 912while (my ($k, $v) = each %DEF_CFG) {
699 $CFG->{$k} = $v unless exists $CFG->{$k}; 913 $CFG->{$k} = $v unless exists $CFG->{$k};
700} 914}
701 915
702sdl_init; 916sdl_init;
703 917
704@SDL_MODES = reverse 918@SDL_MODES = reverse
705 grep $_->[0] >= 640 && $_->[1] >= 480, 919 grep $_->[0] >= 640 && $_->[1] >= 480,
706 map [SDL::RectW ($_), SDL::RectH ($_)], 920 CFClient::SDL_ListModes;
707 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
708 921
709@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 922@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
710 923
711$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 924$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
712
713init_screen;
714 925
715{ 926{
716 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 927 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
717 928
718 CFClient::add_font $_ for @fonts; 929 CFClient::add_font $_ for @fonts;
719 CFClient::set_font $fonts[0]; 930 CFClient::set_font $fonts[0];
720} 931}
721 932
933video_init;
934audio_init;
935
722Event::loop; 936Event::loop;
723 937
938END { CFClient::SDL_Quit }
724 939
940

Diff Legend

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