--- deliantra/Deliantra-Client/bin/cfplus 2006/11/18 23:31:24 1.128
+++ deliantra/Deliantra-Client/bin/cfplus 2006/12/09 02:21:25 1.137
@@ -24,6 +24,8 @@
use strict;
use utf8;
+use Carp 'verbose';
+
# do things only needed for single-binary version (par)
BEGIN {
if (%PAR::LibCache) {
@@ -59,19 +61,18 @@
use CFPlus::OpenGL ();
use CFPlus::Protocol;
use CFPlus::UI;
+use CFPlus::UI::Inventory;
+use CFPlus::UI::SpellList;
use CFPlus::Pod;
-use CFPlus::BindingEditor;
use CFPlus::MapWidget;
+use CFPlus::Macro;
$SIG{QUIT} = sub { Carp::cluck "QUIT" };
$SIG{PIPE} = 'IGNORE';
$Event::Eval = 0;
$Event::DIED = sub {
- # TODO: display dialog box or so
- Carp::cluck $_[1];#d#TODO: remove when stable
- return;#d#
- CFPlus::fatal ($_[1]);
+ CFPlus::fatal Carp::longmess $_[1]
};
my $MAX_FPS = 60;
@@ -125,6 +126,7 @@
our $STATS_PAGE;
our $SKILL_PAGE;
our $SPELL_PAGE;
+our $SPELL_LIST;
our $HELP_WINDOW;
our $MESSAGE_WINDOW;
@@ -147,11 +149,11 @@
our $INVR;
our $INV_RIGHT_HB;
-our $BIND_EDITOR;
-our $BIND_UPD_CB;
-
our $PICKUP_CFG;
+our $IN_BUILD_MODE;
+our $BUILD_BUTTON;
+
sub status {
$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
}
@@ -377,8 +379,6 @@
$LOGIN_BUTTON->set_text ("Logout");
$SETUP_DIALOG->hide;
- $PROFILE = $CFG->{profile}{default};
-
my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
my ($host, $port) = split /:/, $PROFILE->{host};
@@ -431,7 +431,7 @@
$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
$SETUP_DIALOG->show;
$PL_WINDOW->hide;
- $SPELL_PAGE->clear_spells;
+ $SPELL_LIST->clear_spells;
return unless $CONN;
@@ -668,6 +668,7 @@
$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
+ $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
@@ -681,6 +682,7 @@
}
}
+ $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
$table
}
@@ -1191,12 +1193,12 @@
["Cloaks" => PICKUP_CLOAK],
],
- ["Readables", 2, 2,
+ ["Readables", 2, 0,
["Spellbooks" => PICKUP_SPELLBOOK],
["Skillscrolls" => PICKUP_SKILLSCROLL],
["Normal Books/Scrolls" => PICKUP_READABLES],
],
- ["Misc", 2, 7,
+ ["Misc", 2, 5,
["Food" => PICKUP_FOOD],
["Drinks" => PICKUP_DRINK],
["Valuables (Money, Gems)" => PICKUP_VALUABLES],
@@ -1206,6 +1208,7 @@
["Magic Devices" => PICKUP_MAGIC_DEVICE],
["Ignore cursed" => PICKUP_NOT_CURSED],
["Jewelery" => PICKUP_JEWELS],
+ ["Flesh" => PICKUP_FLESH],
],
["Weight/Value ratio", 2, 17]
)
@@ -1265,11 +1268,17 @@
my %SORT_ORDER = (
type => undef,
- mtime => sub { sort {
- ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
- or $b->{mtime} <=> $a->{mtime}
- or $a->{type} <=> $b->{type}
- } @_ },
+ mtime => sub {
+ my $NOW = time;
+ sort {
+ my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
+ my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
+
+ ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
+ or $btime <=> $atime
+ or $a->{type} <=> $b->{type}
+ } @_
+ },
weight => sub { sort {
$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
or $a->{type} <=> $b->{type}
@@ -1354,8 +1363,8 @@
"Shows all your Skills."
);
- my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
- $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
+ my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
+ $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
$ntb->add (
"Spellbook (F4)" => $spellsw,
"Displays all spells you have and lets you edit keyboard shortcuts for them."
@@ -1372,123 +1381,8 @@
$plwin
}
-sub update_bindings {
- $BIND_UPD_CB->() if $BIND_UPD_CB;
-}
-
sub keyboard_setup {
- my $binding_list = new CFPlus::UI::VBox;
-
- my $refresh;
- $refresh = $BIND_UPD_CB = sub {
- $binding_list->clear ();
-
- return unless $PROFILE;
-
- for my $mod (keys %{$PROFILE->{bindings}}) {
- for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
- my $cmds = $PROFILE->{bindings}{$mod}{$sym};
- next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
-
- my $lbl = join "; ", @$cmds;
- my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
- $binding_list->add (my $hb = new CFPlus::UI::HBox);
- $hb->add (new CFPlus::UI::Button
- text => "delete",
- tooltip => "Deletes the binding",
- on_activate => sub {
- $binding_list->remove ($hb);
- delete $PROFILE->{bindings}{$mod}{$sym};
- 0
- });
-
- $hb->add (new CFPlus::UI::Button
- text => "edit",
- tooltip => "Edits the binding",
- on_activate => sub {
- $::BIND_EDITOR->set_binding (
- $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
- sub {
- my ($nmod, $nsym, $ncmds) = @_;
- $::BIND_EDITOR->cfg_unbind ($mod, $sym);
- $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
- $refresh->();
- $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
- $SETUP_DIALOG->show;
- },
- sub {
- $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
- $SETUP_DIALOG->show;
- });
- $::BIND_EDITOR->show;
- $SETUP_DIALOG->hide;
- 0
- });
-
- $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
- $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
- }
- }
- };
-
- my $vb = new CFPlus::UI::VBox;
- $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,
- state => $CFG->{shift_fire_stop},
- tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
- on_changed => sub {
- my ($cbox, $value) = @_;
- $CFG->{shift_fire_stop} = $value;
- 0
- });
-
- $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
- text => "record new",
- expand => 1,
- tooltip => "This button opens the binding editor with an empty binding.",
- on_activate => sub {
- $::BIND_EDITOR->set_binding (undef, undef, [],
- sub {
- my ($mod, $sym, $cmds) = @_;
- $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
- $refresh->();
- $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
- $SETUP_DIALOG->show;
- },
- sub {
- $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
- $SETUP_DIALOG->show;
- },
- );
- $SETUP_DIALOG->hide;
- $::BIND_EDITOR->show;
- 0
- },
- );
-
- $hb->add (new CFPlus::UI::Button
- text => "close",
- tooltip => "Closes the binding window",
- expand => 1,
- on_activate => sub {
- $SETUP_DIALOG->hide;
- 0
- }
- );
-
- $refresh->();
-
- $vb
+ CFPlus::Macro::keyboard_setup
}
sub help_window {
@@ -1683,16 +1577,16 @@
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);
+ $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
$table->add (0, 0, new CFPlus::UI::Button
- text => "Close",
+ 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",
+ text => "Next",
tooltip => "Show the next Tip of the day.",
on_activate => sub {
$close->();
@@ -1745,8 +1639,6 @@
force_y => 0;
$DEBUG_STATUS->show;
- $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
-
$STATUSBOX = new CFPlus::UI::Statusbox;
$STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
@@ -1856,6 +1748,7 @@
$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
tooltip => "View Documentation");
+
$BUTTONBAR->add (new CFPlus::UI::Button
text => "Quit",
tooltip => "Terminates the program",
@@ -1876,6 +1769,124 @@
$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
}
+sub setup_build_button {
+ my ($enabled) = @_;
+ if ($enabled) {
+ $BUILD_BUTTON ||= new CFPlus::UI::Button
+ text => "Build",
+ tooltip => "Opens the ingame builder",
+ on_activate => sub {
+ if ($CONN) {
+ $CONN->send_ext_req (builder_player_items => sub {
+ open_ingame_editor ($_[0]) if exists $_[0]->{items};
+ });
+ }
+ 0
+ };
+ $BUTTONBAR->add ($BUILD_BUTTON);
+ } else {
+ $BUILD_BUTTON->hide if $BUILD_BUTTON;
+ }
+}
+
+sub open_ingame_editor {
+ my ($msg) = @_;
+
+ my $win = new CFPlus::UI::Toplevel
+ x => 0,
+ y => 'center',
+ z => 4,
+ name => 'builder_window',
+ force_w => int $WIDTH * 1/4,
+ force_h => int $HEIGHT * 3/4,
+ title => "In game builder",
+ has_close_button => 1;
+
+ my $r = new CFPlus::UI::ScrolledWindow (
+ expand => 1,
+ scroll_y => 1
+ );
+ $r->add (my $vb = new CFPlus::UI::VBox);
+ $win->add ($r);
+
+
+ $vb->add (
+ new CFPlus::UI::Button
+ text => "Disable build mode",
+ on_activate => sub { $::IN_BUILD_MODE = undef }
+ );
+ $vb->add (
+ new CFPlus::UI::Button
+ text => "ERASE",
+ on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
+ );
+
+ for my $itemarchname (
+ sort {
+ $msg->{items}->{$a}->{build_arch_name}
+ cmp $msg->{items}->{$b}->{build_arch_name}
+ } keys %{$msg->{items}}
+ ) {
+ my $info = $msg->{items}->{$itemarchname};
+ $vb->add (
+ new CFPlus::UI::Button text => $info->{build_arch_name},
+ on_activate => sub {
+ $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
+
+ if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
+ build_mode_query_arch_info ();
+ }
+ }
+ );
+ }
+
+ $win->show;
+}
+
+sub build_mode_query_arch_info {
+ my ($iteminfo) = $::IN_BUILD_MODE;
+ my $itemarchname = $iteminfo->{item};
+ my $info = $iteminfo->{info};
+
+ my $dialog = new CFPlus::UI::Toplevel
+ x => "center",
+ y => "center",
+ z => 50,
+ force_w => int $WIDTH * 1/2,
+ title => "Enter information for placement of '$itemarchname'",
+ has_close_button => 1;
+
+ $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
+
+ $vb->add (my $table = new CFPlus::UI::Table expand => 1);
+ my $row = 0;
+ if ($info->{has_name}) {
+ $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
+ $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
+ }
+ if ($info->{has_text}) {
+ $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
+ $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
+ }
+ if ($info->{has_connection}) {
+ $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
+ $table->add (1, $row++,
+ new CFPlus::UI::Entry
+ expand => 1,
+ on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
+ tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
+ );
+ }
+
+ $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
+ $hb->add (new CFPlus::UI::Button
+ text => "Close",
+ expand => 1,
+ on_activate => sub { $dialog->hide; 0 },
+ );
+ $dialog->show;
+}
+
sub video_shutdown {
CFPlus::OpenGL::shutdown;
@@ -1916,8 +1927,8 @@
audio_music_finished;
+ local $_;
while (<$fh>) {
- last;
next if /^\s*#/;
next if /^\s*$/;
@@ -1925,11 +1936,11 @@
push @SOUNDS, "$volume,$file";
-# $AUDIO_CHUNKS{"$volume,$file"} ||= do {
-# my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
-# $chunk->volume ($volume * 128 / 100);
-# $chunk
-# };
+ $AUDIO_CHUNKS{"$volume,$file"} ||= do {
+ my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
+ $chunk->volume ($volume * 128 / 100);
+ $chunk
+ };
}
} else {
status "unable to open sound config: $!";
@@ -2011,7 +2022,11 @@
CFPlus::UI::full_refresh;
},
CFPlus::SDL_ACTIVEEVENT => sub {
-# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
+# not useful, as APPACTIVE include sonly iconified state, not unmapped
+# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
+# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
+# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
+# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
},
CFPlus::SDL_KEYDOWN => sub {
if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
@@ -2078,6 +2093,19 @@
}
$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
+ $PROFILE = $CFG->{profile}{default};
+
+ # convert old bindings (only default profile matters)
+ if (my $bindings = delete $PROFILE->{bindings}) {
+ while (my ($mod, $syms) = each %$bindings) {
+ while (my ($sym, $cmds) = each %$syms) {
+ push @{ $PROFILE->{macro} }, {
+ accelkey => [$mod*1, $sym*1],
+ action => $cmds,
+ };
+ }
+ }
+ }
sdl_init;
@@ -2132,6 +2160,7 @@
show_tip_of_the_day if $CFG->{show_tips};
+#CFPlus::Macro::quick_macro ["test"];#d#
Event::loop;
#CFPlus::SDL_Quit;
#CFPlus::_exit 0;