--- deliantra/Deliantra-Client/bin/cfplus 2007/07/19 15:43:14 1.177 +++ deliantra/Deliantra-Client/bin/cfplus 2007/07/27 18:04:43 1.187 @@ -84,8 +84,10 @@ use CFPlus::Protocol; use CFPlus::DB; use CFPlus::UI; +use CFPlus::UI::Canvas; use CFPlus::UI::Inventory; use CFPlus::UI::SpellList; +use CFPlus::UI::MessageWindow; use CFPlus::Pod; use CFPlus::MapWidget; use CFPlus::Macro; @@ -127,8 +129,6 @@ our $MAPMAP; our $MAPWIDGET; our $BUTTONBAR; -our $LOGVIEW; -our $CONSOLE; our $METASERVER; our $LOGIN_BUTTON; our $QUIT_DIALOG; @@ -180,9 +180,6 @@ 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]); } @@ -193,13 +190,7 @@ sub message { my ($para) = @_; - - my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; - - $para->{markup} = "$time $para->{markup}"; - - $LOGVIEW->add_paragraph ($para); - $LOGVIEW->scroll_to_bottom; + $MESSAGE_WINDOW->message ($para); } sub destroy_query_dialog { @@ -274,7 +265,7 @@ unshift @dialog, my $table = new CFPlus::UI::Table; - $table->add (0, 0, new CFPlus::UI::Button + $table->add_at (0, 0, new CFPlus::UI::Button text => "Next Race", on_activate => sub { $conn->send ("reply n"); @@ -282,7 +273,7 @@ 0 }, ); - $table->add (2, 0, new CFPlus::UI::Button + $table->add_at (2, 0, new CFPlus::UI::Button text => "Accept", on_activate => sub { $conn->send ("reply d"); @@ -335,7 +326,7 @@ unshift @dialog, my $table = new CFPlus::UI::Table; # left: re-roll - $table->add (0, 0, new CFPlus::UI::Button + $table->add_at (0, 0, new CFPlus::UI::Button text => "Roll Again", on_activate => sub { $conn->send ("reply y"); @@ -359,7 +350,7 @@ ], ), 1 .. 2; - $table->add (2, 0, new CFPlus::UI::Button + $table->add_at (2, 0, new CFPlus::UI::Button text => "Swap Stats", on_activate => sub { $conn->{stat_change_with} = $sw2->{value}; @@ -368,10 +359,10 @@ 0 }, ); - $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); + $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); # right: accept - $table->add (4, 0, new CFPlus::UI::Button + $table->add_at (4, 0, new CFPlus::UI::Button text => "Accept", on_activate => sub { $conn->send ("reply n"); @@ -462,7 +453,6 @@ client => "cfplus $CFPlus::VERSION $] $^O", map_widget => $MAPWIDGET, - logview => $LOGVIEW, statusbox => $STATUSBOX, map => $MAP, mapmap => $MAPMAP, @@ -523,8 +513,8 @@ my $row = 0; - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); - $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); + $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, can_events => 1, tooltip => "" . (CFPlus::OpenGL::gl_extensions) . ""); @@ -532,8 +522,8 @@ "Video Mode. The video mode to use for fullscreen (and the window size for windowed operation). " . "The format is width x height \@ depth-per-channel + alpha-channel."; - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); - $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); + $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], @@ -550,28 +540,28 @@ }); $mode_slider->emit (changed => $mode_slider->{range}[0]); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); - $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); + $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox state => $CFG->{fullscreen}, tooltip => "Bring the client into fullscreen mode.", on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); - $table->add (1, $row++, new CFPlus::UI::CheckBox + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); + $table->add_at (1, $row++, new CFPlus::UI::CheckBox state => $CFG->{fast}, tooltip => "Lower the visual quality considerably to speed up rendering.", on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); - $table->add (1, $row++, new CFPlus::UI::Slider + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); + $table->add_at (1, $row++, new CFPlus::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]; 0 }, ); - $table->add (1, $row++, new CFPlus::UI::Button + $table->add_at (1, $row++, new CFPlus::UI::Button expand => 1, align => 0, text => "Apply", tooltip => "Apply the video settings above.", on_activate => sub { @@ -581,15 +571,15 @@ } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); - $table->add (1, $row++, new CFPlus::UI::Slider + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); + $table->add_at (1, $row++, new CFPlus::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; 0 } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); - $table->add (1, $row++, new CFPlus::UI::CheckBox + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); + $table->add_at (1, $row++, new CFPlus::UI::CheckBox state => $CFG->{map_smoothing}, tooltip => "Map Smoothing tries to make tile borders less square. " . "This increases load on the graphics subsystem and works only with 2.x servers. " @@ -597,29 +587,29 @@ on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); - $table->add (1, $row++, new CFPlus::UI::CheckBox + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); + $table->add_at (1, $row++, new CFPlus::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; 0 } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); - $table->add (1, $row++, new CFPlus::UI::Slider + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); + $table->add_at (1, $row++, new CFPlus::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; 0 } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); - $table->add (1, $row++, new CFPlus::UI::Slider + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); + $table->add_at (1, $row++, new CFPlus::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]); 0 }, + on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); - $table->add (1, $row++, new CFPlus::UI::Slider + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); + $table->add_at (1, $row++, new CFPlus::UI::Slider range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", on_changed => sub { @@ -629,8 +619,8 @@ } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); - $table->add (1, $row++, new CFPlus::UI::Slider + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); + $table->add_at (1, $row++, new CFPlus::UI::Slider range => [$CFG->{gauge_size}, 0.2, 0.8], tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", on_changed => sub { @@ -650,18 +640,18 @@ my $row = 0; - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); - $table->add (1, $row++, new CFPlus::UI::CheckBox + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); + $table->add_at (1, $row++, new CFPlus::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]; 0 } ); -# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); -# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { +# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); +# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { # $CFG->{effects_volume} = $_[1]; # }); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); - $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); + $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); $hbox->add (new CFPlus::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.", @@ -673,7 +663,7 @@ on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } ); - $table->add (1, $row++, new CFPlus::UI::Button + $table->add_at (1, $row++, new CFPlus::UI::Button expand => 1, align => 0, text => "Apply", tooltip => "Apply the audio settings", on_activate => sub { @@ -742,17 +732,50 @@ sub debug_setup { my $table = new CFPlus::UI::Table; - $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); - $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); - $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); - $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); - $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); - $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 { &CFPlus::debug() } ); + $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders"); + $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); + $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); + $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); + $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS"); + $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); + $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); + $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); + $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); + + $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# + + $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); + $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); + $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); + $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); + $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); + $t->add_at (1,1, new CFPlus::UI::Label text => "e"); + + $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); + + $c->add_items ({ + type => "line_loop", + color => [0, 1, 0], + width => 9, + coord_mode => "abs", + coord => [[10, 5], [5, 50], [20, 5], [5, 60]], + }); - $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# + $c->add_items ({ + type => "lines", + color => [1, 1, 0], + width => 2, + coord_mode => "rel", + coord => [[0,0], [1,1], [1,0], [0,1]], + }); + + $c->add_items ({ + type => "polygon", + color => [0, 0.43, 0], + width => 2, + coord_mode => "rel", + coord => [[0,0.2], [1,.4], [1,.6], [0,.8]], + }); $table } @@ -810,10 +833,10 @@ ) { my ($col, $row, $id, $label, $template) = @$_; - $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label + $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => "#stat_$label"); - $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label + $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => "#stat_$label"); } @@ -864,11 +887,12 @@ 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 blind fear tund elec cold ghit/) { - $tbl2->add ($col, $row, + $tbl2->add_at ($col, $row, $STATWIDS->{"res_$_"} = new CFPlus::UI::Label font => $FONT_FIXED, @@ -879,14 +903,14 @@ can_hover => 1, tooltip => $resist_names{$_}->[1], ); - $tbl2->add ($col + 1, $row, new CFPlus::UI::Image + $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image font => $FONT_FIXED, can_hover => 1, can_events => 1, path => "ui/resist/resist_$_.png", tooltip => $resist_names{$_}->[1], ); - $tbl2->add ($col + 2, $row, new CFPlus::UI::Label + $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label text => $resist_names{$_}->[0], font => $FONT_FIXED, can_hover => 1, @@ -929,7 +953,7 @@ my $table = $METASERVER->{table}; $table->clear; - $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); + $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); my $ok = 0; @@ -950,7 +974,7 @@ "Short information about this server provided by its admins.", ); my @col = qw(#Users Host Uptime Version Description); - $table->add ($_, 0, new CFPlus::UI::Label + $table->add_at ($_, 0, new CFPlus::UI::Label can_hover => 1, can_events => 1, align => 0, fg => [1, 1, 0], text => $col[$_], tooltip => $tip[$_]) @@ -982,7 +1006,7 @@ $y++; - $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ + $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [ (new CFPlus::UI::Button text => "Use", tooltip => "Put this server into the Host:Port field", @@ -995,7 +1019,7 @@ (new CFPlus::UI::Empty expand => 1), ]); - $table->add ($_, $y, new CFPlus::UI::Label + $table->add_at ($_, $y, new CFPlus::UI::Label max_w => $::WIDTH * 0.4, ellipsise => 0, align => $align[$_], @@ -1046,10 +1070,10 @@ 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"); + $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); { - $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); + $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox); $vbox->add ( $HOST_ENTRY = new CFPlus::UI::Entry @@ -1073,23 +1097,23 @@ ); } - $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); - $table->add (1, 4, new CFPlus::UI::Entry + $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); + $table->add_at (1, 4, new CFPlus::UI::Entry text => $CFG->{profile}{default}{user}, tooltip => "The name of your character on the server", on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } ); - $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); - $table->add (1, 5, new CFPlus::UI::Entry + $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); + $table->add_at (1, 5, new CFPlus::UI::Entry text => $CFG->{profile}{default}{password}, hidden => 1, tooltip => "The password for your character", on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } ); - $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); - $table->add (1, 7, new CFPlus::UI::Slider + $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); + $table->add_at (1, 7, new CFPlus::UI::Slider force_w => 100, range => [$CFG->{mapsize}, 10, 100, 0, 1], tooltip => "This is the size of the portion of the map update the server sends you. " @@ -1099,8 +1123,8 @@ on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, ); - $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); - $table->add (1, 8, new CFPlus::UI::CheckBox + $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); + $table->add_at (1, 8, new CFPlus::UI::CheckBox state => $CFG->{face_prefetch}, tooltip => "Background Image Prefetch\n\n" . "If enabled, the client automatically pre-fetches images from the server. " @@ -1112,8 +1136,8 @@ on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, ); - $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); - $table->add (1, 9, new CFPlus::UI::Entry + $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); + $table->add_at (1, 9, new CFPlus::UI::Entry text => $CFG->{output_rate}, tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " . "when sending images, to ensure interactiveness. When 0 or unset, the server " @@ -1121,21 +1145,21 @@ on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, ); - $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); - $table->add (1, 10, new CFPlus::UI::Entry + $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); + $table->add_at (1, 10, new CFPlus::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]; 0 }, ); - $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); - $table->add (1, 11, new CFPlus::UI::Entry + $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); + $table->add_at (1, 11, new CFPlus::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]; 0 }, ); - $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button + $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button expand => 1, align => 0, text => "Login", @@ -1159,21 +1183,8 @@ my $row = 0; - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); - $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry - 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.", - on_changed => sub { - my ($self, $value) = @_; - $CFG->{say_command} = $value; - 0 - } - ); - - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); - $table->add (1, $row++, new CFPlus::UI::CheckBox + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); + $table->add_at (1, $row++, new CFPlus::UI::CheckBox state => $CFG->{show_tips}, tooltip => "Show the Tip of the day window at startup?", on_changed => sub { @@ -1183,15 +1194,15 @@ } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); - $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); + $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry text => $CFG->{logview_max_par}, tooltip => "This is maximum number of messages remembered in the Messages window. If the server " . "sends more messages than this number, older messages get removed to save memory and " . "computing time. A value of 0 disables this feature, but that is not recommended.", on_changed => sub { my ($self, $value) = @_; - $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; + $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 0 }, ); @@ -1199,69 +1210,6 @@ $table } -sub message_window { - my $window = new CFPlus::UI::Toplevel - name => "message_window", - title => "Messages", - border_bg => [1, 1, 1, 1], - x => "max", - y => 0, - force_w => $::WIDTH * 0.4, - force_h => $::HEIGHT * 0.5, - child => (my $vbox = new CFPlus::UI::VBox), - has_close_button => 1; - - $vbox->add ($LOGVIEW); - - $vbox->add (my $input = new CFPlus::UI::Entry - tooltip => "Chat Box. If you enter a text and press return/enter here, the current communication command " - . "from the client setup will be prepended (e.g. shout, chat...). " - . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " - . "A better way to submit commands (and the occasional chat command) is often the map command completer.", - on_focus_in => sub { - my ($input, $prev_focus) = @_; - - delete $input->{refocus_map}; - - if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { - $input->{refocus_map} = 1; - } - delete $input->{auto_activated}; - - 0 - }, - on_activate => sub { - my ($input, $text) = @_; - $input->set_text (''); - - if ($text =~ /^\/(.*)/) { - $::CONN->user_send ($1); - } else { - my $say_cmd = $::CFG->{say_command} || 'say'; - $::CONN->user_send ("$say_cmd $text"); - } - if ($input->{refocus_map}) { - delete $input->{refocus_map}; - $MAPWIDGET->focus_in - } - - 0 - }, - on_escape => sub { - $MAPWIDGET->grab_focus; - - 0 - }, - ); - - $CONSOLE = { - window => $window, - input => $input, - }; - - $window -} - sub autopickup_setup { my $r = new CFPlus::UI::ScrolledWindow ( expand => 1, @@ -1315,14 +1263,14 @@ ) { my ($title, $x, $y, @bits) = @$_; - $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); + $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); for (@bits) { ++$y; my $mask = $_->[1]; - $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); - $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox + $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); + $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox state => $::CFG->{pickup} & $mask, on_changed => sub { my ($box, $value) = @_; @@ -1343,7 +1291,7 @@ } } - $table->add (2, 18, new CFPlus::UI::ValSlider + $table->add_at (2, 18, new CFPlus::UI::ValSlider range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], template => ">= 99", to_value => sub { ">= " . 5 * $_[0] }, @@ -1356,7 +1304,7 @@ 1; }); - $table->add (3, 18, new CFPlus::UI::Button + $table->add_at (3, 18, new CFPlus::UI::Button text => "set", on_activate => sub { $::CONN->send_command ("pickup $::CFG->{pickup}") @@ -1455,27 +1403,27 @@ $PL_NOTEBOOK = new CFPlus::UI::Notebook expand => 1; - $ntb->add ( + $ntb->add_tab ( "Statistics (F2)" => $STATS_PAGE = stats_window, "Shows statistics, where all your Stats and Resistances are shown." ); - $ntb->add ( + $ntb->add_tab ( "Skills (F3)" => $SKILL_PAGE = skill_window, "Shows all your Skills." ); my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); - $ntb->add ( + $ntb->add_tab ( "Spellbook (F4)" => $spellsw, "Displays all spells you have and lets you edit keyboard shortcuts for them." ); - $ntb->add ( + $ntb->add_tab ( "Inventory (F5)" => $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->add (Pickup => autopickup_setup, + $ntb->add_tab (Pickup => autopickup_setup, "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); $ntb->set_current_page ($INVENTORY_PAGE); @@ -1683,13 +1631,13 @@ $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); - $table->add (0, 0, new CFPlus::UI::Button + $table->add_at (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 + $table->add_at (2, 0, new CFPlus::UI::Button text => "Next", tooltip => "Show the next Tip of the day.", on_activate => sub { @@ -1768,29 +1716,12 @@ $MAPWIDGET->connect (activate_console => sub { my ($mapwidget, $preset) = @_; - if ($CONSOLE) { - $CONSOLE->{input}->{auto_activated} = 1; - $CONSOLE->{input}->grab_focus; - - if ($preset && $CONSOLE->{input}->get_text eq '') { - $CONSOLE->{input}->set_text ($preset); - } - } + $MESSAGE_WINDOW->activate_console ($preset) + if $MESSAGE_WINDOW; }); $MAPWIDGET->show; $MAPWIDGET->grab_focus; - $LOGVIEW = new CFPlus::UI::TextScroller - expand => 1, - font => $FONT_FIXED, - fontsize => $::CFG->{log_fontsize}, - indent => -4, - can_hover => 1, - can_events => 1, - max_par => $CFG->{logview_max_par}, - tooltip => "Server Log. This text viewer contains all recent messages sent by the server.", - ; - $SETUP_DIALOG = new CFPlus::UI::Toplevel title => "Setup", name => "setup_dialog", @@ -1803,26 +1734,27 @@ ; $METASERVER = metaserver_dialog; + $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow; $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); - $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, + $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, "Configure the server to play on, your username, password and other server-related options."); - $SETUP_NOTEBOOK->add (Client => client_setup, + $SETUP_NOTEBOOK->add_tab (Client => client_setup, "Configure various client-specific settings."); - $SETUP_NOTEBOOK->add (Graphics => graphics_setup, + $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup, "Configure the video mode, performance, fonts and other graphical aspects of the game."); - $SETUP_NOTEBOOK->add (Audio => audio_setup, + $SETUP_NOTEBOOK->add_tab (Audio => audio_setup, "Configure the use of audio, sound effects and background music."); - $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, + $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup, "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 (Debug => debug_setup, + $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, "Some debuggin' options. Do not ask."); $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top @@ -1830,7 +1762,7 @@ $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, tooltip => "Toggles a dialog where you can configure all aspects of this client."); - $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, + $BUTTONBAR->add (new CFPlus::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 @@ -1873,125 +1805,6 @@ $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->hide if $BUILD_BUTTON; - $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; @@ -2023,6 +1836,8 @@ or return; CFPlus::DB::prefetch_file $path, 1024_000, sub { + return unless $SDL_MIXER; + # music might have changed... $path eq $MUSIC_PLAYING->{path} or return &audio_music_start (); @@ -2047,6 +1862,7 @@ sub audio_music_changed { return unless $CFG->{bgm_enable}; + return unless $SDL_MIXER; # default MUSIC_WANT == MUSIC_DEFAULT @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT; @@ -2116,6 +1932,8 @@ } else { status "unable to open sound config: $!"; } + } else { + undef $SDL_MIXER; } } @@ -2249,7 +2067,6 @@ gauge_size => 0.35, stat_fontsize => 0.7, mapsize => 100, - say_command => 'chat', audio_enable => 1, bgm_enable => 1, bgm_volume => 0.25,