--- deliantra/Deliantra-Client/bin/cfplus 2006/08/13 21:46:10 1.113
+++ deliantra/Deliantra-Client/bin/cfplus 2006/09/29 00:56:06 1.119
@@ -49,19 +49,11 @@
$Event::DIED = sub {
# TODO: display dialog box or so
Carp::cluck $_[1];#d#TODO: remove when stable
- CFPlus::error $_[1];
-};
-
-$SIG{__DIE__} = sub {
- return if CFPlus::in_destruct;
- Carp::cluck $_[0];
- CFPlus::error $_[0];
return;#d#
- #return unless defined $^S && !$^S;
- $Event::DIED->(undef, $_[0]);
+ CFPlus::fatal ($_[1]);
};
-our $VERSION = '0.1';
+our $VERSION = '0.9';
my $MAX_FPS = 60;
my $MIN_FPS = 5; # unused as of yet
@@ -157,7 +149,7 @@
sub server_query {
my ($conn, $flags, $prompt) = @_;
- $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame
+ $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
x => "center",
y => "center",
title => "Server Query",
@@ -369,6 +361,8 @@
mapw => $mapsize,
maph => $mapsize,
+ client => "cfplus $VERSION $] $^O",
+
map_widget => $MAPWIDGET,
logview => $LOGVIEW,
statusbox => $STATUSBOX,
@@ -665,14 +659,19 @@
);
$r->add (my $vb = new CFPlus::UI::VBox);
- $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
+ $vb->add (new CFPlus::UI::FancyFrame
+ label => "Player",
+ child => (my $pi = new CFPlus::UI::VBox),
+ );
+
+ $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
can_hover => 1, can_events => 1,
tooltip => "Your name and title. You can change your title by using the title command, if supported by the server.");
- $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
+ $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
can_hover => 1, can_events => 1,
tooltip => "The map you are currently on (if supported by the server).");
- $vb->add (my $hb0 = new CFPlus::UI::HBox);
+ $pi->add (my $hb0 = new CFPlus::UI::HBox);
$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
can_hover => 1, can_events => 1,
tooltip => "The weight of the player including all inventory items.");
@@ -680,7 +679,10 @@
can_hover => 1, can_events => 1,
tooltip => "The weight limit: you cannot carry more than this.");
- $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
+ $vb->add (new CFPlus::UI::FancyFrame
+ label => "Primary/Secondary Statistics",
+ child => (my $hb = new CFPlus::UI::HBox expand => 1),
+ );
$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
my $color2 = [1, 1, 0];
@@ -711,7 +713,10 @@
align => -1, text => $label, tooltip => "#stat_$label");
}
- $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
+ $vb->add (new CFPlus::UI::FancyFrame
+ label => "Resistancies",
+ child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
+ );
my $row = 0;
my $col = 0;
@@ -915,7 +920,7 @@
my $table = new CFPlus::UI::Table;
$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
- my $dialog = new CFPlus::UI::FancyFrame
+ my $dialog = new CFPlus::UI::Toplevel
title => "Server List",
name => 'metaserver_dialog',
x => 'center',
@@ -937,7 +942,10 @@
sub server_setup {
my $vbox = new CFPlus::UI::VBox;
- $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
+ $vbox->add (new CFPlus::UI::FancyFrame
+ label => "Connection Settings",
+ child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
+ );
$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
{
@@ -1031,7 +1039,7 @@
$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
- text => $CFG->{say_command},
+ text => $CFG->{say_command},
tooltip => "This is the command that will be used if you write a line in the message window entry or press \" in the map window. "
. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
. "But you could also set it to tell playername to only chat with that user.",
@@ -1042,20 +1050,27 @@
}
);
- $vbox->add (new CFPlus::UI::Label
- text => "Server Info",
- fontsize => 1.2,
- padding_y => 8,
- fg => [1, 1, 0, 1],
+ $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
+ $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
+ state => $CFG->{show_tips},
+ tooltip => "Show the Tip of the day window at startup?",
+ on_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{shop_tips} = $value;
+ 0
+ }
);
- $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
+ $vbox->add (new CFPlus::UI::FancyFrame
+ label => "Server Info",
+ child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
+ );
$vbox
}
sub message_window {
- my $window = new CFPlus::UI::FancyFrame
+ my $window = new CFPlus::UI::Toplevel
name => "message_window",
title => "Messages",
border_bg => [1, 1, 1, 1],
@@ -1117,62 +1132,6 @@
$window
}
-sub open_string_query {
- my $cb = $_[1];
- my $dialog = new CFPlus::UI::FancyFrame
- x => "center",
- y => "center",
- z => 50,
- force_w => $WIDTH * 4/5,
- title => $_[0];
-
- $dialog->add (
- my $e = new CFPlus::UI::Entry
- on_activate => sub { $cb->(@_); $dialog->hide; 0 },
- on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
- );
-
- $e->grab_focus;
- $dialog->show;
-}
-
-sub open_quit_dialog {
- unless ($QUIT_DIALOG) {
- $QUIT_DIALOG = new CFPlus::UI::FancyFrame
- x => "center",
- y => "center",
- z => 50,
- title => "Really Quit?",
- on_key_down => sub {
- my ($dialog, $ev) = @_;
- $ev->{sym} == 27 and $dialog->hide;
- }
- ;
-
- $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
-
- $vb->add (new CFPlus::UI::Label
- text => "You should find a savebed and apply it first!",
- max_w => $WIDTH * 0.25,
- ellipsize => 0,
- );
- $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
- $hb->add (new CFPlus::UI::Button
- text => "Ok",
- expand => 1,
- on_activate => sub { $QUIT_DIALOG->hide; 0 },
- );
- $hb->add (new CFPlus::UI::Button
- text => "Quit anyway",
- expand => 1,
- on_activate => sub { exit },
- );
- }
-
- $QUIT_DIALOG->show;
- $QUIT_DIALOG->grab_focus;
-}
-
sub autopickup_setup {
my $table = new CFPlus::UI::Table;
@@ -1337,7 +1296,7 @@
}
sub player_window {
- my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
+ my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
x => "center",
y => "center",
force_w => $WIDTH * 9/10,
@@ -1436,7 +1395,10 @@
};
my $vb = new CFPlus::UI::VBox;
- $vb->add (my $hb = new CFPlus::UI::HBox);
+ $vb->add (new CFPlus::UI::FancyFrame
+ label => "Options",
+ child => (my $hb = new CFPlus::UI::HBox),
+ );
$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
$hb->add (new CFPlus::UI::CheckBox
expand => 1,
@@ -1448,7 +1410,9 @@
0
});
- $vb->add ($binding_list);
+ $vb->add (new CFPlus::UI::FancyFrame
+ label => "Bindings",
+ child => $binding_list);
$vb->add (my $hb = new CFPlus::UI::HBox);
$hb->add (new CFPlus::UI::Button
@@ -1491,10 +1455,10 @@
}
sub help_window {
- my $win = new CFPlus::UI::FancyFrame
+ my $win = new CFPlus::UI::Toplevel
x => 'center',
y => 'center',
- z => 2,
+ z => 4,
name => 'doc_browser',
force_w => int $WIDTH * 7/8,
force_h => int $HEIGHT * 7/8,
@@ -1503,26 +1467,40 @@
$win->add (my $vbox = new CFPlus::UI::VBox);
- $vbox->add (my $buttons = new CFPlus::UI::HBox);
+ $vbox->add (new CFPlus::UI::FancyFrame
+ label => "Navigation",
+ child => (my $buttons = new CFPlus::UI::HBox),
+ );
$vbox->add (my $viewer = new CFPlus::UI::TextScroller
- expand => 1, fontsize => 0.8, padding_x => 4);
+ expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
my @history;
my @future;
my $curnode;
my $load_node; $load_node = sub {
- my ($node) = @_;
+ my ($node, $para) = @_;
$buttons->clear;
+ $buttons->add (new CFPlus::UI::Button
+ text => "⇤",
+ tooltip => "back to the starting page",
+ on_activate => sub {
+ unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
+ unshift @future, @history;
+ @history = ();
+ $load_node->(@{shift @future});
+ },
+ );
+
if (@history) {
$buttons->add (new CFPlus::UI::Button
text => "⋘",
- tooltip => "back to " . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "",
+ tooltip => "back to " . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "",
on_activate => sub {
- unshift @future, $curnode if $curnode;
- $load_node->(pop @history);
+ unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
+ $load_node->(@{pop @history});
},
);
}
@@ -1530,10 +1508,10 @@
if (@future) {
$buttons->add (new CFPlus::UI::Button
text => "⋙",
- tooltip => "forward to " . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "",
+ tooltip => "forward to " . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "",
on_activate => sub {
- push @history, $curnode;
- $load_node->(shift @future);
+ push @history, [$curnode, $viewer->current_paragraph];
+ $load_node->(@{shift @future});
},
);
}
@@ -1548,20 +1526,20 @@
text => $node->{kw}[0],
tooltip => "go to " . (CFPlus::asxml CFPlus::Pod::full_path $node) . "",
on_activate => sub {
- push @history, $curnode if $curnode; @future = ();
+ push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
$load_node->($node);
},
);
$buttons->add (new CFPlus::UI::Label text => "/");
}
- $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0]);
+ $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
$curnode = $node;
$viewer->clear;
$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
- $viewer->set_offset (0);
+ $viewer->scroll_to ($para);
};
$load_node->(CFPlus::Pod::find pod => "mainpage");
@@ -1569,15 +1547,125 @@
$CFPlus::Pod::goto_document = sub {
my (@path) = @_;
- push @history, $curnode if $curnode; @future = ();
+ push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
- $load_node->(CFPlus::Pod::find @path);
+ $load_node->((CFPlus::Pod::find @path)[0]);
$win->show;
};
$win
}
+sub open_string_query {
+ my ($title, $cb, $txt, $tooltip) = @_;
+ my $dialog = new CFPlus::UI::Toplevel
+ x => "center",
+ y => "center",
+ z => 50,
+ force_w => $WIDTH * 4/5,
+ title => $title;
+
+ $dialog->add (
+ my $e = new CFPlus::UI::Entry
+ on_activate => sub { $cb->(@_); $dialog->hide; 0 },
+ on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
+ tooltip => $tooltip
+ );
+
+ $e->grab_focus;
+ $e->set_text ($txt) if $txt;
+ $dialog->show;
+}
+
+sub open_quit_dialog {
+ unless ($QUIT_DIALOG) {
+ $QUIT_DIALOG = new CFPlus::UI::Toplevel
+ x => "center",
+ y => "center",
+ z => 50,
+ title => "Really Quit?",
+ on_key_down => sub {
+ my ($dialog, $ev) = @_;
+ $ev->{sym} == 27 and $dialog->hide;
+ }
+ ;
+
+ $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
+
+ $vb->add (new CFPlus::UI::Label
+ text => "You should find a savebed and apply it first!",
+ max_w => $WIDTH * 0.25,
+ ellipsize => 0,
+ );
+ $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
+ $hb->add (new CFPlus::UI::Button
+ text => "Ok",
+ expand => 1,
+ on_activate => sub { $QUIT_DIALOG->hide; 0 },
+ );
+ $hb->add (new CFPlus::UI::Button
+ text => "Quit anyway",
+ expand => 1,
+ on_activate => sub { exit },
+ );
+ }
+
+ $QUIT_DIALOG->show;
+ $QUIT_DIALOG->grab_focus;
+}
+
+sub show_tip_of_the_day {
+ # find all tips
+ my @tod = CFPlus::Pod::find tip_of_the_day => "*";
+
+ my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
+ $todindex = 0 if $todindex >= @tod;
+ $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
+
+ # create dialog
+ my $dialog;
+
+ my $close = sub {
+ $dialog->destroy;
+ };
+
+ $dialog = new CFPlus::UI::Toplevel
+ x => "center",
+ y => "center",
+ z => 3,
+ name => 'tip_of_the_day',
+ force_w => int $WIDTH * 4/9,
+ force_h => int $WIDTH * 2/9,
+ title => "Tip of the day #" . (1 + $todindex),
+ child => my $vbox = new CFPlus::UI::VBox,
+ has_close_button => 1,
+ on_delete => $close,
+ ;
+
+ $vbox->add (my $viewer = new CFPlus::UI::TextScroller
+ expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
+ $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
+
+ $vbox->add (my $table = new CFPlus::UI::Table);
+
+ $table->add (0, 0, new CFPlus::UI::Button
+ text => "Close",
+ tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the Server Setup.",
+ on_activate => $close,
+ );
+
+ $table->add (2, 0, new CFPlus::UI::Button
+ text => "Next",
+ tooltip => "Show the next Tip of the day.",
+ on_activate => sub {
+ $close->();
+ &show_tip_of_the_day;
+ },
+ );
+
+ $dialog->show;
+}
+
sub sdl_init {
CFPlus::SDL_Init
and die "SDL::Init failed!\n";
@@ -1632,7 +1720,7 @@
child => $STATUSBOX,
)->show;
- CFPlus::UI::FancyFrame->new (
+ CFPlus::UI::Toplevel->new (
title => "Map",
name => "mapmap",
x => 0,
@@ -1670,7 +1758,7 @@
tooltip => "Server Log. This text viewer contains all the messages sent by the server.",
;
- $SETUP_DIALOG = new CFPlus::UI::FancyFrame
+ $SETUP_DIALOG = new CFPlus::UI::Toplevel
title => "Setup",
name => "setup_dialog",
x => 'center',
@@ -1944,6 +2032,7 @@
pickup => 0,
inv_sort => "mtime",
default => "profile", # default profile
+ show_tips => 1,
);
while (my ($k, $v) = each %DEF_CFG) {
@@ -2001,6 +2090,8 @@
audio_init;
}
+show_tip_of_the_day if $CFG->{show_tips};
+
Event::loop;
#CFPlus::SDL_Quit;
#CFPlus::_exit 0;