--- deliantra/Deliantra-Client/bin/pclient 2006/04/12 23:37:38 1.93
+++ deliantra/Deliantra-Client/bin/pclient 2006/04/15 00:04:59 1.107
@@ -36,9 +36,10 @@
our $WIDTH;
our $HEIGHT;
our $FULLSCREEN;
+our $FONTSIZE;
+our $MAP;
our $MAPWIDGET;
-our $FONTSIZE;
our $SDL_ACTIVE;
our $SDL_EV;
@@ -47,6 +48,9 @@
our $ALT_ENTER_MESSAGE;
our $STATUS_LINE;
our $DEBUG_STATUS;
+our $BUTTONBAR;
+our $LOGVIEW;
+our $CONSOLE;
sub status {
$STATUS_LINE->set_text ($_[0]);
@@ -63,8 +67,10 @@
sub start_game {
status "logging in...";
- my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+ my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+ $MAP = new CFClient::Map $mapsize, $mapsize;
+
$CONN = new conn
host => $CFG->{host},
port => $CFG->{port},
@@ -84,7 +90,7 @@
}
sub config_dialog {
- my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
+ my $dialog = new CFClient::UI::FancyFrame
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]);
@@ -116,18 +122,30 @@
});
$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
- $table->add (1, 3, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
+ $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{fow_enable} = $value;
+ });
+
+ $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
+ $table->add (1, 4, 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 (0, 4, new CFClient::UI::Label align => 1, text => "Smooth FoW");
- $table->add (1, 4, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
+ $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
+ $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
my ($self, $value) = @_;
$CFG->{fow_smooth} = $value;
});
- $table->add (1, 5, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
+ $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize");
+ $table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
+ my ($self, $value) = @_;
+ $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
+ });
+
+ $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
destroy_screen ();
init_screen ();
});
@@ -135,19 +153,37 @@
$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 (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{host} = $value;
+ });
+
$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 (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{port} = $value;
+ });
$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 (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{user} = $value;
+ });
$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 (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{password} = $value;
+ });
- $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
- $table->add (1, 6, new CFClient::UI::Slider
+ $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
+ $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{say_command} = $value;
+ });
+
+ $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
+ $table->add (1, 7, new CFClient::UI::Slider
req_w => 100,
range => [$CFG->{mapsize}, 10, 100 + 1, 1],
connect_changed => sub {
@@ -157,7 +193,7 @@
},
);
- $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
+ $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
start_game;
});
@@ -167,7 +203,47 @@
CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
status "Configuration Saved";
});
- $CFClient::UI::TOPLEVEL->add ($dialog);
+
+ $dialog
+}
+
+sub console_window {
+ my $window = new CFClient::UI::FancyFrame
+ border_bg => [1, 1, 1, 0.5],
+ bg => [0.3, 0.3, 0.3, 0.8],
+ user_w => $::WIDTH/4,
+ user_h => $::HEIGHT,
+ child => (my $vbox = new CFClient::UI::VBox);
+
+ $vbox->add ($LOGVIEW = new CFClient::UI::TextView
+ expand => 1,
+ fontsize => $::CFG->{log_fontsize},
+ );
+
+ $vbox->add (my $input = new CFClient::UI::LineEntry);
+ $input->connect (activate => sub {
+ my ($input, $text) = @_;
+ $input->set_text ('');
+
+ if ($text =~ /^\/(.*)/) {
+ $::CONN->user_send ("command $1");
+ } else {
+ my $say_cmd = $::CFG->{say_command} || 'say';
+ $::CONN->user_send ("command $say_cmd $text");
+ }
+ 1
+ });
+ $input->connect (escape => sub {
+ $MAPWIDGET->focus_in
+ });
+ $input->focus_in;
+
+ $CONSOLE = {
+ window => $window,
+ input => $input
+ };
+
+ $window
}
sub sdl_init {
@@ -216,26 +292,39 @@
#############################################################################
- $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
+ $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
$STATUS_LINE = new CFClient::UI::Label
padding => 0,
- y => $HEIGHT * 49 / 50 - $FONTSIZE;
+ y => $HEIGHT * 44 / 45 - $FONTSIZE;
$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
$ALT_ENTER_MESSAGE = new CFClient::UI::Label
padding => 0,
- y => $HEIGHT * 49 / 50,
- height => $HEIGHT / 50,
+ y => $HEIGHT * 44 / 45,
+ height => $HEIGHT / 45,
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);
+ $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
$MAPWIDGET->focus_in;
+ $MAPWIDGET->connect (activate_console => sub {
+ my ($mapwidget, $preset) = @_;
+
+ if ($CONSOLE) {
+ $CONSOLE->{input}->focus_in;
- config_dialog;
+ if ($preset && $CONSOLE->{input}->get_text eq '') {
+ $CONSOLE->{input}->set_text ($preset);
+ }
+ }
+ });
+
+ $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
+
+ $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
+ $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
}
sub destroy_screen {
@@ -260,17 +349,6 @@
$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;
-
$CFClient::UI::TOPLEVEL->draw;
SDL::GLSwapBuffers;
@@ -319,21 +397,27 @@
status $command;
}
-sub conn::map_update {
- my ($self, $dirty) = @_;
+sub conn::feed_map1a {
+ my ($self, $data) = @_;
+
+# $self->Crossfire::Protocol::feed_map1a ($data);
+ $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
+ $MAP->map1a_update ($data);
$MAPWIDGET->update;
}
-sub conn::map_scroll {
- my ($self, $dx, $dy) = @_;
-
-# refresh;
-}
+#sub conn::map_update {
+# my ($self, $dirty) = @_;
+#
+# $MAPWIDGET->update;
+#}
sub conn::map_clear {
my ($self) = @_;
+ $MAP->clear;
+
# refresh;
}
@@ -344,19 +428,45 @@
}
sub conn::face_update {
- my ($self, $face) = @_;
+ my ($self, $facenum, $face) = @_;
$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
- $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
+ my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
+
+ $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+ $MAPWIDGET->update;
}
sub conn::query {
my ($self, $flags, $prompt) = @_;
+ #TODO
warn "<<<>>\n";#d#
}
+sub conn::drawinfo {
+ my ($self, $color, $text) = @_;
+
+ my @color = (
+ [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
+ [1.00, 1.00, 1.00],
+ [0.00, 0.00, 0.55],
+ [1.00, 0.00, 0.00],
+ [1.00, 0.54, 0.00],
+ [0.11, 0.56, 1.00],
+ [0.93, 0.46, 0.00],
+ [0.18, 0.54, 0.34],
+ [0.56, 0.73, 0.56],
+ [0.80, 0.80, 0.80],
+ [0.55, 0.41, 0.13],
+ [0.99, 0.77, 0.26],
+ [0.74, 0.65, 0.41],
+ );
+
+ $LOGVIEW->add_paragraph ($color[$color], $text);
+}
+
%SDL_CB = (
SDL_QUIT() => sub {
Event::unloop -1;
@@ -369,8 +479,8 @@
SDL_KEYDOWN() => sub {
if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
# alt-enter
- $FULLSCREEN = !$FULLSCREEN;
destroy_screen;
+ $CFG->{fullscreen} = !$CFG->{fullscreen};
init_screen;
} else {
CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
@@ -398,16 +508,19 @@
CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
my %DEF_CFG = (
+ sdl_mode => 0,
width => 640,
height => 480,
+ fullscreen => 0,
fast => 0,
+ fow_enable => 1,
fow_intensity => 0.45,
fow_smooth => 0,
- fullscreen => 0,
- sdl_mode => 0,
+ log_fontsize => 14,
mapsize => 100,
host => "crossfire.schmorp.de",
port => 13327,
+ say_command => 'say',
);
while (my ($k, $v) = each %DEF_CFG) {