--- deliantra/Deliantra-Client/bin/pclient 2006/04/07 16:36:44 1.14 +++ deliantra/Deliantra-Client/bin/pclient 2006/04/07 20:15:01 1.23 @@ -1,5 +1,4 @@ #!/opt/bin/perl - use strict; use Glib; @@ -16,7 +15,10 @@ use Crossfire::Client; use Crossfire::Protocol; -use Client::Util; +use Crossfire::Client::Util; +use Crossfire::Client::Widget; + +our $FACECACHE; our $VERSION = '0.1'; @@ -28,9 +30,9 @@ our $SDL_EV = new SDL::Event; our %SDL_CB; +our @GL_INIT; # hooks called on every gl init + sub init_screen { - # nuke all gl context data - $SDL_APP = new SDL::App -flags => SDL_ANYFORMAT | SDL_HWSURFACE, -title => "Crossfire+ Client", @@ -44,6 +46,8 @@ -fullscreen => $CFG->{fullscreen}, -resizeable => 0; + glClearColor 0, 0, 0, 0; + glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; glShadeModel GL_FLAT; @@ -53,9 +57,11 @@ glMatrixMode GL_PROJECTION; glLoadIdentity; - glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1; + glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -100 , 100; - # re-bind all textures + glMatrixMode GL_MODELVIEW; + + $_->() for @GL_INIT; } sub start_game { @@ -82,42 +88,16 @@ } sub refresh { - glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; - my $map = $CONN->{map}; - - for my $x (0 .. $CONN->{mapw} - 1) { - for my $y (0 .. $CONN->{maph} - 1) { - - my $cell = $map->[$x][$y] - or next; - - my $darkness = $cell->[3] * (1 / 255); - glColor $darkness, $darkness, $darkness; - - for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { - my $tex = $CONN->{face}[$num]{texture} || 0; - - glBindTexture GL_TEXTURE_2D, $tex; - - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex $x, $y; - glTexCoord 0, 1; glVertex $x, $y + 1; - glTexCoord 1, 1; glVertex $x + 1, $y + 1; - glTexCoord 1, 0; glVertex $x + 1, $y; - glEnd; - } - } - } + $_->draw for values %Crossfire::Client::Widget::ACTIVE_WIDGETS; SDL::GLSwapBuffers; } %SDL_CB = ( SDL_QUIT() => sub { - warn "sdl quit\n";#d# - exit; + main_quit Gtk2; }, SDL_VIDEORESIZE() => sub { }, @@ -125,15 +105,25 @@ refresh; }, SDL_KEYDOWN() => sub { + if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { + # alt-enter + $CFG->{fullscreen} = !$CFG->{fullscreen}; + init_screen; + } else { + Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); + } }, SDL_KEYUP() => sub { + Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); }, SDL_MOUSEMOTION() => sub { warn "sdl motion\n";#d# }, SDL_MOUSEBUTTONDOWN() => sub { + Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); }, SDL_MOUSEBUTTONUP() => sub { + Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); }, SDL_ACTIVEEVENT() => sub { warn "active\n";#d# @@ -160,42 +150,126 @@ refresh; } +sub conn::face_find { + my ($self, $face) = @_; + + $FACECACHE->{"$face->{chksum},$face->{name}"} +} + sub conn::face_update { - my ($self, $num, $face) = @_; + my ($self, $face) = @_; + + $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; - my $pb = new Gtk2::Gdk::PixbufLoader; - $pb->write ($face->{image}); - $pb->close; - - $pb = $pb->get_pixbuf; - $pb = $pb->add_alpha (0, 0, 0, 0); - - glGetError(); - my ($tex) = @{glGenTextures 1}; - - $face->{texture} = $tex; - - glBindTexture GL_TEXTURE_2D, $tex; - my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr; - - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; - - glTexImage2D GL_TEXTURE_2D, 0, - GL_RGBA8, - $pb->get_width, $pb->get_height, - 0, - GL_RGBA, - GL_UNSIGNED_BYTE, - $pb->get_pixels; - my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr; + $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; } +sub gtk_add_cfg_field { + my ($tbl, $cfg, $klbl, $key, $value) = @_; + my $i = $cfg->{_i}++; + $tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1); + $tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1); + if ($key eq 'password') { + $ent->set_invisible_char ("*"); + $ent->set (visibility => 0) + } + $ent->set_text ($value); + $ent->signal_connect (changed => sub { + my ($ent) = @_; + $cfg->{$key} = $ent->get_text; + }); +} + +sub run_config_dialog { + my (%events) = @_; + + my $w = Gtk2::Window->new; + + my @cfg = ( + [qw/Host host/], + [qw/Port port/], + [qw/Username user/], + [qw/Password password/], + ); + + my $cfg = {}; + + my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE); + my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a; + + $w->add (my $vb = Gtk2::VBox->new); + $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); + my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; + $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); + $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); + my $i = 0; + my $act = 0; + for (map { "$_->[0]x$_->[1]" } reverse @modes) { + if ($_ eq $selmode) { $act = $i } + $cb->append_text ($_); + $i++; + } + $cb->set_active ($act); + $cb->signal_connect (changed => sub { + my ($cb) = @_; + my $txt = $cb->get_active_text; + if ($txt =~ m/(\d+)x(\d+)/) { + $::CFG->{width} = $1; + $::CFG->{height} = $2; + } + }); + + $cfg->{_i} = 1; + for (@cfg) { + gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]}); + } + + $vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0); + $hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5); + $cb->signal_connect (clicked => sub { + for (keys %$cfg) { + $::CFG->{$_} = $cfg->{$_} + if $_ ne '_i'; + } + Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; + }); + $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); + $cb->signal_connect (clicked => sub { + for (keys %$cfg) { + $::CFG->{$_} = $cfg->{$_} + if $_ ne '_i'; + } + my $cb = $events{login} || sub {}; + $cb->($::CFG->{user}, $::CFG->{password}); + }); + $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5); + $cb->signal_connect (clicked => sub { + my $cb = $events{login} || sub {}; + $cb->(); + }); + $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5); + $cb->signal_connect (clicked => sub { $w->destroy }); + + $w->show_all; + + $w->signal_connect (destroy => sub { Gtk2->main_quit }); +} + + ############################################################################# -Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc"; +SDL::Init(SDL_INIT_EVERYTHING()); + +my $mapwidget = Crossfire::Client::Widget::MapWidget->new; + +find_rcfile "uifont.ttf"; + +$mapwidget->activate; +$mapwidget->focus_in; + +Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; + +$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; $CFG ||= { width => 640, @@ -205,9 +279,10 @@ port => 13327, }; -Client::Util::run_config_dialog - login => sub { print "Login $_[0] with $_[1]\n" }, - logout => sub { print "Logout" }; +run_config_dialog + login => sub { start_game }, + logout => sub { stop_game }; main Gtk2; +Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";