--- deliantra/Deliantra-Client/bin/pclient 2006/04/07 18:20:13 1.17 +++ deliantra/Deliantra-Client/bin/pclient 2006/04/12 21:35:11 1.90 @@ -1,100 +1,359 @@ #!/opt/bin/perl + use strict; +use utf8; -use Glib; -use Gtk2 -init; +use Time::HiRes 'time'; +use Event; use SDL; use SDL::App; use SDL::Event; use SDL::Surface; use SDL::OpenGL; -use SDL::OpenGL::Constants; use Crossfire; -use Crossfire::Client; use Crossfire::Protocol; -use Client::Util; -use Client::Widget; +use CFClient; +use CFClient::UI; our $VERSION = '0.1'; +my $MAX_FPS = 60; +my $MIN_FPS = 5; # unused as of yet + +our $FACECACHE; + +our $LAST_REFRESH; +our $NOW; + our $CFG; our $CONN; +our $FAST; # fast, low-quality mode, possibly useful for software-rendering -our $SDL_TIMER; -our $SDL_APP; -our $SDL_EV = new SDL::Event; -our %SDL_CB; -our @GL_INIT; +our @SDL_MODES; +our $WIDTH; +our $HEIGHT; +our $FULLSCREEN; -sub init_screen { - $SDL_APP = new SDL::App - -flags => SDL_ANYFORMAT | SDL_HWSURFACE, - -title => "Crossfire+ Client", - -width => $CFG->{width}, - -height => $CFG->{height}, - -opengl => 1, - -red_size => 8, - -green_size => 8, - -blue_size => 8, - -double_buffer => 1, - -fullscreen => $CFG->{fullscreen}, - -resizeable => 0; - - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - glShadeModel GL_FLAT; - glDisable GL_DEPTH_TEST; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glEnable GL_BLEND; +our $MAPWIDGET; +our $FONTSIZE; - glMatrixMode GL_PROJECTION; - glLoadIdentity; - glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1; +our $SDL_ACTIVE; +our $SDL_EV; +our %SDL_CB; - $_->() for @GL_INIT; +our $ALT_ENTER_MESSAGE; +our $STATUS_LINE; +our $DEBUG_STATUS; + +sub status { + $STATUS_LINE->set_text ($_[0]); + my ($w, $h) = $STATUS_LINE->size_request; + $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); } -sub start_game { - $SDL_TIMER = add Glib::Timeout 1000/20, sub { - while ($SDL_EV->poll) { - ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->(); - } +sub debug { + $DEBUG_STATUS->set_text ($_[0]); + my ($w, $h) = $DEBUG_STATUS->size_request; + $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h); +} - 1 - }; +sub start_game { + status "logging in..."; - init_screen; + my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; $CONN = new conn host => $CFG->{host}, - port => $CFG->{port}; + port => $CFG->{port}, + user => $CFG->{user}, + pass => $CFG->{password}, + mapw => $mapsize, + maph => $mapsize, + ; + + status "login successful"; + + CFClient::lowdelay fileno $CONN->{fh}; } sub stop_game { - remove Glib::Source $SDL_TIMER; + undef $CONN; +} + +sub config_dialog { + my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100, + child => (my $vbox = new CFClient::UI::VBox); + $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); + $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); + + $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); + $table->add (1, 0, my $hbox = new CFClient::UI::HBox); + + $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); + $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8); + + $mode_slider->connect (changed => sub { + my ($self, $value) = @_; + + $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; + $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); + }); + $mode_slider->emit (changed => $mode_slider->{range}[0]); + + $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen"); + $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { + my ($self, $value) = @_; + $CFG->{fullscreen} = $value; + }); + + $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly"); + $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { + my ($self, $value) = @_; + $CFG->{fast} = $value; + }); + + $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fog of War"); + $table->add (1, 2, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { + my ($self, $value) = @_; + $CFG->{fow_intensity} = $value; + }); + + $table->add (1, 4, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { + destroy_screen (); + init_screen (); + }); + + $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); + $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); + $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); + $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}); + + $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); + $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}); + + $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); + $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}); + + $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); + $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1); + + $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size"); + $table->add (1, 6, new CFClient::UI::Slider + req_w => 100, + range => [$CFG->{mapsize}, 10, 100 + 1, 1], + connect_changed => sub { + my ($self, $value) = @_; + + $CFG->{mapsize} = $self->{range}[0] = $value = int $value; + }, + ); + + $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { + start_game; + }); + + $vbox->add (my $hbox = new CFClient::UI::HBox); + + $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub { + CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; + status "Configuration Saved"; + }); + $CFClient::UI::TOPLEVEL->add ($dialog); +} + +sub sdl_init { + SDL::Init SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO + and die "SDL::Init failed!\n"; +} + +sub init_screen { + sdl_init; + + ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; + $FULLSCREEN = $CFG->{fullscreen}; + $FAST = $CFG->{fast}; + + SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; + SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5; + SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5; + SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0; + + SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0; + SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0; + SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0; + SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0; + + SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1; + SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15; + SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0; + + SDL::SetVideoMode $WIDTH, $HEIGHT, 0, + SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF + | ($FULLSCREEN ? SDL_FULLSCREEN : 0) + or die "SDL::SetVideoMode failed!\n"; + + SDL::WMSetCaption "Crossfire+ Client", "Crossfire+"; + + $SDL_EV = new SDL::Event; + $SDL_EV->set_unicode (1); - undef $SDL_APP; + $SDL_ACTIVE = 1; + + $LAST_REFRESH = time - 0.01; + + CFClient::gl_init; + + $FONTSIZE = int $HEIGHT / 40; + + ############################################################################# + + $DEBUG_STATUS = new CFClient::UI::Label padding => 0; + $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); + + $STATUS_LINE = new CFClient::UI::Label + padding => 0, + y => $HEIGHT * 49 / 50 - $FONTSIZE; + $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); + + $ALT_ENTER_MESSAGE = new CFClient::UI::Label + padding => 0, + y => $HEIGHT * 49 / 50, + height => $HEIGHT / 50, + text => "Use Alt-Enter to toggle fullscreen mode"; + $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); + + $MAPWIDGET = new CFClient::UI::MapWidget; + $CFClient::UI::TOPLEVEL->add ($MAPWIDGET); + $MAPWIDGET->focus_in; + + config_dialog; +} + +sub destroy_screen { + $CFClient::UI::TOPLEVEL->{children} = []; + undef $SDL_ACTIVE; + undef $SDL_EV; SDL::Quit; } -sub refresh { - glClearColor 0, 0, 0, 0; +my %animate_object; +my $animate_timer; + +my $want_refresh; +my $can_refresh; + +my $fps = 9; + +sub force_refresh { + $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; + debug sprintf "%3.2f", $fps; + + $want_refresh = 0; + $can_refresh = 0; + + glViewport 0, 0, $WIDTH, $HEIGHT; + + glMatrixMode GL_PROJECTION; + glLoadIdentity; + glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; + glMatrixMode GL_MODELVIEW; + glLoadIdentity; + + glClearColor +($CFG->{fow_intensity}) x 3, 1; glClear GL_COLOR_BUFFER_BIT; - for (values %Client::Widget::ACTIVE_WIDGETS) { - $_->draw - } + $CFClient::UI::TOPLEVEL->draw; SDL::GLSwapBuffers; + + $LAST_REFRESH = $NOW; +} + +my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { + $NOW = time; + + ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() + while $SDL_EV->poll; + + if (%animate_object) { + $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; + $want_refresh++; + } + + if ($want_refresh) { + force_refresh; + } else { + $can_refresh = 1; + } +}); + +sub refresh { + $want_refresh++; +} + +sub animation_start { + my ($widget) = @_; + $animate_object{$widget} = $widget; +} + +sub animation_stop { + my ($widget) = @_; + delete $animate_object{$widget}; +} + +@conn::ISA = Crossfire::Protocol::; + +sub conn::user_send { + my ($self, $command) = @_; + + $self->send ($command); + status $command; +} + +sub conn::map_update { + my ($self, $dirty) = @_; + + $MAPWIDGET->update; +} + +sub conn::map_scroll { + my ($self, $dx, $dy) = @_; + +# refresh; +} + +sub conn::map_clear { + my ($self) = @_; + +# refresh; +} + +sub conn::face_find { + my ($self, $face) = @_; + + $FACECACHE->{"$face->{chksum},$face->{name}"} +} + +sub conn::face_update { + my ($self, $face) = @_; + + $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; + + $face->{texture} = new_from_image CFClient::Texture delete $face->{image}; +} + +sub conn::query { + my ($self, $flags, $prompt) = @_; + + warn "<<<>>\n";#d# } %SDL_CB = ( SDL_QUIT() => sub { - warn "sdl quit\n";#d# - exit; + Event::unloop -1; }, SDL_VIDEORESIZE() => sub { }, @@ -102,69 +361,73 @@ refresh; }, SDL_KEYDOWN() => sub { - Client::Widget::feed_sdl_key_down_event ($SDL_EV); + if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { + # alt-enter + $FULLSCREEN = !$FULLSCREEN; + destroy_screen; + init_screen; + } else { + CFClient::UI::feed_sdl_key_down_event ($SDL_EV); + } }, SDL_KEYUP() => sub { - Client::Widget::feed_sdl_key_up_event ($SDL_EV); + CFClient::UI::feed_sdl_key_up_event ($SDL_EV); }, SDL_MOUSEMOTION() => sub { - warn "sdl motion\n";#d# + CFClient::UI::feed_sdl_motion_event ($SDL_EV); }, SDL_MOUSEBUTTONDOWN() => sub { - Client::Widget::feed_sdl_button_down_event ($SDL_EV); + CFClient::UI::feed_sdl_button_down_event ($SDL_EV); }, SDL_MOUSEBUTTONUP() => sub { - Client::Widget::feed_sdl_button_up_event ($SDL_EV); + CFClient::UI::feed_sdl_button_up_event ($SDL_EV); }, SDL_ACTIVEEVENT() => sub { - warn "active\n";#d# +# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# }, ); -@conn::ISA = Crossfire::Protocol::; - -sub conn::map_update { - my ($self, $dirty) = @_; +############################################################################# - refresh; -} +CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; -sub conn::map_scroll { - my ($self, $dx, $dy) = @_; +my %DEF_CFG = ( + width => 640, + height => 480, + fast => 0, + fow_intensity => 0.45, + fullscreen => 0, + sdl_mode => 0, + mapsize => 100, + host => "crossfire.schmorp.de", + port => 13327, +); - refresh; +while (my ($k, $v) = each %DEF_CFG) { + $CFG->{$k} = $v unless exists $CFG->{$k}; } -sub conn::map_clear { - my ($self) = @_; +sdl_init; - refresh; -} +@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)], + @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL }; -sub conn::face_update { - my ($self, $num, $face) = @_; +@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; -} +$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; -############################################################################# +init_screen; + +{ + my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); -my $mapwidget = Client::MapWidget->new; + CFClient::add_font $_ for @fonts; + CFClient::set_font $fonts[0]; +} -$mapwidget->activate; -$mapwidget->focus_in; +$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; -Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc"; +Event::loop; -$CFG ||= { - width => 640, - height => 480, - fullscreen => 0, - host => "crossfire.schmorp.de", - port => 13327, -}; - -Client::Util::run_config_dialog - login => sub { start_game }, - logout => sub { stop_game }; +Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; -main Gtk2;