--- deliantra/Deliantra-Client/bin/deliantra	2007/12/29 13:44:31	1.22
+++ deliantra/Deliantra-Client/bin/deliantra	2008/01/06 16:28:50	1.23
@@ -110,8 +110,10 @@
 use DC::UI::Inventory;
 use DC::UI::SpellList;
 use DC::UI::Dockable;
+use DC::UI::Dockbar;
 use DC::UI::MessageWindow;
 use DC::UI::ChatView;
+use DC::MessageDistributor;
 use DC::Pod;
 use DC::MapWidget;
 use DC::Macro;
@@ -180,6 +182,7 @@
 
 our $HELP_WINDOW;
 our $MESSAGE_WINDOW;
+our $MESSAGE_DIST;
 our $FLOORBOX;
 our $GAUGES;
 our $STATWIDS;
@@ -206,7 +209,7 @@
 }
 
 sub message {
-   $MESSAGE_WINDOW->message (@_);
+   $MESSAGE_DIST->message (@_);
 }
 
 #############################################################################
@@ -807,7 +810,7 @@
    $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
    $table->add_at (1, $row++, new DC::UI::CheckBox
       state => $CFG->{force_opengl11},
-      tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
+      tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
                . "higher memory usage and slower performance. It will, however, help tremendously on "
                . "cards that claim to support a feature but fall back to software rendering. "
                . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
@@ -885,7 +888,7 @@
       range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
       tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
                . "but you still need to press apply to correctly re-layout the widget.",
-      on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
+      on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
    );
 
    $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
@@ -1600,7 +1603,7 @@
                . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
       on_changed => sub {
          my ($self, $value) = @_;
-         $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
+         $MESSAGE_DIST->set_max_para ($CFG->{logview_max_par} = $value*1);
          0
       },
    );
@@ -2170,8 +2173,8 @@
       $MAPWIDGET->connect (activate_console => sub {
          my ($mapwidget, $preset) = @_;
 
-         $MESSAGE_WINDOW->activate_console ($preset)
-            if $MESSAGE_WINDOW;
+         $MESSAGE_DIST->activate_console ($preset)
+            if $MESSAGE_DIST;
       });
       $MAPWIDGET->show;
       $MAPWIDGET->grab_focus;
@@ -2193,7 +2196,8 @@
       ;
 
       $METASERVER = metaserver_dialog;
-      $MESSAGE_WINDOW = new DC::UI::MessageWindow;
+      $MESSAGE_WINDOW = new DC::UI::Dockbar;
+      $MESSAGE_DIST   = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
 
       $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1,
          filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);