--- deliantra/Deliantra-Client/bin/pclient 2006/05/08 20:55:49 1.203 +++ deliantra/Deliantra-Client/bin/pclient 2006/05/15 18:23:33 1.217 @@ -39,6 +39,7 @@ use CFClient::MapWidget; $Event::DIED = sub { + # TODO: display dialog box or so CFClient::error $_[1]; }; @@ -62,6 +63,9 @@ our $CONN; our $FAST; # fast, low-quality mode, possibly useful for software-rendering +our $WANT_REFRESH; +our $CAN_REFRESH; + our @SDL_MODES; our $WIDTH; our $HEIGHT; @@ -92,20 +96,22 @@ our %AUDIO_CHUNKS; # audio files our $ALT_ENTER_MESSAGE; -our $STATUS_LINE; +our $STATUSBOX; our $DEBUG_STATUS; our $INVWIN; our $INV; +our $INVR; +our $OPENCONT; sub status { - $STATUS_LINE->set_text ($_[0]); - $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h}); + $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]); } sub debug { $DEBUG_STATUS->set_text ($_[0]); - $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); + my ($w, $h) = $DEBUG_STATUS->size_request; + $DEBUG_STATUS->move ($WIDTH - $w, 0); } sub start_game { @@ -162,7 +168,7 @@ $table->add (0, 0, new CFClient::UI::Label valign => 0, 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_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); $mode_slider->connect (changed => sub { @@ -197,11 +203,11 @@ $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); $table->add (1, $row++, new CFClient::UI::Slider - range => [$CFG->{map_scale}, 0.25, 2, 0.05], + range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05], tooltip => "Enlarge or shrink the displayed map", connect_changed => sub { my ($self, $value) = @_; - $CFG->{map_scale} = 0.05 * int $value / 0.05; + $CFG->{map_scale} = $value; } ); @@ -238,30 +244,25 @@ $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); $table->add (1, $row++, new CFClient::UI::Slider - range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], + range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1], tooltip => "The font size used by most GUI elements", - connect_changed => sub { - $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; -# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; - } + connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, ); $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); $table->add (1, $row++, new CFClient::UI::Slider - range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], + range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1], tooltip => "The font size used by the server log window only", - connect_changed => sub { - $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10); - } + connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, ); $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); $table->add (1, $row++, new CFClient::UI::Slider - range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], + range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1], tooltip => "The font size used by the statistics window only", connect_changed => sub { - $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; + $CFG->{stat_fontsize} = $_[1]; &set_stats_window_fontsize; } ); @@ -272,18 +273,16 @@ tooltip => "Adjust the size of the stats gauges at the bottom right", connect_changed => sub { $CFG->{gauge_size} = $_[1]; - my $h = int $HEIGHT * $CFG->{gauge_size}; - $GAUGES->{win}->set_size ($WIDTH, $h); - $GAUGES->{win}->move (0, $HEIGHT - $h); + $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); } ); $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); $table->add (1, $row++, new CFClient::UI::Slider - range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], + range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1], tooltip => "Adjusts the fontsize of the gauges at the bottom right", connect_changed => sub { - $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; + $CFG->{gauge_fontsize} = $_[1]; &set_gauge_window_fontsize; } ); @@ -367,16 +366,21 @@ } sub make_gauge_window { - my $gh = int ($HEIGHT * $CFG->{gauge_size}); -# my $gw = int ($WIDTH * $CFG->{gauge_w_size}); + my $gh = int $HEIGHT * $CFG->{gauge_size}; my $win = new CFClient::UI::Frame ( - y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh + req_y => -1, + user_w => $WIDTH, + user_h => $gh, ); + $win->add (my $hbox = new CFClient::UI::HBox children => [ (new CFClient::UI::HBox expand => 1), - ($FLOORBOX = new CFClient::UI::VBox), + (new CFClient::UI::VBox children => [ + (new CFClient::UI::Empty expand => 1), + (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)), + ]), (my $vbox = new CFClient::UI::VBox), ], ); @@ -729,7 +733,7 @@ $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); $table->add (1, 7, new CFClient::UI::Slider req_w => 100, - range => [$CFG->{mapsize}, 10, 100 + 1, 1], + range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1], tooltip => "This is the size of the portion of the map update the server sends you. " ."If you set this to a high value you will be able to see further for example.", connect_changed => sub { @@ -807,8 +811,13 @@ } sub make_inventory_window { - my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; - $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); + my $invwin = new CFClient::UI::FancyFrame + user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory"; + + $invwin->add (my $hb = new CFClient::UI::HBox); + $hb->add ($INV = new CFClient::UI::Inventory expand => 1); + $hb->add ($INVR = new CFClient::UI::Inventory expand => 1); + $invwin } @@ -840,27 +849,20 @@ ############################################################################# - if ($DEBUG_STATUS) { - # reconfigure all widgets - $CFClient::UI::ROOT->reconfigure; - - } else { + unless ($DEBUG_STATUS) { # create the widgets - $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; + $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; $DEBUG_STATUS->show; - $STATUS_LINE = new CFClient::UI::Label - padding => 0, - y => $HEIGHT - $FONTSIZE * 1.8; - $STATUS_LINE->show; - - $ALT_ENTER_MESSAGE = new CFClient::UI::Label - padding => 0, - fontsize => 0.8, - markup => "Use Alt-Enter to toggle fullscreen mode"; - $ALT_ENTER_MESSAGE->show; - $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h}); + $STATUSBOX = new CFClient::UI::Statusbox; + $STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); + + (new CFClient::UI::Frame + bg => [0, 0, 0, 0.4], + req_y => -1, + child => $STATUSBOX, + )->show; CFClient::UI::FancyFrame->new ( border_bg => [1, 1, 1, 192/255], @@ -902,7 +904,15 @@ $BUTTONBAR->show; - $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup + $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); + + # delay till geometry is constant + $CFClient::UI::ROOT->on_post_alloc (startup => sub { + $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup + my $widget = $GAUGES->{win}; + $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel + }); + force_refresh (); } } @@ -968,22 +978,17 @@ 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; + $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; debug sprintf "%3.2f", $fps; - $want_refresh = 0; - $can_refresh = 0; - $CFClient::UI::ROOT->draw; - CFClient::SDL_GL_SwapBuffers; + $WANT_REFRESH = 0; + $CAN_REFRESH = 0; $LAST_REFRESH = $NOW; } @@ -995,20 +1000,16 @@ if (%animate_object) { $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; - $want_refresh++; + $WANT_REFRESH++; } - if ($want_refresh) { + if ($WANT_REFRESH) { force_refresh; } else { - $can_refresh = 1; + $CAN_REFRESH = 1; } }); -sub refresh { - $want_refresh++; -} - sub animation_start { my ($widget) = @_; $animate_object{$widget} = $widget; @@ -1329,7 +1330,27 @@ [0.74, 0.65, 0.41], ); - $LOGVIEW->add_paragraph ($color[$color], $text); + my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; + + $text =~ s/&/&/g; $text =~ s/\1<\/b>/g; + $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g; + + $LOGVIEW->add_paragraph ($color[$color], + join "\n", map "$time $_", split /\n/, $text); + + $STATUSBOX->add ($text, + group => $text, + fg => $color[$color], + timeout => 60, + tooltip_font => $::FONT_FIXED, + ); +} + +sub conn::drawextinfo { + my ($self, $color, $type, $subtype, $message) = @_; + + $self->drawinfo ($color, $message); } sub conn::spell_add { @@ -1370,21 +1391,35 @@ $FLOORBOX->clear; $FLOORBOX->add (new CFClient::UI::Empty expand => 1); - # we basically have to use the same sorting as everybody else - for my $item (@{ $CONN->{container}{0} }) { - $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item); + my $count = 4; + for (@{ $CONN->{container}{0} }) { + if (--$count) { + $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_); + } else { + $FLOORBOX->add (new CFClient::UI::Label text => "More..."); + last; + } } }); - refresh; + + $WANT_REFRESH++; } sub conn::container_add { my ($self, $tag, $items) = @_; - update_floorbox if $tag == 0; + print "container_add on conainer $tag (player: $self->{player}{tag})\n"; - $INV->set_items ($self->{container}{$self->{player}{tag}}) - if $tag == $self->{player}{tag}; + if ($tag == 0) { + update_floorbox; + $INVR->set_items ($self->{container}{0}); + $OPENCONT = 0; + } elsif ($tag == $self->{player}{tag}) { + $INV->set_items ($self->{container}{$self->{player}{tag}}) + } else { + $OPENCONT = $tag; + $INVR->set_items ($self->{container}{$tag}); + } # $self-<{player}{tag} => player inv #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; @@ -1393,10 +1428,18 @@ sub conn::container_clear { my ($self, $tag) = @_; - update_floorbox if $tag == 0; + print "container_clear on conainer $tag (player: $self->{player}{tag})\n"; - $INV->set_items ($self->{container}{$tag}) - if $tag == $self->{player}{tag}; + if ($tag == 0) { + update_floorbox; + $INVR->set_items ($self->{container}{0}); + $OPENCONT = 0; + } elsif ($tag == $self->{player}{tag}) { + $INV->set_items ($self->{container}{$tag}) + } else { + $INVR->set_items ($self->{container}{$tag}); + $OPENCONT = $tag; + } # use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; } @@ -1405,20 +1448,29 @@ my ($self, @items) = @_; for (@items) { - update_floorbox if $_->{container} == 0; - - $INV->set_items ($self->{container}{$_->{container}}) - if $_->{container} == $self->{player}{tag}; + print "item_delete on container $_->{container} (player: $self->{player}{tag})\n"; + if ($_->{container} == 0) { + update_floorbox; + $INVR->set_items ($self->{container}{0}); + } elsif ($_->{container} == $self->{player}{tag}) { + $INV->set_items ($self->{container}{$self->{player}{tag}}) + } else { + $INVR->set_items ($self->{container}{0}); + } } } sub conn::item_update { my ($self, $item) = @_; - update_floorbox if $item->{container} == 0; + print "item_update: container: $item->{container} (player: $self->{player}{tag})\n"; - $INV->set_items ($self->{container}{$item->{container}}) - if $item->{container}; == $self->{player}{tag}; + if ($item->{container} == 0) { + update_floorbox; + $INVR->set_items ($self->{container}{0}); + } elsif ($item->{container} == $self->{player}{tag}) { + $INV->set_items ($self->{container}{$item->{container}}) + } } %SDL_CB = ( @@ -1427,7 +1479,9 @@ }, CFClient::SDL_VIDEORESIZE => sub { }, - CFClient::SDL_VIDEOEXPOSE => \&refresh, + CFClient::SDL_VIDEOEXPOSE => sub { + $WANT_REFRESH++; + }, CFClient::SDL_ACTIVEEVENT => sub { # printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# }, @@ -1458,70 +1512,76 @@ $SIG{INT} = $SIG{TERM} = sub { exit }; -CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; +{ + local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; -$TILECACHE = CFClient::db_table "tilecache"; -$FACEMAP = CFClient::db_table "facemap"; + CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; -my %DEF_CFG = ( - sdl_mode => 0, - width => 640, - height => 480, - fullscreen => 0, - fast => 0, - map_scale => 0.5, - fow_enable => 1, - fow_intensity => 0.45, - fow_smooth => 0, - gui_fontsize => 1, - log_fontsize => 1, - gauge_fontsize => 1, - gauge_size => 0.35, - stat_fontsize => 1, - mapsize => 100, - host => "crossfire.schmorp.de", - say_command => 'say', - audio_enable => 1, - bgm_enable => 1, - bgm_volume => 0.25, -); + $TILECACHE = CFClient::db_table "tilecache"; + $FACEMAP = CFClient::db_table "facemap"; -while (my ($k, $v) = each %DEF_CFG) { - $CFG->{$k} = $v unless exists $CFG->{$k}; -} + my %DEF_CFG = ( + sdl_mode => 0, + width => 640, + height => 480, + fullscreen => 0, + fast => 0, + map_scale => 0.5, + fow_enable => 1, + fow_intensity => 0.45, + fow_smooth => 0, + gui_fontsize => 1, + log_fontsize => 1, + gauge_fontsize=> 1, + gauge_size => 0.35, + stat_fontsize => 1, + mapsize => 100, + host => "crossfire.schmorp.de", + say_command => 'say', + audio_enable => 1, + bgm_enable => 1, + bgm_volume => 0.25, + ); -sdl_init; + while (my ($k, $v) = each %DEF_CFG) { + $CFG->{$k} = $v unless exists $CFG->{$k}; + } -@SDL_MODES = reverse - grep $_->[0] >= 640 && $_->[1] >= 480, - CFClient::SDL_ListModes; + sdl_init; -@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; + @SDL_MODES = reverse + grep $_->[0] >= 640 && $_->[1] >= 480, + CFClient::SDL_ListModes; -$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; + @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; -{ - my @fonts = map CFClient::find_rcfile "fonts/$_", qw( - DejaVuSans.ttf - DejaVuSansMono.ttf - DejaVuSans-Bold.ttf - DejaVuSansMono-Bold.ttf - DejaVuSans-Oblique.ttf - DejaVuSansMono-Oblique.ttf - DejaVuSans-BoldOblique.ttf - DejaVuSansMono-BoldOblique.ttf - ); + $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; - CFClient::add_font $_ for @fonts; - - $FONT_PROP = new_from_file CFClient::Font $fonts[0]; - $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; + { + my @fonts = map CFClient::find_rcfile "fonts/$_", qw( + DejaVuSans.ttf + DejaVuSansMono.ttf + DejaVuSans-Bold.ttf + DejaVuSansMono-Bold.ttf + DejaVuSans-Oblique.ttf + DejaVuSansMono-Oblique.ttf + DejaVuSans-BoldOblique.ttf + DejaVuSansMono-BoldOblique.ttf + ); - $FONT_PROP->make_default; -} + CFClient::add_font $_ for @fonts; + + CFClient::pango_init; + + $FONT_PROP = new_from_file CFClient::Font $fonts[0]; + $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; -video_init; -audio_init; + $FONT_PROP->make_default; + } + + video_init; + audio_init; +} Event::loop;