--- deliantra/Deliantra-Client/bin/cfplus 2006/06/07 05:54:09 1.63 +++ deliantra/Deliantra-Client/bin/cfplus 2006/06/11 18:36:15 1.67 @@ -86,6 +86,7 @@ our $LOGIN_BUTTON; our $QUIT_DIALOG; our $HOST_ENTRY; +our $SERVER_INFO; our $SETUP_DIALOG; our $SETUP_NOTEBOOK; @@ -239,13 +240,13 @@ my ($sw1, $sw2) = map +(new CFClient::UI::Combobox value => $_, options => [ - [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"], - [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], - [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"], - [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"], - [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"], - [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"], - [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"], + [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], + [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], + [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], + [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"], + [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"], + [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], + [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], ], ), 1 .. 2; @@ -627,6 +628,33 @@ $win } +sub debug_setup { + my $table = new CFClient::UI::Table; + + $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); + $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 }); + $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); + $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 }); + $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); + $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 }); + $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); + $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 }); + + my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); + + for my $x (0..2) { + for my $y (0 .. 2) { + $table->add ($x + 3, $y, + new CFClient::UI::Entry + text => $default_smooth[$x * 3 + $y], + on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, + ); + } + } + + + $table +} sub stats_window { my $tgw = new CFClient::UI::FancyFrame @@ -1051,6 +1079,15 @@ } ); + $vbox->add (new CFClient::UI::Label + text => "Server Info", + fontsize => 1.2, + padding_y => 8, + fg => [1, 1, 0, 1], + ); + + $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); + $vbox } @@ -1184,6 +1221,7 @@ ["Ignore cursed" => PICKUP_NOT_CURSED], ["Jewelery" => PICKUP_JEWELS], ], + ["Weight/Value ratio", 2, 17] ) { my ($title, $x, $y, @bits) = @$_; @@ -1211,6 +1249,25 @@ } } + $table->add (2, 18, new CFClient::UI::ValSlider + range => [0, 0, 16, 1, 1], + to_value => sub { ">= " . 5 * $_[0] }, + on_changed => sub { + my ($slider, $value) = @_; + + $::CFG->{pickup} &= ~0x7; + $::CFG->{pickup} |= int $value + if $value; + 1; + }); + $table->add (3, 18, new CFClient::UI::Button + text => "set", + on_activate => sub { + $::CONN->send_command ("pickup $::CFG->{pickup}") + if defined $::CONN; + 1; + }); + $table } @@ -1337,7 +1394,7 @@ $vb } -sub make_help_window { +sub help_window { my $win = new CFClient::UI::FancyFrame x => 'center', y => 'center', @@ -1350,33 +1407,40 @@ $win->add (my $vbox = new CFClient::UI::VBox); $vbox->add (my $buttons = new CFClient::UI::HBox); - $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); - - for ( - [intro => "Introduction"], - [manual => "Manual"], - [command_help => "Commands"], - [skill_help => "Skills"], - ) { - my ($pod, $label) = @$_; + $vbox->add (my $viewer = new CFClient::UI::TextScroller + expand => 1, fontsize => 0.8, padding_x => 4); - $buttons->add (new CFClient::UI::Button - text => $label, - on_activate => sub { - my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", - doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; + $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); + $buttons->add (my $combo = new CFClient::UI::Combobox + value => undef, + options => [ + [intro => "Introduction"], + [manual => "Manual"], + [skill_help => "Skills"], + [command_help => "Commands"], + [dmcommand_help => "DM Commands"], + [COPYING => "License Terms"], + ], + on_changed => sub { + my ($self, $pod) = @_; - $viewer->clear; - - $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) - for @$pom; + my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", + doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; - $viewer->set_offset (0); - }, - ); - } + $viewer->clear; + + $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) + for @$pom; - $viewer->add_paragraph ([1, 1, 0, 1], "Use one of the buttons above to display a document."); + $viewer->set_offset (0); + }, + on_visibility_change => sub { + my ($self, $visible) = @_; + return unless $visible; + return if $self->{value}; + $self->set_value ("intro"); + }, + ); $win } @@ -1463,7 +1527,7 @@ $MAPWIDGET->show; $MAPWIDGET->focus_in; - $LOGVIEW = new CFClient::UI::TextView + $LOGVIEW = new CFClient::UI::TextScroller expand => 1, font => $FONT_FIXED, fontsize => $::CFG->{log_fontsize}, @@ -1503,6 +1567,8 @@ . "binding editor closes"); $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, "Displays all spells you have and lets you edit keyboard shortcuts for them."); + $SETUP_NOTEBOOK->add (Debug => debug_setup, + "Some debuggign options. Do not ask."); $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top @@ -1530,7 +1596,7 @@ }, ); - $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, + $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, tooltip => "View Documentation"); $BUTTONBAR->add (new CFClient::UI::Button