--- deliantra/Deliantra-Client/bin/cfplus 2006/06/12 13:26:15 1.69 +++ deliantra/Deliantra-Client/bin/cfplus 2006/07/14 17:35:35 1.92 @@ -38,9 +38,11 @@ use CFClient::OpenGL (); use CFClient::Protocol; use CFClient::UI; +use CFClient::BindingEditor; use CFClient::MapWidget; $SIG{QUIT} = sub { Carp::cluck "QUIT" }; +$SIG{PIPE} = 'IGNORE'; $Event::DIED = sub { # TODO: display dialog box or so @@ -86,15 +88,22 @@ our $LOGIN_BUTTON; our $QUIT_DIALOG; our $HOST_ENTRY; +our $PICKUP_ENABLE; our $SERVER_INFO; our $SETUP_DIALOG; our $SETUP_NOTEBOOK; our $SETUP_SERVER; our $SETUP_KEYBOARD; -our $SETUP_SPELLS; -our $STATS_WINDOW; +our $PL_NOTEBOOK; +our $PL_WINDOW; + +our $INVENTORY_PAGE; +our $STATS_PAGE; +our $SPELL_PAGE; + +our $HELP_WINDOW; our $MESSAGE_WINDOW; our $FLOORBOX; our $GAUGES; @@ -111,12 +120,12 @@ our $STATUSBOX; our $DEBUG_STATUS; -our $INV_WINDOW; our $INV; our $INVR; our $INV_RIGHT_HB; our $BIND_EDITOR; +our $BIND_UPD_CB; our $PICKUP_CFG; @@ -157,6 +166,7 @@ on_activate => sub { $conn->send ("reply n"); $dialog->destroy; + 0 } ); $hbox->add (new CFClient::UI::Button @@ -164,10 +174,11 @@ on_activate => sub { $conn->send ("reply y"); destroy_query_dialog $conn; + 0 }, ); - $dialog->focus_in; + $dialog->grab_focus; } elsif ($flags & CS_QUERY_SINGLECHAR) { $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; @@ -187,6 +198,7 @@ on_activate => sub { $conn->send ("reply n"); destroy_query_dialog $conn; + 0 }, ); $table->add (2, 0, new CFClient::UI::Button @@ -194,6 +206,7 @@ on_activate => sub { $conn->send ("reply d"); destroy_query_dialog $conn; + 0 }, ); @@ -217,7 +230,7 @@ return; } - $STATS_WINDOW->show; + $STATS_PAGE->show; $MESSAGE_WINDOW->hide; unshift @dialog, new CFClient::UI::Label @@ -233,6 +246,7 @@ on_activate => sub { $conn->send ("reply y"); destroy_query_dialog $conn; + 0 }, ); @@ -256,6 +270,7 @@ $conn->{stat_change_with} = $sw2->{value}; $conn->send ("reply $sw1->{value}"); destroy_query_dialog $conn; + 0 }, ); $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); @@ -265,8 +280,9 @@ text => "Accept", on_activate => sub { $conn->send ("reply n"); - $STATS_WINDOW->hide; + $STATS_PAGE->hide; destroy_query_dialog $conn; + 0 }, ); @@ -286,10 +302,11 @@ on_changed => sub { $conn->send ("reply $_[1]"); destroy_query_dialog $conn; + 0 }, ; - $entry->focus_in; + $entry->grab_focus; } else { $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; @@ -299,10 +316,11 @@ on_activate => sub { $conn->send ("reply $_[1]"); destroy_query_dialog $conn; + 0 }, ; - $entry->focus_in; + $entry->grab_focus; } $vbox->add (@dialog); @@ -317,7 +335,7 @@ my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; - my ($host, $port) = split /:/, $CFG->{host}; + my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; $MAP = new CFClient::Map $mapsize, $mapsize; @@ -325,8 +343,8 @@ new CFClient::Protocol host => $host, port => $port || 13327, - user => $CFG->{user}, - pass => $CFG->{password}, + user => $CFG->{profile}{default}{user}, + pass => $CFG->{profile}{default}{password}, mapw => $mapsize, maph => $mapsize, @@ -364,8 +382,8 @@ $LOGIN_BUTTON->set_text ("Login"); $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); $SETUP_DIALOG->show; - $INV_WINDOW->hide; - $SETUP_SPELLS->clear_spells; + $PL_WINDOW->hide; + $SPELL_PAGE->clear_spells; return unless $CONN; @@ -374,6 +392,8 @@ destroy_query_dialog $CONN; $CONN->destroy; $CONN = 0; # false, does not autovivify + + undef $MAP; } sub graphics_setup { @@ -401,50 +421,35 @@ $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, tooltip => "Bring the client into fullscreen mode.", - on_changed => sub { - my ($self, $value) = @_; - $CFG->{fullscreen} = $value; - } + on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } ); $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fast}, tooltip => "Lower the visual quality considerably to speed up rendering.", - on_changed => sub { - my ($self, $value) = @_; - $CFG->{fast} = $value; - } + on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } ); $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); $table->add (1, $row++, new CFClient::UI::Slider range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], tooltip => "Enlarge or shrink the displayed map. Changes are instant.", - on_changed => sub { - my ($self, $value) = @_; - $CFG->{map_scale} = 2 ** $value; - } + on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } ); $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, tooltip => "Fog-of-War marks areas that cannot be seen by the player. Changes are instant.", - on_changed => sub { - my ($self, $value) = @_; - $CFG->{fow_enable} = $value; - } + on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } ); $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], tooltip => "Fog of War Lightness. The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", - on_changed => sub { - my ($self, $value) = @_; - $CFG->{fow_intensity} = $value; - } + on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } ); $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); @@ -455,6 +460,7 @@ my ($self, $value) = @_; $CFG->{fow_smooth} = $value; status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; + 0 } ); @@ -462,25 +468,14 @@ $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], tooltip => "The base font size used by most GUI elements that do not have their own setting.", - on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, + on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, ); $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], tooltip => "The font size used by the message/server log window only. Changes are instant.", - on_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, 0.1], - tooltip => "The font size used by the statistics window only. Changes are instant.", - on_changed => sub { - $CFG->{stat_fontsize} = $_[1]; - &set_stats_window_fontsize; - } + on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, ); $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); @@ -490,6 +485,7 @@ on_changed => sub { $CFG->{gauge_fontsize} = $_[1]; &set_gauge_window_fontsize; + 0 } ); @@ -500,6 +496,7 @@ on_changed => sub { $CFG->{gauge_size} = $_[1]; $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); + 0 } ); @@ -509,6 +506,7 @@ on_activate => sub { video_shutdown (); video_init (); + 0 } ); @@ -526,9 +524,7 @@ $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, tooltip => "Master Audio Enable. If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", - on_changed => sub { - $CFG->{audio_enable} = $_[1]; - } + on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } ); # $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); # $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { @@ -539,17 +535,12 @@ $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", - on_changed => sub { - $CFG->{bgm_enable} = $_[1]; - } + on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } ); $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], tooltip => "The volume of the background music. Changes are instant.", - on_changed => sub { - $CFG->{bgm_volume} = $_[1]; - CFClient::MixMusic::volume $_[1] * 128; - } + on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 } ); $table->add (1, $row++, new CFClient::UI::Button @@ -558,18 +549,13 @@ on_activate => sub { audio_shutdown (); audio_init (); + 0 } ); $vbox } -sub set_stats_window_fontsize { - for (values %{$STATWIDS}) { - $_->set_fontsize ($::CFG->{stat_fontsize}); - } -} - sub set_gauge_window_fontsize { for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { $_->set_fontsize ($::CFG->{gauge_fontsize}); @@ -633,13 +619,13 @@ 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 (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); $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 (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); $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 (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); $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 }); + $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); @@ -658,13 +644,8 @@ } sub stats_window { - my $tgw = new CFClient::UI::FancyFrame - y => $HEIGHT * (2/8), - x => "max", - title => "Stats", - name => "stats_window"; + my $vb = new CFClient::UI::VBox; - $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); $vb->add ($STATWIDS->{title} = new CFClient::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."); @@ -698,7 +679,7 @@ [2, 0, st_wc => "Wc", -120, "Weapon Class, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], [2, 1, st_ac => "Ac", -120, "Armour Class, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], [2, 2, st_dam => "Dam", 120, "Damage, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], - [2, 3, st_arm => "Arm", 120, "Armour, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], + [2, 3, st_arm => "Arm", 120, "Armour, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."], [2, 4, st_spd => "Spd", 10.54, "Speed, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], [2, 5, st_wspd => "WSp", 10.54, "Weapon Speed, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], ) { @@ -710,30 +691,48 @@ font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); } - $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); + $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); my $row = 0; my $col = 0; my %resist_names = ( - slow => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", - holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", - conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)", - fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", - depl => "Depletion (some monsters and other effects can cause stats depletion)", - magic => "Magic (resistance to magic spells like magic missile or similar)", - drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", - acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)", - pois => "Poison (resistance to getting poisoned)", - para => "Paralysation (this resistance affects the chance you get paralysed)", - deat => "Death (resistance against death spells)", - phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)", - blind => "Blind (blind resistance affects the chance of a successful blinding attack)", - fear => "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", - tund => "Turn undead (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", - elec => "Electricity (resistance against electricity, spells like large lightning, small lightning, ...)", - cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)", - ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", + slow => ["Slow", + "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"], + holyw => ["Holy Word", + "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"], + conf => ["Confusion", + "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)"], + fire => ["Fire", + "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"], + depl => ["Depletion", + "Depletion (some monsters and other effects can cause stats depletion)"], + magic => ["Magic", + "Magic (resistance to magic spells like magic missile or similar)"], + drain => ["Draining", + "Draining (some monsters (e.g. vampires) and other effects can steal experience)"], + acid => ["Acid", + "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)"], + pois => ["Poison", + "Poison (resistance to getting poisoned)"], + para => ["Paralysation", + "Paralysation (this resistance affects the chance you get paralysed)"], + deat => ["Death", + "Death (resistance against death spells)"], + phys => ["Physical", + "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"], + blind => ["Blind", + "Blind (blind resistance affects the chance of a successful blinding attack)"], + fear => ["Fear", + "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"], + tund => ["Turn undead", + "Turn undead (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."], + elec => ["Electricity", + "Electricity (resistance against electricity, spells like large lightning, small lightning, ...)"], + cold => ["Cold", + "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)"], + ghit => ["Ghost hit", + "Ghost hit (special attack used by ghosts and ghost-like beings)"], ); for (qw/slow holyw conf fire depl magic drain acid pois para deat phys @@ -748,27 +747,38 @@ valign => 0, can_events => 1, can_hover => 1, - tooltip => $resist_names{$_}, + tooltip => $resist_names{$_}->[1], ); $tbl2->add ($col + 1, $row, new CFClient::UI::Image font => $FONT_FIXED, can_hover => 1, can_events => 1, - image => "ui/resist/resist_$_.png", - tooltip => $resist_names{$_}, + path => "ui/resist/resist_$_.png", + tooltip => $resist_names{$_}->[1], + ); + $tbl2->add ($col + 2, $row, new CFClient::UI::Label + text => $resist_names{$_}->[0], + font => $FONT_FIXED, + can_hover => 1, + can_events => 1, + tooltip => $resist_names{$_}->[1], ); $row++; if ($row % 6 == 0) { - $col += 2; + $col += 3; $row = 0; } } - &set_stats_window_fontsize; update_stats_window ({}); - $tgw + $vb +} + +sub skill_window { + my ($self) = @_; + $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1; } sub formsep($) { @@ -812,33 +822,69 @@ $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); - $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); + $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); - # TODO: replace by CS_STAT_RES_xxx constants my %tbl = ( - phys => 100, - magic => 101, - fire => 102, - elec => 103, - cold => 104, - conf => 105, - acid => 106, - drain => 107, - ghit => 108, - pois => 109, - slow => 110, - para => 111, - tund => 112, - fear => 113, - depl => 113, - deat => 115, - holyw => 116, - blind => 117, - ); + phys => CS_STAT_RES_PHYS, + magic => CS_STAT_RES_MAG, + fire => CS_STAT_RES_FIRE, + elec => CS_STAT_RES_ELEC, + cold => CS_STAT_RES_COLD, + conf => CS_STAT_RES_CONF, + acid => CS_STAT_RES_ACID, + drain => CS_STAT_RES_DRAIN, + ghit => CS_STAT_RES_GHOSTHIT, + pois => CS_STAT_RES_POISON, + slow => CS_STAT_RES_SLOW, + para => CS_STAT_RES_PARA, + tund => CS_STAT_TURN_UNDEAD, + fear => CS_STAT_RES_FEAR, + depl => CS_STAT_RES_DEPLETE, + deat => CS_STAT_RES_DEATH, + holyw => CS_STAT_RES_HOLYWORD, + blind => CS_STAT_RES_BLIND, + ); + + if ($::CONN && !$STATWIDS->{_skill_tbl_init}) { + my $sktbl = $STATWIDS->{_skill_tbl}; + $sktbl->clear; + + $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1); + $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1); + $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname"); + + my @skills; + + for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) { + push @skills, [$i, $::CONN->{skill_info}{$i}]; + } + + my $y = 1; + for (sort { $a->[1] cmp $b->[1] } @skills) { + my ($idx, $name) = @$_; + + unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) { + $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1); + $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1); + $sktbl->add (2, $y++, new CFClient::UI::Label text => $name); + } + } + + $STATWIDS->{_skill_tbl_init} = 1; + } + + for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) { + if (exists $stats->{$i}) { + $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1]) + if $STATWIDS->{"sk_xp_$i"}; + $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0]) + if $STATWIDS->{"sk_lvl_$i"}; + } + } $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) for keys %tbl; @@ -847,6 +893,11 @@ my $METASERVER_ATIME; sub update_metaserver { + my ($metaserver_dialog) = @_; + + $METASERVER = $metaserver_dialog + if defined $metaserver_dialog; + return if $METASERVER_ATIME > time; $METASERVER_ATIME = time + 60; @@ -921,8 +972,9 @@ text => "Use", tooltip => "Put this server into the Host:Port field", on_activate => sub { - $HOST_ENTRY->set_text ($CFG->{host} = $host); + $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); $METASERVER->hide; + 0 }, ), (new CFClient::UI::Empty expand => 1), @@ -943,6 +995,10 @@ } sub metaserver_dialog { + my $vbox = new CFClient::UI::VBox; + my $table = new CFClient::UI::Table; + $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); + my $dialog = new CFClient::UI::FancyFrame title => "Server List", name => 'metaserver_dialog', @@ -950,16 +1006,15 @@ y => 'center', z => 3, force_h => $::HEIGHT * 0.4, - child => (my $vbox = new CFClient::UI::VBox), + child => $vbox, + has_close_button => 1, + table => $table, on_visibility_change => sub { - update_metaserver if $_[1]; + update_metaserver ($_[0]) if $_[1]; + 0 }, ; - $dialog->{table} = new CFClient::UI::Table; - - $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table}); - $dialog } @@ -975,45 +1030,38 @@ $vbox->add ( $HOST_ENTRY = new CFClient::UI::Entry expand => 1, - text => $CFG->{host}, + text => $CFG->{profile}{default}{host}, tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", on_changed => sub { my ($self, $value) = @_; - $CFG->{host} = $value; + $CFG->{profile}{default}{host} = $value; + 0 } ); - $METASERVER = metaserver_dialog; - $vbox->add (new CFClient::UI::Button expand => 1, text => "Server List", other => $METASERVER, tooltip => "Show a list of available crossfire servers", - on_activate => sub { $METASERVER->toggle_visibility }, - on_visibility_change => sub { $METASERVER->hide unless $_[1] }, + on_activate => sub { $METASERVER->toggle_visibility; 0 }, + on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, ); } $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); $table->add (1, 4, new CFClient::UI::Entry - text => $CFG->{user}, + text => $CFG->{profile}{default}{user}, tooltip => "The name of your character on the server", - on_changed => sub { - my ($self, $value) = @_; - $CFG->{user} = $value; - } + on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } ); $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); $table->add (1, 5, new CFClient::UI::Entry - text => $CFG->{password}, + text => $CFG->{profile}{default}{password}, hidden => 1, tooltip => "The password for your character", - on_changed => sub { - my ($self, $value) = @_; - $CFG->{password} = $value; - } + on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } ); $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); @@ -1024,11 +1072,7 @@ . "If you set this to a high value you will be able to see further, " . "but you also increase bandwidth requirements and latency. " . "This option is only used once at log-in.", - on_changed => sub { - my ($self, $value) = @_; - - $CFG->{mapsize} = $self->{range}[0] = $value = int $value; - }, + on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, ); $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); @@ -1041,21 +1085,21 @@ . "It also uses up server bandwidth on every connect, " . "so only set it if you really need to prefetch images. " . "This option can be set and unset any time.", - on_changed => sub { $CFG->{face_prefetch} = $_[1] }, + on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, ); $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); $table->add (1, 9, new CFClient::UI::Entry text => $CFG->{output_count}, tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", - on_changed => sub { $CFG->{output_count} = $_[1] }, + on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, ); $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); $table->add (1, 10, new CFClient::UI::Entry text => $CFG->{output_sync}, tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", - on_changed => sub { $CFG->{output_sync} = $_[1] }, + on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, ); $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button @@ -1065,6 +1109,7 @@ on_activate => sub { $CONN ? stop_game : start_game; + 0 }, ); @@ -1077,6 +1122,7 @@ on_changed => sub { my ($self, $value) = @_; $CFG->{say_command} = $value; + 0 } ); @@ -1102,7 +1148,8 @@ y => 0, force_w => $::WIDTH * 0.4, force_h => $::HEIGHT * 0.5, - child => (my $vbox = new CFClient::UI::VBox); + child => (my $vbox = new CFClient::UI::VBox), + has_close_button => 1; $vbox->add ($LOGVIEW); @@ -1120,6 +1167,8 @@ $input->{refocus_map} = 1; } delete $input->{auto_activated}; + + 0 }, on_activate => sub { my ($input, $text) = @_; @@ -1135,9 +1184,13 @@ delete $input->{refocus_map}; $MAPWIDGET->focus_in } + + 0 }, on_escape => sub { - $MAPWIDGET->focus_in + $MAPWIDGET->grab_focus; + + 0 }, ); @@ -1169,7 +1222,7 @@ $hb->add (new CFClient::UI::Button text => "Ok", expand => 1, - on_activate => sub { $QUIT_DIALOG->hide }, + on_activate => sub { $QUIT_DIALOG->hide; 0 }, ); $hb->add (new CFClient::UI::Button text => "Quit anyway", @@ -1186,7 +1239,7 @@ for ( ["General", 0, 0, - ["Enable autopickup" => PICKUP_NEWMODE], + ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], ["Inhibit autopickup" => PICKUP_INHIBIT], ["Stop before pickup" => PICKUP_STOP], ["Debug autopickup" => PICKUP_DEBUG], @@ -1233,8 +1286,8 @@ my $mask = $_->[1]; $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); - $table->add ($x+1, $y, new CFClient::UI::CheckBox - state => $CFG->{pickup} & $mask, + $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox + state => $::CFG->{pickup} & $mask, on_changed => sub { my ($box, $value) = @_; @@ -1246,84 +1299,137 @@ $::CONN->send_command ("pickup $::CFG->{pickup}") if defined $::CONN; + + 0 }); + + ${$_->[2]} = $checkbox if $_->[2]; } } $table->add (2, 18, new CFClient::UI::ValSlider - range => [0, 0, 16, 1, 1], + range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], + template => ">= 99", to_value => sub { ">= " . 5 * $_[0] }, on_changed => sub { my ($slider, $value) = @_; - $::CFG->{pickup} &= ~0x7; + $::CFG->{pickup} &= ~0xF; $::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; + 0 }); $table } -sub inventory_window { - my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame - x => "center", - y => "center", - force_w => $WIDTH * 9/10, - force_h => $HEIGHT * 9/10, - title => "Inventory", - ; - - $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); +sub inventory_widget { + my $hb = new CFClient::UI::HBox homogeneous => 1; $hb->add (my $vb1 = new CFClient::UI::VBox); $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); - $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); + $vb1->add ($INV = new CFClient::UI::Inventory); $hb->add (my $vb2 = new CFClient::UI::VBox); $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); - $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); + $vb2->add ($INVR = new CFClient::UI::Inventory); # XXX: Call after $INVR = ... because set_opencont sets the items CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); - $invwin + $hb } -sub spell_setup { - new CFClient::UI::SpellList +sub toggle_player_page { + my ($widget) = @_; + + if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { + $PL_WINDOW->hide; + } else { + $PL_NOTEBOOK->set_current_page ($widget); + $PL_WINDOW->show; + } +} + +sub player_window { + my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame + x => "center", + y => "center", + force_w => $WIDTH * 9/10, + force_h => $HEIGHT * 9/10, + title => "Player", + name => "playerbook", + has_close_button => 1 + ; + + my $ntb = + $PL_NOTEBOOK = + new CFClient::UI::Notebook + expand => 1, + debug => 1, + filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1), + ; + + $ntb->add ( + "Stats" => $STATS_PAGE = stats_window, + "Shows statistics, where all your Stats and Resistances are shown." + ); + $ntb->add ( + "Skills" => $STATS_PAGE = skill_window, + "Shows all your Skills." + ); + $ntb->add ( + Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, + "Displays all spells you have and lets you edit keyboard shortcuts for them." + ); + $ntb->add ( + Inventory => $INVENTORY_PAGE = inventory_widget, + "Toggles the inventory window, where you can manage your loot (or treasures :). " + . "You can also hit the Tab-key to show/hide the Inventory." + ); + + $ntb->set_current_page ($INVENTORY_PAGE); + + $plwin->add ($ntb); + $plwin +} + +sub update_bindings { + $BIND_UPD_CB->() if $BIND_UPD_CB; } sub keyboard_setup { my $binding_list = new CFClient::UI::VBox; my $refresh; - $refresh = sub { + $refresh = $BIND_UPD_CB = sub { $binding_list->clear (); - for my $mod (keys %{$::CFG->{bindings}}) { - for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { - my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; + for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { + for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { + my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; next unless ref $cmds eq 'ARRAY' and @$cmds > 0; my $lbl = join "; ", @$cmds; - my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); + my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); $binding_list->add (my $hb = new CFClient::UI::HBox); $hb->add (new CFClient::UI::Button text => "delete", tooltip => "Deletes the binding", on_activate => sub { $binding_list->remove ($hb); - delete $::CFG->{bindings}->{$mod}->{$sym}; + delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; + 0 }); $hb->add (new CFClient::UI::Button @@ -1331,11 +1437,11 @@ tooltip => "Edits the binding", on_activate => sub { $::BIND_EDITOR->set_binding ( - $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, + $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, sub { my ($nmod, $nsym, $ncmds) = @_; - delete $::CFG->{bindings}->{$mod}->{$sym}; - $::CFG->{bindings}->{$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; @@ -1346,6 +1452,7 @@ }); $::BIND_EDITOR->show; $SETUP_DIALOG->hide; + 0 }); $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); @@ -1355,6 +1462,18 @@ }; my $vb = new CFClient::UI::VBox; + $vb->add (my $hb = new CFClient::UI::HBox); + $hb->add (new CFClient::UI::Label text => "only shift-up stops fire"); + $hb->add (new CFClient::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 ($binding_list); $vb->add (my $hb = new CFClient::UI::HBox); @@ -1366,7 +1485,7 @@ $::BIND_EDITOR->set_binding (undef, undef, [], sub { my ($mod, $sym, $cmds) = @_; - $::CFG->{bindings}->{$mod}->{$sym} = $cmds; + $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); $refresh->(); $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); $SETUP_DIALOG->show; @@ -1378,6 +1497,7 @@ ); $SETUP_DIALOG->hide; $::BIND_EDITOR->show; + 0 }, ); @@ -1387,6 +1507,7 @@ expand => 1, on_activate => sub { $SETUP_DIALOG->hide; + 0 } ); @@ -1403,7 +1524,8 @@ name => 'doc_browser', force_w => int $WIDTH * 7/8, force_h => int $HEIGHT * 7/8, - title => "Documentation"; + title => "Help Browser", + has_close_button => 1; $win->add (my $vbox = new CFClient::UI::VBox); @@ -1416,9 +1538,9 @@ value => undef, options => [ [intro => "Introduction"], - [manual => "Manual"], - [skill_help => "Skills"], - [command_help => "Commands"], + [manual => "Main Manual"], + [skill_help => "Skill Reference"], + [command_help => "Command Reference"], [dmcommand_help => "DM Commands"], [COPYING => "License Terms"], ], @@ -1429,17 +1551,25 @@ doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; $viewer->clear; + +# $viewer->add_paragraph ([1, 1, 1, 1], ["Test\n\n \x{fffc} \x{fffc}\n", +# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1), +# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"), +# ]);#d# $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) for @$pom; $viewer->set_offset (0); + + 0 }, on_visibility_change => sub { my ($self, $visible) = @_; return unless $visible; return if $self->{value}; $self->set_value ("intro"); + 0 }, ); @@ -1488,7 +1618,7 @@ force_y => 0; $DEBUG_STATUS->show; - $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); + $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); $STATUSBOX = new CFClient::UI::Statusbox; $STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); @@ -1518,7 +1648,7 @@ if ($CONSOLE) { $CONSOLE->{input}->{auto_activated} = 1; - $CONSOLE->{input}->focus_in; + $CONSOLE->{input}->grab_focus; if ($preset && $CONSOLE->{input}->get_text eq '') { $CONSOLE->{input}->set_text ($preset); @@ -1526,7 +1656,7 @@ } }); $MAPWIDGET->show; - $MAPWIDGET->focus_in; + $MAPWIDGET->grab_focus; $LOGVIEW = new CFClient::UI::TextScroller expand => 1, @@ -1546,8 +1676,11 @@ z => 2, force_w => $::WIDTH * 0.6, force_h => $::HEIGHT * 0.6, + has_close_button => 1, ; + $METASERVER = metaserver_dialog; + $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); @@ -1560,16 +1693,14 @@ $SETUP_NOTEBOOK->add (Audio => audio_setup, "Configure the use of audio, sound effects and background music."); $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, - "Lets you define, edit and delete bindings." - . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor " + "Lets you define, edit and delete key bindings." + . "There is a shortcut for making bindings: Control-Insert opens the binding editor " . "with nothing set and the recording started. After doing the actions you " . "want to record press Insert and you will be asked to press a key-combo. " . "After pressing the combo the binding will be saved automatically and the " . "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."); + "Some debuggin' options. Do not ask."); $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top @@ -1581,11 +1712,8 @@ make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D - $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window, - tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); - $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, - tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " - . "You can also hit the Tab-key to show/hide the Inventory."); + $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, + tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", @@ -1594,10 +1722,11 @@ $::CFG->{layout} = CFClient::UI::get_layout; CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; status "Configuration Saved"; + 0 }, ); - $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, + $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, tooltip => "View Documentation"); $BUTTONBAR->add (new CFClient::UI::Button @@ -1609,6 +1738,7 @@ } else { exit; } + 0 }, ); @@ -1620,6 +1750,8 @@ } sub video_shutdown { + CFClient::OpenGL::shutdown; + undef $SDL_ACTIVE; } @@ -1845,36 +1977,38 @@ CFClient::UI::set_layout ($::CFG->{layout}); my %DEF_CFG = ( - sdl_mode => 0, - width => 640, - height => 480, - fullscreen => 0, - fast => 0, - map_scale => 1, - fow_enable => 1, - fow_intensity => 0.45, - fow_smooth => 0, - gui_fontsize => 1, - log_fontsize => 0.7, - gauge_fontsize=> 1, - gauge_size => 0.35, - stat_fontsize => 0.7, - mapsize => 100, - host => "crossfire.schmorp.de", - say_command => 'say', - audio_enable => 1, - bgm_enable => 1, - bgm_volume => 0.25, - face_prefetch => 0, - output_sync => 1, - output_count => 1, - pickup => 0, + sdl_mode => 0, + width => 640, + height => 480, + fullscreen => 0, + fast => 0, + map_scale => 1, + fow_enable => 1, + fow_intensity => 0.45, + fow_smooth => 0, + gui_fontsize => 1, + log_fontsize => 0.7, + gauge_fontsize => 1, + gauge_size => 0.35, + stat_fontsize => 0.7, + mapsize => 100, + say_command => 'say', + audio_enable => 1, + bgm_enable => 1, + bgm_volume => 0.25, + face_prefetch => 0, + output_sync => 1, + output_count => 1, + pickup => 0, + default => "profile", # default profile ); - + while (my ($k, $v) = each %DEF_CFG) { $CFG->{$k} = $v unless exists $CFG->{$k}; } + $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; + sdl_init; @SDL_MODES = reverse