--- deliantra/Deliantra-Client/bin/deliantra 2009/01/09 22:38:17 1.84 +++ deliantra/Deliantra-Client/bin/deliantra 2009/01/11 03:19:47 1.85 @@ -168,7 +168,10 @@ our $MAPMAP; our $MAPWIDGET; our $COMPLETER; -our $BUTTONBAR; +our $MENUFRAME; # the rectangle at the top +our $MENUBAR; # the hbox at the top +our $MENUPOPUP; +our $BUTTONBAR; # the menu buttons our $METASERVER; our $LOGIN_BUTTON; our $QUIT_DIALOG; @@ -345,10 +348,10 @@ $meta->{data} or return; - # if its a jingle, play it as ambient music + # if it's a jingle, play it as ambient music if ($meta->{data}{jingle}) { if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue - push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue + push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue &audio_music_push ($face); } } else { @@ -356,7 +359,7 @@ DC::DB::get res_data => $meta->{name}, sub { my $rwops = new DC::RW $_[0]; my $chunk = new DC::MixChunk $rwops - or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; + or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError; $chunk->volume (($meta->{data}{volume} || 1) * 128); $AUDIO_CHUNK{$face} = $chunk; @@ -413,8 +416,11 @@ $MUSIC_PLAYING_DATA = \$_[0]; + $meta->{path} or length $_[0] + or return clienterror "empty music face from res_data ($meta->{face})";#d# + my $rwops = $meta->{path} - ? new_from_file DC::RW $meta->{path} + ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror : new DC::RW $$MUSIC_PLAYING_DATA; $MUSIC_PLAYER = new DC::MixMusic $rwops @@ -917,6 +923,7 @@ $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); $hbox->add ($MODE_SLIDER = new DC::UI::Slider + c_rescale => 1, force_w => $WIDTH * 0.1, expand => 1, range => [ ($CFG->{sdl_mode}) x 3 ], tooltip => $vidmode_tooltip); @@ -1250,7 +1257,7 @@ sub make_gauge_window { my $gh = int $HEIGHT * $CFG->{gauge_size}; - my $win = new DC::UI::Frame ( + $GAUGES->{win} = my $win = new DC::UI::Frame ( force_x => 0, force_y => "max", force_w => $WIDTH, @@ -1276,21 +1283,10 @@ ], ); - $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); - $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); - $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); - $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); - - $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); - $vbox->add (my $prg = new DC::UI::ExperienceProgress); - $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); - $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); - - $GAUGES = { - exp => $exp, prg => $prg, sklprg => $sklprg, - win => $win, range => $rng, - hp => $hg, mana => $mg, grace => $gg, food => $fg, - }; + $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); + $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); + $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); + $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); &set_gauge_window_fontsize; @@ -1754,6 +1750,7 @@ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); $table->add_at (1, $row++, new DC::UI::CheckBox + c_colspan => 2, state => $CFG->{show_tips}, tooltip => "Show the Tip of the day window at startup?", on_changed => sub { @@ -1765,6 +1762,7 @@ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry + c_colspan => 2, text => $CFG->{logview_max_par}, tooltip => "This is maximum number of messages remembered in the Message window. If the server " . "sends more messages than this number, older messages get removed to save memory and " @@ -1776,6 +1774,28 @@ }, ); + $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave"); + $table->add_at (1, $row, new DC::UI::CheckBox + state => $CFG->{config_autosave}, + tooltip => "Normally, configuration settings and the user interface layout " + . "are saved on client exit. You can disable this behaviour by " + . "unchecking this checkbox.", + on_changed => sub { + my ($self, $value) = @_; + $CFG->{config_autosave} = $value; + 0 + } + ); + $table->add_at (2, $row++, new DC::UI::Button + text => "Save Now", + tooltip => "Use this to manually save configuration and UI layout when " + . "autosave is disabled.", + on_activate => sub { + DC::write_cfg; + 0 + } + ); + $table } @@ -2000,7 +2020,7 @@ } } -sub player_window { +sub make_playerbook { my $plwin = $PL_WINDOW = new DC::UI::Toplevel x => "center", y => "center", @@ -2044,7 +2064,6 @@ $ntb->set_current_page ($INVENTORY_PAGE); $plwin->add ($ntb); - $plwin } sub keyboard_setup { @@ -2153,27 +2172,6 @@ $win } -sub open_string_query { - my ($title, $cb, $txt, $tooltip) = @_; - my $dialog = new DC::UI::Toplevel - x => "center", - y => "center", - z => 50, - force_w => $WIDTH * 4/5, - title => $title; - - $dialog->add ( - my $e = new DC::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 DC::UI::Toplevel @@ -2214,6 +2212,94 @@ $QUIT_DIALOG->grab_focus; } +sub make_menuframe { + $MENUFRAME = new DC::UI::Toplevel + border => 0, + force_x => 0, + force_y => 0, + force_w => $::WIDTH, + child => ($MENUBAR = new DC::UI::HBox), + ; + + $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar); + + # XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D + make_gauge_window->show; + +# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, +# tooltip => "Toggles the server message log, where the client collects all messages from the server."); + + make_playerbook; + + $MENUPOPUP = DC::UI::Menu->new (items => [ + ["Setup…" , sub { $SETUP_DIALOG->toggle_visibility}], + ["Playerbook…\tTab", sub { $PL_WINDOW ->toggle_visibility}], + ["Help Browser…" , sub { $HELP_WINDOW ->toggle_visibility}], + ["Quit…" , sub { + if ($CONN) { + open_quit_dialog; + } else { + EV::unloop EV::UNLOOP_ALL; + } + }], + ]); + + $BUTTONBAR->add (new DC::UI::Button text => "Menu…", + tooltip => "Shows the main menu", + on_button_down => sub { $MENUPOPUP->popup ($_[1]) }, + ); + + $MENUBAR->add ($GAUGES->{prg} = new DC::UI::ExperienceProgress + c_rescale => 1, + padding_x => 6, + padding_y => 3, + force_w => $::WIDTH * 0.1, + tooltip => "This progress bar shows your progress towards the next character level.", + ); + $MENUBAR->add ($GAUGES->{exp} = new DC::UI::Label + align => 1, can_hover => 1, can_events => 1, + text => "Total Experience", + tooltip => "#stat_exp", + fontsize => 0.8, + ); + $MENUBAR->add ($GAUGES->{sklprg} = new DC::UI::ExperienceProgress + c_rescale => 1, + padding_x => 6, + padding_y => 3, + force_w => $::WIDTH * 0.2, + tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.", + ); + $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label + expand => 1, + align => 1, can_hover => 1, can_events => 1, + text => "Range and Combat Slots", + tooltip => "#stat_ranged", + ); + + $MENUFRAME->show; +} + +sub open_string_query { + my ($title, $cb, $txt, $tooltip) = @_; + my $dialog = new DC::UI::Toplevel + x => "center", + y => "center", + z => 50, + force_w => $WIDTH * 4/5, + title => $title; + + $dialog->add ( + my $e = new DC::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 show_tip_of_the_day { # find all tips my @tod = DC::Pod::find tip_of_the_day => "*"; @@ -2362,12 +2448,12 @@ bg => [0, 0, 0, 0.4], force_x => 0, force_y => "max", - child => (my $LR = new DC::UI::VBox), + child => (my $LL = new DC::UI::VBox), )->show; - $LR->add ($STATUSBOX); - $LR->add ($MODBOX); - $LR->add (new DC::UI::Label + $LL->add ($STATUSBOX); + $LL->add ($MODBOX); + $LL->add (new DC::UI::Label align => 0, markup => "Use Alt-Enter to toggle fullscreen mode", fontsize => 0.5, @@ -2446,47 +2532,8 @@ $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, "Some debuggin' options. Do not ask."); - $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top - - $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, - tooltip => "Toggles a dialog where you can configure all aspects of this client."); - -# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, -# tooltip => "Toggles the server message log, where the client collects all messages from the server."); - - 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 DC::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 DC::UI::Button - text => "Save Config", - tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", - on_activate => sub { - $::CFG->{layout} = DC::UI::get_layout; - DC::write_cfg; - status "Configuration Saved"; - 0 - }, - ); - - $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, - tooltip => "View Documentation"); - - $BUTTONBAR->add (new DC::UI::Button - text => "Quit", - tooltip => "Terminates the program", - on_activate => sub { - if ($CONN) { - open_quit_dialog; - } else { - EV::unloop EV::UNLOOP_ALL; - } - 0 - }, - ); + make_menuframe; - $BUTTONBAR->show; $SETUP_DIALOG->show; $MESSAGE_WINDOW->show; } @@ -2633,6 +2680,7 @@ DC::UI::set_layout ($::CFG->{layout}); my %DEF_CFG = ( + config_autosave => 1, sdl_mode => undef, fullscreen => 1, fast => 0, @@ -2739,8 +2787,11 @@ delete $SIG{__DIE__}; EV::loop; -#video_shutdown; -#audio_shutdown; + DC::write_cfg if $CFG->{config_autosave}; + + #video_shutdown; + #audio_shutdown; + DC::OpenGL::quit; DC::SDL_Quit; DC::DB::Server::stop;