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.86 by root, Wed Apr 12 18:09:22 2006 UTC vs.
Revision 1.95 by root, Thu Apr 13 23:07:58 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;
18use CFClient; 18use CFClient;
19use CFClient::UI; 19use CFClient::UI;
20 20
21our $VERSION = '0.1'; 21our $VERSION = '0.1';
22 22
23my $MAX_FPS = 60; 23my $MAX_FPS = 500;
24my $MIN_FPS = 5; # unused 24my $MIN_FPS = 5; # unused as of yet
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
26 25
27our $FACECACHE; 26our $FACECACHE;
27
28our $LAST_REFRESH;
29our $NOW;
28 30
29our $CFG; 31our $CFG;
30our $CONN; 32our $CONN;
31our $FAST; # fast, low-quality mode, possibly useful for software-rendering 33our $FAST; # fast, low-quality mode, possibly useful for software-rendering
32 34
33our @SDL_MODES; 35our @SDL_MODES;
34our $WIDTH; 36our $WIDTH;
35our $HEIGHT; 37our $HEIGHT;
36our $FULLSCREEN; 38our $FULLSCREEN;
37 39
38our $NOW; 40our $MAP;
39
40our $MAPWIDGET; 41our $MAPWIDGET;
41our $FONTSIZE; 42our $FONTSIZE;
42 43
43our $SDL_TIMER;
44our $SDL_ACTIVE; 44our $SDL_ACTIVE;
45our $SDL_EV; 45our $SDL_EV;
46our %SDL_CB; 46our %SDL_CB;
47 47
48our $ALT_ENTER_MESSAGE; 48our $ALT_ENTER_MESSAGE;
49our $STATUS_LINE; 49our $STATUS_LINE;
50our $DEBUG_STATUS; 50our $DEBUG_STATUS;
51
52my $last_refresh;
53my %ANIMATE;
54my $refresh_handler;
55 51
56sub status { 52sub status {
57 $STATUS_LINE->set_text ($_[0]); 53 $STATUS_LINE->set_text ($_[0]);
58 my ($w, $h) = $STATUS_LINE->size_request; 54 my ($w, $h) = $STATUS_LINE->size_request;
59 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 55 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
68sub start_game { 64sub start_game {
69 status "logging in..."; 65 status "logging in...";
70 66
71 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 67 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
72 68
69 $MAP = new CFClient::Map $mapsize, $mapsize;
70
73 $CONN = new conn 71 $CONN = new conn
74 host => $CFG->{host}, 72 host => $CFG->{host},
75 port => $CFG->{port}, 73 port => $CFG->{port},
76 user => $CFG->{user}, 74 user => $CFG->{user},
77 pass => $CFG->{password}, 75 pass => $CFG->{password},
112 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 110 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
113 my ($self, $value) = @_; 111 my ($self, $value) = @_;
114 $CFG->{fullscreen} = $value; 112 $CFG->{fullscreen} = $value;
115 }); 113 });
116 114
115 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
116 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
117 my ($self, $value) = @_;
118 $CFG->{fast} = $value;
119 });
120
121 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
122 $table->add (1, 3, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
123 my ($self, $value) = @_;
124 $CFG->{fow_intensity} = $value;
125 });
126
127 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Smooth FoW");
128 $table->add (1, 4, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
129 my ($self, $value) = @_;
130 $CFG->{fow_smooth} = $value;
131 });
132
117 $table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 133 $table->add (1, 5, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
118 destroy_screen (); 134 destroy_screen ();
119 init_screen (); 135 init_screen ();
120 }); 136 });
121 137
122 $vbox->add (new CFClient::UI::Label align => 0, text => "Server"); 138 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
123 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 139 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
124 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); 140 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
125 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}); 141 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
126 142
127 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); 143 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
155 status "Configuration Saved"; 171 status "Configuration Saved";
156 }); 172 });
157 $CFClient::UI::TOPLEVEL->add ($dialog); 173 $CFClient::UI::TOPLEVEL->add ($dialog);
158} 174}
159 175
176sub sdl_init {
177 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
178 and die "SDL::Init failed!\n";
179}
180
160sub init_screen { 181sub init_screen {
182 sdl_init;
183
161 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 184 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
162 $FULLSCREEN = $CFG->{fullscreen}; 185 $FULLSCREEN = $CFG->{fullscreen};
163 186 $FAST = $CFG->{fast};
164 SDL::Init SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO
165 and die "SDL::Init failed!\n";
166 187
167 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 188 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
168 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5; 189 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
169 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5; 190 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
170 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0; 191 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
188 $SDL_EV = new SDL::Event; 209 $SDL_EV = new SDL::Event;
189 $SDL_EV->set_unicode (1); 210 $SDL_EV->set_unicode (1);
190 211
191 $SDL_ACTIVE = 1; 212 $SDL_ACTIVE = 1;
192 213
193 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub { 214 $LAST_REFRESH = time - 0.01;
194 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
195 while $SDL_EV->poll;
196
197 1
198 };
199
200 $last_refresh = SDL::GetTicks;
201 215
202 CFClient::gl_init; 216 CFClient::gl_init;
203 217
204 $FONTSIZE = int $HEIGHT / 40; 218 $FONTSIZE = int $HEIGHT / 40;
205 219
227 config_dialog; 241 config_dialog;
228} 242}
229 243
230sub destroy_screen { 244sub destroy_screen {
231 $CFClient::UI::TOPLEVEL->{children} = []; 245 $CFClient::UI::TOPLEVEL->{children} = [];
232 remove Glib::Source $SDL_TIMER;
233 remove Glib::Source $refresh_handler if $refresh_handler;
234 undef $refresh_handler;
235 undef $SDL_ACTIVE; 246 undef $SDL_ACTIVE;
236 undef $SDL_EV; 247 undef $SDL_EV;
237 SDL::Quit; 248 SDL::Quit;
238} 249}
239 250
251my %animate_object;
252my $animate_timer;
253
254my $want_refresh;
255my $can_refresh;
256
257my $fps = 9;
258
240sub force_refresh { 259sub force_refresh {
260 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
261 debug sprintf "%3.2f", $fps;
262
263# $want_refresh = 0;#d#
264 $can_refresh = 0;
265
241 glViewport 0, 0, $WIDTH, $HEIGHT; 266 glViewport 0, 0, $WIDTH, $HEIGHT;
242 267
243 glMatrixMode GL_PROJECTION; 268 glMatrixMode GL_PROJECTION;
244 glLoadIdentity; 269 glLoadIdentity;
245 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 270 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
246 glMatrixMode GL_MODELVIEW; 271 glMatrixMode GL_MODELVIEW;
247 glLoadIdentity; 272 glLoadIdentity;
248 273
274 glClearColor +($CFG->{fow_intensity}) x 3, 1;
249 glClear GL_COLOR_BUFFER_BIT; 275 glClear GL_COLOR_BUFFER_BIT;
250 276
251 $CFClient::UI::TOPLEVEL->draw; 277 $CFClient::UI::TOPLEVEL->draw;
252 278
253 SDL::GLSwapBuffers; 279 SDL::GLSwapBuffers;
254}
255 280
256my $FPS; 281 $LAST_REFRESH = $NOW;
282}
283
284my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
285 $NOW = time;
286
287 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
288 while $SDL_EV->poll;
289
290 if (%animate_object) {
291 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
292 $want_refresh++;
293 }
294
295 if ($want_refresh) {
296 force_refresh;
297 } else {
298 $can_refresh = 1;
299 }
300});
257 301
258sub refresh { 302sub refresh {
259 $refresh_handler ||= add Glib::Idle sub { 303 $want_refresh++;
260 if ($SDL_ACTIVE) {
261 $NOW = SDL::GetTicks;
262
263 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
264 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
265 $NOW = SDL::GetTicks;
266 }
267
268 my $interval = ($NOW - $last_refresh) * 0.001;
269 $last_refresh = $NOW;
270
271 if ($interval) {
272 $FPS ||= 1 / $interval;
273 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
274 debug sprintf "%5.02f", $FPS;
275 }
276
277 force_refresh;
278 $_->animate ($interval) for grep $_, values %ANIMATE;
279
280 if (%ANIMATE) {
281 1
282 } else {
283 undef $refresh_handler;
284 0
285 }
286 } else {
287 undef $refresh_handler;
288 0
289 }
290 };
291} 304}
292 305
293sub animation_start { 306sub animation_start {
294 my ($widget) = @_; 307 my ($widget) = @_;
295 $ANIMATE{$widget} = $widget; 308 $animate_object{$widget} = $widget;
296 Scalar::Util::weaken $ANIMATE{$widget};
297
298 refresh;
299} 309}
300 310
301sub animation_stop { 311sub animation_stop {
302 my ($widget) = @_; 312 my ($widget) = @_;
303 delete $ANIMATE{$widget}; 313 delete $animate_object{$widget};
314}
315
316@conn::ISA = Crossfire::Protocol::;
317
318sub conn::user_send {
319 my ($self, $command) = @_;
320
321 $self->send ($command);
322 status $command;
323}
324
325sub conn::feed_map1a {
326 my ($self, $data) = @_;
327
328# $self->Crossfire::Protocol::feed_map1a ($data);
329
330 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
331 $MAP->map1a_update ($data);
332 $MAPWIDGET->update;
333}
334
335#sub conn::map_update {
336# my ($self, $dirty) = @_;
337#
338# $MAPWIDGET->update;
339#}
340
341sub conn::map_clear {
342 my ($self) = @_;
343
344 $MAP->clear;
345
346# refresh;
347}
348
349sub conn::face_find {
350 my ($self, $face) = @_;
351
352 $FACECACHE->{"$face->{chksum},$face->{name}"}
353}
354
355sub conn::face_update {
356 my ($self, $facenum, $face) = @_;
357
358 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
359
360 my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
361
362 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
363 $MAPWIDGET->update;
364}
365
366sub conn::query {
367 my ($self, $flags, $prompt) = @_;
368
369 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
304} 370}
305 371
306%SDL_CB = ( 372%SDL_CB = (
307 SDL_QUIT() => sub { 373 SDL_QUIT() => sub {
308 main_quit Gtk2; 374 Event::unloop -1;
309 }, 375 },
310 SDL_VIDEORESIZE() => sub { 376 SDL_VIDEORESIZE() => sub {
311 }, 377 },
312 SDL_VIDEOEXPOSE() => sub { 378 SDL_VIDEOEXPOSE() => sub {
313 refresh; 379 refresh;
337 SDL_ACTIVEEVENT() => sub { 403 SDL_ACTIVEEVENT() => sub {
338# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 404# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
339 }, 405 },
340); 406);
341 407
342@conn::ISA = Crossfire::Protocol::;
343
344sub conn::map_update {
345 my ($self, $dirty) = @_;
346
347 $MAPWIDGET->update;
348}
349
350sub conn::map_scroll {
351 my ($self, $dx, $dy) = @_;
352
353# refresh;
354}
355
356sub conn::map_clear {
357 my ($self) = @_;
358
359# refresh;
360}
361
362sub conn::face_find {
363 my ($self, $face) = @_;
364
365 $FACECACHE->{"$face->{chksum},$face->{name}"}
366}
367
368sub conn::face_update {
369 my ($self, $face) = @_;
370
371 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
372
373 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
374}
375
376sub conn::query {
377 my ($self, $flags, $prompt) = @_;
378
379 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
380}
381
382sub gtk_add_cfg_field {
383 my ($tbl, $cfg, $klbl, $key, $value) = @_;
384 my $i = $cfg->{_i}++;
385 $tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
386 $tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
387 if ($key eq 'password') {
388 $ent->set_invisible_char ("*");
389 $ent->set (visibility => 0)
390 }
391 $ent->set_text ($value);
392 $ent->signal_connect (changed => sub {
393 my ($ent) = @_;
394 $cfg->{$key} = $ent->get_text;
395 # TODO: Mapsize should be a slider in the game gui
396 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
397 $cfg->{$key} = 100;
398 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
399 $cfg->{$key} = 50;
400 }
401 });
402}
403
404sub run_config_dialog {
405 my (%events) = @_;
406
407 my $w = Gtk2::Window->new;
408
409 my @cfg = (
410 [qw/Host host/],
411 [qw/Port port/],
412 [qw/Mapsize% mapsize/],
413 [qw/Username user/],
414 [qw/Password password/],
415 );
416
417 my $cfg = {};
418
419 $w->add (my $vb = Gtk2::VBox->new);
420 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
421 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
422 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
423 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
424 my $i = 0;
425 my $act = 0;
426 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
427 if ($_ eq $selmode) { $act = $i }
428 $cb->append_text ($_);
429 $i++;
430 }
431 $cb->set_active ($act);
432 $cb->signal_connect (changed => sub {
433 my ($cb) = @_;
434 my $txt = $cb->get_active_text;
435 if ($txt =~ m/(\d+)x(\d+)/) {
436 $::CFG->{width} = $1;
437 $::CFG->{height} = $2;
438 }
439 });
440
441 $cfg->{_i} = 1;
442 for (@cfg) {
443 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
444 }
445
446 $vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
447 $hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
448 $cb->signal_connect (clicked => sub {
449 for (keys %$cfg) {
450 $::CFG->{$_} = $cfg->{$_}
451 if $_ ne '_i';
452 }
453 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
454 });
455 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
456 $cb->signal_connect (clicked => sub {
457 for (keys %$cfg) {
458 $::CFG->{$_} = $cfg->{$_}
459 if $_ ne '_i';
460 }
461 my $cb = $events{login} || sub {};
462 $cb->($::CFG->{user}, $::CFG->{password});
463 });
464 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
465 $cb->signal_connect (clicked => sub {
466 my $cb = $events{logout} || sub {};
467 $cb->();
468 });
469 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
470 $cb->signal_connect (clicked => sub { $w->destroy });
471
472 $w->show_all;
473
474 $w->signal_connect (destroy => sub { Gtk2->main_quit });
475}
476
477
478############################################################################# 408#############################################################################
479 409
480SDL::Init SDL_INIT_EVERYTHING;
481
482@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
483 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
484
485CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 410CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
486 411
487$CFG ||= { 412my %DEF_CFG = (
488 width => 640, 413 width => 640,
489 height => 480, 414 height => 480,
415 fast => 0,
416 fow_intensity => 0.45,
417 fow_smooth => 0,
490 fullscreen => 0, 418 fullscreen => 0,
491 sdl_mode => 0, 419 sdl_mode => 0,
492 mapsize => 100, 420 mapsize => 100,
493 host => "crossfire.schmorp.de", 421 host => "crossfire.schmorp.de",
494 port => 13327, 422 port => 13327,
495}; 423);
424
425while (my ($k, $v) = each %DEF_CFG) {
426 $CFG->{$k} = $v unless exists $CFG->{$k};
427}
428
429sdl_init;
430
431@SDL_MODES = reverse
432 grep $_->[0] >= 640 && $_->[1] >= 480,
433 map [SDL::RectW ($_), SDL::RectH ($_)],
434 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
435
436@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
437
438$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
439
440init_screen;
496 441
497{ 442{
498 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 443 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
499 444
500 CFClient::add_font $_ for @fonts; 445 CFClient::add_font $_ for @fonts;
501 CFClient::set_font $fonts[0]; 446 CFClient::set_font $fonts[0];
502} 447}
503 448
504$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 449$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
505 450
506init_screen; 451Event::loop;
507
508main Gtk2;
509 452
510Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; 453Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
511 454

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines