[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/deliantra

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.14 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.22 by root, Sat Dec 29 13:44:31 2007 UTC

       unshift @INC, $root;
    }
 }
+# prepend private library directory
+BEGIN {
+   for (grep !ref, @INC) {
+      my $path = "$_/Deliantra/Client/private/dc";
+      if (-d $path) {
+         unshift @INC, $path;
+         last;
+      }
+   }
+}
 # need to do it again because that pile of garbage called PAR nukes it before main
 unshift @INC, $ENV{PAR_TEMP}
    if %PAR::LibCache;
 use Time::HiRes 'time';
 use Deliantra;
 use Deliantra::Protocol::Constants;
 use Compress::LZF;
-use CFPlus;
+use DC;
-use CFPlus::OpenGL ();
+use DC::OpenGL ();
-use CFPlus::Protocol;
+use DC::Protocol;
-use CFPlus::DB;
+use DC::DB;
-use CFPlus::UI;
+use DC::UI;
-use CFPlus::UI::Canvas;
+use DC::UI::Canvas;
-use CFPlus::UI::Inventory;
+use DC::UI::Inventory;
-use CFPlus::UI::SpellList;
+use DC::UI::SpellList;
-use CFPlus::UI::Dockable;
+use DC::UI::Dockable;
-use CFPlus::UI::MessageWindow;
+use DC::UI::MessageWindow;
-use CFPlus::UI::ChatView;
+use DC::UI::ChatView;
-use CFPlus::Pod;
+use DC::Pod;
-use CFPlus::MapWidget;
+use DC::MapWidget;
-use CFPlus::Macro;
+use DC::Macro;
 $SIG{QUIT} = sub { Carp::cluck "QUIT" };
 $SIG{PIPE} = 'IGNORE';
 $EV::DIED = sub {
-   CFPlus::fatal Carp::longmess $@;
+   DC::fatal Carp::longmess $@;
 };
 my $MAX_FPS = 60;
-my $MIN_FPS =  5; # unused as of yet
 our $META_SERVER = "http://metaserver.schmorp.de/current.json";
 our $LAST_REFRESH;
 our $NOW;
 our $INVR_HB;
 #############################################################################
 sub status {
-   $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
+   $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
 }
 sub debug {
    $DEBUG_STATUS->set_text ($_[0]);
 }
    if (my $chunk = $AUDIO_CHUNK{$face}) {
       for (grep $_->[0] >= EV::now, @{(delete $AUDIO_PLAY{$face}) || []}) {
          my (undef, $dx, $dy, $vol) = @$_;
-         my $channel = CFPlus::Channel::find;
+         my $channel = DC::Channel::find;
          $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
          $channel->set_position_r ($dx, $dy, 20);
          $chunk->play ($channel);
       }
    } else {
             push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
             &audio_music_push ($face);
          }
       } else {
          # fetch from database
-         CFPlus::DB::get res_data => $meta->{name}, sub {
+         DC::DB::get res_data => $meta->{name}, sub {
-            my $rwops = new CFPlus::RW $_[0];
+            my $rwops = new DC::RW $_[0];
-            my $chunk = new CFPlus::MixChunk $rwops
+            my $chunk = new DC::MixChunk $rwops
-               or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
+               or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError;
             $chunk->volume (($meta->{data}{volume} || 1) * 128);
             $AUDIO_CHUNK{$face} = $chunk;
             audio_sound_push ($face);
          };
 sub audio_music_set_meta {
    my ($meta) = @_;
    $MUSIC_PLAYING_META = $meta;
    $MUSIC_PLAYING_WIDGET->set_markup (
-      "<b>Name</b>:	" . (CFPlus::asxml $meta->{data}{name}) . "\n"
+      "<b>Name</b>:	" . (DC::asxml $meta->{data}{name}) . "\n"
-    . "<b>Author</b>:	" . (CFPlus::asxml $meta->{data}{author}) . "\n"
+    . "<b>Author</b>:	" . (DC::asxml $meta->{data}{author}) . "\n"
-    . "<b>Source</b>:	" . (CFPlus::asxml $meta->{data}{source}) . "\n"
+    . "<b>Source</b>:	" . (DC::asxml $meta->{data}{source}) . "\n"
-    . "<b>License</b>:	" . (CFPlus::asxml $meta->{data}{license})
+    . "<b>License</b>:	" . (DC::asxml $meta->{data}{license})
    );
 }
 sub audio_music_update_volume {
    return unless $MUSIC_PLAYING_META;
    my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
    my $base   = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
-   CFPlus::MixMusic::volume $base * $volume * 128;
+   DC::MixMusic::volume $base * $volume * 128;
 }
 sub audio_music_start {
    my $meta = $MUSIC_PLAYING_META;
-   CFPlus::DB::get res_data => $meta->{name}, sub {
+   DC::DB::get res_data => $meta->{name}, sub {
       return unless $SDL_MIXER;
       # music might have changed...
       $meta eq $MUSIC_PLAYING_META
          or return &audio_music_start ();
       audio_music_update_volume;
       $MUSIC_PLAYING_DATA = \$_[0];
       my $rwops = $meta->{path}
-         ? new_from_file CFPlus::RW $meta->{path}
+         ? new_from_file DC::RW $meta->{path}
-         : new CFPlus::RW $$MUSIC_PLAYING_DATA;
+         : new DC::RW $$MUSIC_PLAYING_DATA;
-      $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
+      $MUSIC_PLAYER = new DC::MixMusic $rwops
-         or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
+         or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError;
       my $NOW = time;
       if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
          my $pos = $MUSIC_PLAYING_META->{stop_pos};
       # randomize music a bit so that the order is not always the same
       $_->{stop_time} ||= rand for @MUSIC_HAVE;
       # default MUSIC_HAVE == MUSIC_DEFAULT
-      @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" }
+      @MUSIC_HAVE = { path => DC::find_rcfile "music/$MUSIC_DEFAULT" }
          unless @MUSIC_HAVE;
    }
    # if the currently playing song is acceptable, let it continue
    return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
    my $NOW = time;
    if ($MUSIC_PLAYING_META) {
       $MUSIC_PLAYING_META->{stop_time} = $NOW;
       $MUSIC_PLAYING_META->{stop_pos}  = $NOW - $MUSIC_START;
-      CFPlus::MixMusic::fade_out $fade_out;
+      DC::MixMusic::fade_out $fade_out;
    } else {
       # sort by stop time, oldest first
       @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
       # if the most recently-played piece played very recently,
 }
 sub audio_init {
    if ($CFG->{audio_enable}) {
       $ENV{MIX_EFFECTSMAXSPEED} = 1;
-      $SDL_MIXER = !CFPlus::Mix_OpenAudio
+      $SDL_MIXER = !DC::Mix_OpenAudio
          $CFG->{audio_hw_frequency},
-         CFPlus::MIX_DEFAULT_FORMAT,
+         DC::MIX_DEFAULT_FORMAT,
          $CFG->{audio_hw_channels},
          $CFG->{audio_hw_chunksize};
       if ($SDL_MIXER) {
-         CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
+         DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
          audio_music_finished;
       } else {
          status "Unable to open sound device: there will be no sound";
       }
    $MUSIC_WANT   = [];
    @MUSIC_JINGLE = ();
    %AUDIO_PLAY   = ();
    %AUDIO_CHUNK  = ();
-   CFPlus::Mix_CloseAudio if $SDL_MIXER;
+   DC::Mix_CloseAudio if $SDL_MIXER;
    undef $SDL_MIXER;
 }
 #############################################################################
          return;
       }
    }
-   $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
+   $conn->{query_dialog} = my $dialog = new DC::UI::Toplevel
       x     => "center",
       y     => "center",
       title => "Server Query",
-      child => my $vbox = new CFPlus::UI::VBox,
+      child => my $vbox = new DC::UI::VBox,
    ;
-   my @dialog = my $label = new CFPlus::UI::Label
+   my @dialog = my $label = new DC::UI::Label
       max_w     => $::WIDTH * 0.8,
       ellipsise => 0,
       text      => $prompt;
    if ($flags & CS_QUERY_YESNO) {
-      push @dialog, my $hbox = new CFPlus::UI::HBox;
+      push @dialog, my $hbox = new DC::UI::HBox;
-      $hbox->add (new CFPlus::UI::Button
+      $hbox->add (new DC::UI::Button
          text => "No",
          on_activate => sub {
             $conn->send ("reply n");
             $dialog->destroy;
             0
          }
       );
-      $hbox->add (new CFPlus::UI::Button
+      $hbox->add (new DC::UI::Button
          text => "Yes",
          on_activate => sub {
             $conn->send ("reply y");
             destroy_query_dialog $conn;
             0
    } elsif ($flags & CS_QUERY_SINGLECHAR) {
       if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
          $dialog->{tooltip} = "#charcreation_focus";
-         unshift @dialog, new CFPlus::UI::Label
+         unshift @dialog, new DC::UI::Label
             max_w     => $::WIDTH * 0.8,
             ellipsise => 0,
             markup    => "\nOr use your keyboard and the text entry below:\n";
-         unshift @dialog, my $table = new CFPlus::UI::Table;
+         unshift @dialog, my $table = new DC::UI::Table;
-         $table->add_at (0, 0, new CFPlus::UI::Button
+         $table->add_at (0, 0, new DC::UI::Button
              text => "Next Race",
              on_activate => sub {
                 $conn->send ("reply n");
                 destroy_query_dialog $conn;
                 0
              },
          );
-         $table->add_at (2, 0, new CFPlus::UI::Button
+         $table->add_at (2, 0, new DC::UI::Button
              text => "Accept",
              on_activate => sub {
                 $conn->send ("reply d");
                 destroy_query_dialog $conn;
                 0
              },
          );
          if ($conn->{chargen_race_description}) {
-            unshift @dialog, new CFPlus::UI::Label
+            unshift @dialog, new DC::UI::Label
                max_w     => $::WIDTH * 0.8,
                ellipsise => 0,
                markup    => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
             ;
          }
-         unshift @dialog, new CFPlus::UI::Face
+         unshift @dialog, new DC::UI::Face
             face  => $conn->{player}{face},
             bg    => [.2, .2, .2, 1],
             min_w => 64,
             min_h => 64,
          ;
          if ($conn->{chargen_race_title}) {
-            unshift @dialog, new CFPlus::UI::Label
+            unshift @dialog, new DC::UI::Label
                allign => 1,
                ellipsise => 0,
                markup    => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
             ;
          }
-         unshift @dialog, new CFPlus::UI::Label
+         unshift @dialog, new DC::UI::Label
             max_w     => $::WIDTH * 0.4,
             ellipsise => 0,
-            markup    => (CFPlus::Pod::section_label ui => "chargen_race"),
+            markup    => (DC::Pod::section_label ui => "chargen_race"),
          ;
       } elsif ($prompt =~ /roll new stats/) {
          if (my $stat = delete $conn->{stat_change_with}) {
             $conn->send ("reply $stat");
             destroy_query_dialog $conn;
             return;
          }
-         unshift @dialog, new CFPlus::UI::Label
+         unshift @dialog, new DC::UI::Label
             max_w     => $::WIDTH * 0.4,
             ellipsise => 0,
             markup    => "\nOr use your keyboard and the text entry below:\n";
-         unshift @dialog, my $table = new CFPlus::UI::Table;
+         unshift @dialog, my $table = new DC::UI::Table;
          # left: re-roll
-         $table->add_at (0, 0, new CFPlus::UI::Button
+         $table->add_at (0, 0, new DC::UI::Button
             text => "Roll Again",
             on_activate => sub {
                $conn->send ("reply y");
                destroy_query_dialog $conn;
                0
             },
          );
          # center: swap stats
-         my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
+         my ($sw1, $sw2) = map +(new DC::UI::Selector
                expand  => 1,
                value   => $_,
                options => [
                   [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
                   [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
                   [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
                   [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
                ],
             ), 1 .. 2;
-         $table->add_at (2, 0, new CFPlus::UI::Button
+         $table->add_at (2, 0, new DC::UI::Button
             text => "Swap Stats",
             on_activate => sub {
                $conn->{stat_change_with} = $sw2->{value};
                $conn->send ("reply $sw1->{value}");
                destroy_query_dialog $conn;
                0
             },
          );
-         $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
+         $table->add_at (2, 1, new DC::UI::HBox children => [$sw1, $sw2]);
          # right: accept
-         $table->add_at (4, 0, new CFPlus::UI::Button
+         $table->add_at (4, 0, new DC::UI::Button
             text => "Accept",
             on_activate => sub {
                $conn->send ("reply n");
                $STATS_PAGE->hide;
                destroy_query_dialog $conn;
                0
             },
          );
-         unshift @dialog, my $hbox = new CFPlus::UI::HBox;
+         unshift @dialog, my $hbox = new DC::UI::HBox;
          for (
             [Str => CS_STAT_STR],
             [Dex => CS_STAT_DEX],
             [Con => CS_STAT_CON],
             [Int => CS_STAT_INT],
             [Wis => CS_STAT_WIS],
             [Pow => CS_STAT_POW],
             [Cha => CS_STAT_CHA],
          ) {
             my ($name, $id) = @$_;
-            $hbox->add (new CFPlus::UI::Label
+            $hbox->add (new DC::UI::Label
                markup     => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
-               align      => 0,
                expand     => 1,
                can_events => 1,
                can_hover  => 1,
                tooltip    => "#stat_$name",
             );
          }
-         unshift @dialog, new CFPlus::UI::Label
+         unshift @dialog, new DC::UI::Label
             max_w     => $::WIDTH * 0.4,
             ellipsise => 0,
-            markup    => (CFPlus::Pod::section_label ui => "chargen_stats"),
+            markup    => (DC::Pod::section_label ui => "chargen_stats"),
          ;
       }
-      push @dialog, my $entry = new CFPlus::UI::Entry
+      push @dialog, my $entry = new DC::UI::Entry
          on_changed => sub {
             $conn->send ("reply $_[1]");
             destroy_query_dialog $conn;
             0
          },
       $entry->grab_focus;
    } else {
       $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
-      push @dialog, my $entry = new CFPlus::UI::Entry
+      push @dialog, my $entry = new DC::UI::Entry
          $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
          on_activate => sub {
             $conn->send ("reply $_[1]");
             destroy_query_dialog $conn;
             0
    my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
    my ($host, $port) = split /:/, $PROFILE->{host};
-   $MAP = new CFPlus::Map;
+   $MAP = new DC::Map;
    $CONN = eval {
-      new CFPlus::Protocol
+      new DC::Protocol
          host => $host,
          port => $port || 13327,
          user => $PROFILE->{user},
          pass => $PROFILE->{password},
          mapw => $mapsize,
          maph => $mapsize,
-         client => "cfplus $CFPlus::VERSION $] $^O",
+         client => "cfplus $DC::VERSION $] $^O",
          map_widget => $MAPWIDGET,
          statusbox  => $STATUSBOX,
          map        => $MAP,
          mapmap     => $MAPMAP,
             smoothing => $CFG->{map_smoothing}*1,
          },
    };
    if ($CONN) {
-      CFPlus::lowdelay fileno $CONN->{fh};
+      DC::lowdelay fileno $CONN->{fh};
       status "login successful";
    } else {
       status "unable to connect";
       stop_game();
    $LOGIN_BUTTON->set_text ("Login / Register");
    $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
    $SETUP_DIALOG->show;
    $PL_WINDOW->hide;
    $SPELL_LIST->clear_spells;
-   $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
+   $DC::UI::ROOT->emit (stop_game => ! ! $CONN);
    &audio_music_set_ambient ([]);
    return unless $CONN;
    undef $MAP;
 }
 sub graphics_setup {
-   my $vbox = new CFPlus::UI::VBox;
+   my $vbox = new DC::UI::VBox;
-   $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
+   $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
    my $row = 0;
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
+   $table->add_at (0, $row, new DC::UI::Label 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,
+   $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
                                                  can_events => 1,
-                                                 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
+                                                 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
    my $vidmode_tooltip =
       "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
     . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
-   $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
+   $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
-   $hbox->add (my $mode_slider = new CFPlus::UI::Slider
+   $hbox->add (my $mode_slider = new DC::UI::Slider
       force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
       tooltip => $vidmode_tooltip);
-   $hbox->add (my $mode_label = new CFPlus::UI::Label
+   $hbox->add (my $mode_label = new DC::UI::Label
-      align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
+      height => 0.8, template => "9999x9999@9+9",
       can_events => 1, tooltip => $vidmode_tooltip);
    $mode_slider->connect (changed => sub {
       my ($self, $value) = @_;
       $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
       $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
    });
    $mode_slider->emit (changed => $mode_slider->{range}[0]);
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
-   $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
       state => $CFG->{fullscreen},
       tooltip => "Bring the client into fullscreen mode.",
       on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
-   $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+   $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 "
                . "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, "
                . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
                . "experience extremely low framerates and your card should do better, try this option.</b>",
       on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
-   $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, new DC::UI::CheckBox
       state => $CFG->{texture_compression},
       tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
                . "will save a lot of memory and increase performance. The compression algorithm "
                . "can differ form card to card, so your mileage may vary. This setting is ignored in "
                . "forced OpenGL 1.1 mode.",
       on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
-   $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, new DC::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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
-   $table->add_at (1, $row++, new CFPlus::UI::Slider
+   $table->add_at (1, $row++, new DC::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_at (1, $row++, new CFPlus::UI::Button
+   $table->add_at (1, $row++, new DC::UI::Button
-      expand => 1, align => 0, text => "Apply",
+      expand => 1, text => "Apply",
       tooltip => "Apply the video settings above.",
       on_activate => sub {
          video_shutdown ();
          video_init ();
          0
       }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
-   $table->add_at (1, $row++, new CFPlus::UI::Slider
+   $table->add_at (1, $row++, new DC::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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
-   $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, new DC::UI::CheckBox
       state => $CFG->{map_smoothing},
       tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
                . "This increases load on the graphics subsystem and works only with TRT servers. "
                . "Changes take effect at next login only.",
       on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
-   $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, new DC::UI::CheckBox
       state => $CFG->{fow_enable},
       tooltip => "<b>Fog-of-War</b> 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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
-   $table->add_at (1, $row++, new CFPlus::UI::Slider
+   $table->add_at (1, $row++, new DC::UI::Slider
       range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
       tooltip => "<b>Fog of War Lightness.</b> 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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
-   $table->add_at (1, $row++, new CFPlus::UI::Slider
+   $table->add_at (1, $row++, new DC::UI::Slider
       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 },
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
-   $table->add_at (1, $row++, new CFPlus::UI::Slider
+   $table->add_at (1, $row++, new DC::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 {
          $CFG->{gauge_fontsize} = $_[1];
          &set_gauge_window_fontsize;
          0
       }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
-   $table->add_at (1, $row++, new CFPlus::UI::Slider
+   $table->add_at (1, $row++, new DC::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 {
          $CFG->{gauge_size} = $_[1];
          $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
 our $AUDIO_HW_CHUNKSIZE;
 our $AUDIO_INFO;
 sub audio_tab_update {
-   my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;
+   my ($freq, $format, $chans) = DC::Mix_QuerySpec;
    $AUDIO_HW_CHUNKSIZE->set_options ([
       [0, "default", "Use System Default"],
       map {
          my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
    $AUDIO_INFO->set_text ($text);
 }
 sub audio_setup {
-   my $vbox = new CFPlus::UI::VBox;
+   my $vbox = new DC::UI::VBox;
-   $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
+   $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
    my $row = 0;
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
-   $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, new DC::UI::CheckBox
       state => $CFG->{audio_enable},
       tooltip => "<b>Master Audio Enable.</b> 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]; 1 }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
-   $table->add_at (1, $row, new CFPlus::UI::CheckBox
+   $table->add_at (1, $row, new DC::UI::CheckBox
       expand => 1, state => $CFG->{effects_enable},
       tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
       on_changed => sub {
          $CFG->{effects_enable} = $_[1];
          $CONN->update_fx_want if $CONN;
          1
       }
    );
-   $table->add_at (2, $row++, new CFPlus::UI::Slider
+   $table->add_at (2, $row++, new DC::UI::Slider
       expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
       tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
                  . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
       on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
-   $table->add_at (1, $row, new CFPlus::UI::CheckBox
+   $table->add_at (1, $row, new DC::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];
          $CONN->update_fx_want if $CONN;
          audio_music_push;
          1
       }
    );
-   $table->add_at (2, $row++, new CFPlus::UI::Slider
+   $table->add_at (2, $row++, new DC::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]; audio_music_update_volume; 0 }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
-   $table->add_at (1, $row++, new CFPlus::UI::Selector
+   $table->add_at (1, $row++, new DC::UI::Selector
       c_colspan => 2, expand => 1,
       value => $CFG->{audio_hw_frequency},
       options => [
          [    0, "default" , "Use System Default"],
          [11025, "11 kHz"  , "11kHz (low quality)"],
          audio_tab_update;
          1
       }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
-   $table->add_at (1, $row++, new CFPlus::UI::Selector
+   $table->add_at (1, $row++, new DC::UI::Selector
       c_colspan => 2, expand => 1,
       value => $CFG->{audio_hw_channels},
       options => [
          [0, "default"      , "Use System Default"],
          [1, "Mono"         , "Mono (single channel, low quality)"],
          audio_tab_update;
          1
       }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
-   $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
+   $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
       c_colspan => 2, expand => 1,
       value => $CFG->{audio_hw_chunksize},
       tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
                  . "is stuttering, increase this value. Values of 50-100ms are optimal.",
       on_changed => sub {
          1
       }
    );
    # should really be a slider
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
-   $table->add_at (1, $row++, new CFPlus::UI::ValSlider
+   $table->add_at (1, $row++, new DC::UI::ValSlider
       c_colspan => 2, expand => 1,
       tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
       range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
       template => ">= 99",
       on_changed => sub {
             if $value;
          1;
       }
    );
-   $table->add_at (1, $row++, new CFPlus::UI::Button
+   $table->add_at (1, $row++, new DC::UI::Button
-      c_colspan => 2, expand => 1, align => 0, text => "Apply",
+      c_colspan => 2, expand => 1, text => "Apply",
       tooltip => "Apply the audio settings",
       on_activate => sub {
          audio_shutdown ();
          audio_init ();
          0
       }
    );
-   $vbox->add (new CFPlus::UI::FancyFrame
+   $vbox->add (new DC::UI::FancyFrame
       expand => 1,
       label => "Audio Info",
-      child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
+      child => ($AUDIO_INFO = new DC::UI::Label ellipsise => 0),
    );
    audio_tab_update;
    $vbox
 }
 sub make_gauge_window {
    my $gh = int $HEIGHT * $CFG->{gauge_size};
-   my $win = new CFPlus::UI::Frame (
+   my $win = new DC::UI::Frame (
       force_x => 0,
       force_y => "max",
       force_w => $WIDTH,
       force_h => $gh,
    );
-   $win->add (my $hbox = new CFPlus::UI::HBox
+   $win->add (my $hbox = new DC::UI::HBox
       children => [
-         (new CFPlus::UI::HBox expand => 1),
+         (new DC::UI::HBox expand => 1),
-         (new CFPlus::UI::VBox children => [
+         (new DC::UI::VBox children => [
-            (new CFPlus::UI::Empty expand => 1),
+            (new DC::UI::Empty expand => 1),
-            (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
+            (new DC::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new DC::UI::Table)),
          ]),
-         (my $vbox = new CFPlus::UI::VBox),
+         (my $vbox = new DC::UI::VBox),
       ],
    );
-   $vbox->add (new CFPlus::UI::HBox
+   $vbox->add (new DC::UI::HBox
       expand => 1,
       children => [
-         (new CFPlus::UI::Empty expand => 1),
+         (new DC::UI::Empty expand => 1),
-         (my $hb = new CFPlus::UI::HBox),
+         (my $hb = new DC::UI::HBox),
       ],
    );
-   $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
+   $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
-   $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
+   $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
-   $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
+   $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
-   $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
+   $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
-   $vbox->add (my $exp    = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
+   $vbox->add (my $exp    = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
-   $vbox->add (my $prg    = new CFPlus::UI::ExperienceProgress);
+   $vbox->add (my $prg    = new DC::UI::ExperienceProgress);
-   $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
+   $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
-   $vbox->add (my $rng    = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
+   $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,
    $win
 }
 sub debug_setup {
-   my $table = new CFPlus::UI::Table;
+   my $table = new DC::UI::Table;
-   $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
+   $table->add_at (0, 0, new DC::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 (1, 0, new DC::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 (0, 1, new DC::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 (1, 1, new DC::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 (0, 2, new DC::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 (1, 2, new DC::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 (0, 3, new DC::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 (1, 3, new DC::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, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
-   $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
+   $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
-   $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
+   $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
-   $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
+   $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
-   $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
+   $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
-   $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
+   $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
-   $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
+   $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
-   $t->add_at (1,1, new CFPlus::UI::Label text => "e");
+   $t->add_at (1,1, new DC::UI::Label text => "e");
-   $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
+   $table->add_at (7, 6, my $c = new DC::UI::Canvas);
    $c->add_items ({
       type  => "line_loop",
       color => [0, 1, 0],
       width => 9,
    $table
 }
 sub stats_window {
-   my $r = new CFPlus::UI::ScrolledWindow (
+   my $r = new DC::UI::ScrolledWindow (
       expand => 1,
       scroll_y => 1
    );
-   $r->add (my $vb = new CFPlus::UI::VBox);
+   $r->add (my $vb = new DC::UI::VBox);
-   $vb->add (new CFPlus::UI::FancyFrame
+   $vb->add (new DC::UI::FancyFrame
       label => "Player",
-      child => (my $pi = new CFPlus::UI::VBox),
+      child => (my $pi = new DC::UI::VBox),
    );
-   $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
+   $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
       can_hover => 1, can_events => 1,
       tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
-   $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
+   $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
       can_hover => 1, can_events => 1,
       tooltip => "The map you are currently on (if supported by the server).");
-   $pi->add (my $hb0 = new CFPlus::UI::HBox);
+   $pi->add (my $hb0 = new DC::UI::HBox);
-   $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
+   $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
       can_hover => 1, can_events => 1,
       tooltip => "The weight of the player including all inventory items.");
-   $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
+   $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
       can_hover => 1, can_events => 1,
       tooltip => "The weight limit: you cannot carry more than this.");
-   $vb->add (new CFPlus::UI::FancyFrame
+   $vb->add (new DC::UI::FancyFrame
       label => "Primary/Secondary Statistics",
-      child => (my $hb = new CFPlus::UI::HBox expand => 1),
+      child => (my $hb = new DC::UI::HBox expand => 1),
    );
-   $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
+   $hb->add (my $tbl = new DC::UI::Table expand => 1);
    my $color2 = [1, 1, 0];
    for (
       [0, 0, st_str => "Str", 30],
       [2, 4, st_spd  => "Spd", 10.54],
       [2, 5, st_wspd => "WSp", 10.54],
    ) {
       my ($col, $row, $id, $label, $template) = @$_;
-      $tbl->add_at ($col    , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
+      $tbl->add_at ($col    , $row, $STATWIDS->{$id} = new DC::UI::Label
-         font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
+         font => $FONT_FIXED, can_hover => 1, can_events => 1,
-         align => +1, template => $template, tooltip => "#stat_$label");
+         align => 1, template => $template, tooltip => "#stat_$label");
-      $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
+      $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
-         font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
+         font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
-         align => -1, text => $label, tooltip => "#stat_$label");
+         align => 0, text => $label, tooltip => "#stat_$label");
    }
-   $vb->add (new CFPlus::UI::FancyFrame
+   $vb->add (new DC::UI::FancyFrame
       label => "Resistancies",
-      child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
+      child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
    );
    my $row = 0;
    my $col = 0;
    for (qw/slow holyw conf fire depl magic
            drain acid pois para deat phys
            blind fear tund elec cold ghit/)
    {
-      $tbl2->add_at ($col, $row,
+      $tbl2->add_at ($col + 2, $row,
          $STATWIDS->{"res_$_"} =
-            new CFPlus::UI::Label
+            new DC::UI::Label
                font       => $FONT_FIXED,
                template   => "-100%",
-               align      => +1,
+               align      => 1,
-               valign     => 0,
                can_events => 1,
                can_hover  => 1,
                tooltip    => $resist_names{$_}->[1],
       );
-      $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
+      $tbl2->add_at ($col + 1, $row, new DC::UI::Image
          font       => $FONT_FIXED,
          can_hover  => 1,
          can_events => 1,
          path       => "ui/resist/resist_$_.png",
          tooltip    => $resist_names{$_}->[1],
       );
-      $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
+      $tbl2->add_at ($col + 0, $row, new DC::UI::Label
          text       => $resist_names{$_}->[0],
          font       => $FONT_FIXED,
+         align      => 1,
          can_hover  => 1,
          can_events => 1,
          tooltip    => $resist_names{$_}->[1],
       );
       $row++;
       if ($row % 6 == 0) {
-         $col += 3;
+         $col += 4;
          $row = 0;
       }
    }
    #update_stats_window ({});
    $r
 }
 sub skill_window {
-   my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
+   my $sw = new DC::UI::ScrolledWindow (expand => 1);
-   $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1,  0, 0, 1, .1]);
+   $sw->add ($STATWIDS->{skill_tbl} = new DC::UI::Table expand => 1, col_expand => [0, 0, 1, .1,  0, 0, 1, .1]);
    $sw
 }
 sub formsep($) {
    return if $METASERVER_ATIME > time;
    $METASERVER_ATIME = time + 60;
    my $table = $METASERVER->{table};
    $table->clear;
-   $table->add_at (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 DC::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
    my $ok = 0;
-   CFPlus::background {
+   DC::background {
-      my $ua = CFPlus::lwp_useragent;
+      my $ua = DC::lwp_useragent;
-      CFPlus::background_msg CFPlus::decode_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
+      DC::background_msg DC::decode_json +(DC::lwp_check $ua->get ($META_SERVER))->decoded_content;
    } sub {
       my ($msg) = @_;
       if ($msg) {
          $table->clear;
             "The hostname of the server.",
             "The time this server has been running without being restarted.",
             "Short information about this server provided by its admins.",
          );
          my @col = qw(#Users Host Uptime Version Description);
-         $table->add_at ($_, 0, new CFPlus::UI::Label
+         $table->add_at ($_, 0, new DC::UI::Label
-            can_hover => 1, can_events => 1,
+            can_hover => 1, can_events => 1, fg => [1, 1, 0],
-            align => 0, fg => [1, 1, 0],
             text => $col[$_], tooltip => $tip[$_])
                for 0 .. $#col;
-         my @align = qw(1 0 1 1 -1);
+         my @align = qw(1 0.5 1 1 0);
          my $y = 0;
          for my $m (@{ $msg->{servers} }) {
             my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
                @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
             $m = [$users, $host, $uptime, $version, $desc];
             $y++;
-            $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
+            $table->add_at (scalar @$m, $y, new DC::UI::VBox children => [
-               (new CFPlus::UI::Button
+               (new DC::UI::Button
                   text        => "Use",
                   tooltip     => "Put this server into the <b>Host:Port</b> field",
                   on_activate => sub {
                      $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
                      $METASERVER->hide;
                      0
                   },
                ),
-               (new CFPlus::UI::Empty expand => 1),
+               (new DC::UI::Empty expand => 1),
             ]);
-            $table->add_at ($_, $y, new CFPlus::UI::Label
+            $table->add_at ($_, $y, new DC::UI::Label
                   max_w      => $::WIDTH * 0.4,
                   ellipsise  => 0,
                   align      => $align[$_],
                   text       => $m->[$_],
                   tooltip    => $tip[$_],
    };
 }
 sub metaserver_dialog {
-   my $vbox  = new CFPlus::UI::VBox;
+   my $vbox  = new DC::UI::VBox;
-   my $table = new CFPlus::UI::Table;
+   my $table = new DC::UI::Table;
-   $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
+   $vbox->add (new DC::UI::ScrolledWindow expand => 1, child => $table);
-   my $dialog = new CFPlus::UI::Toplevel
+   my $dialog = new DC::UI::Toplevel
       title   => "Server List",
       name    => 'metaserver_dialog',
       x       => 'center',
       y       => 'center',
       z       => 3,
    $dialog
 }
 sub login_setup {
-   my $vbox = new CFPlus::UI::VBox;
+   my $vbox = new DC::UI::VBox;
-   $vbox->add (new CFPlus::UI::FancyFrame
+   $vbox->add (new DC::UI::FancyFrame
       label => "Login Settings",
-      child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
+      child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
    );
-   $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
+   $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
-   $table->add_at (1, 4, new CFPlus::UI::Entry
+   $table->add_at (1, 4, new DC::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; 1 }
    );
-   $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
+   $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
-   $table->add_at (1, 5, new CFPlus::UI::Entry
+   $table->add_at (1, 5, new DC::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; 1 }
    );
-   $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
+   $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
       expand => 1,
-      align => 0,
       text => "Login / Register",
       tooltip => "This button will either login to the account configured above or register a new account.",
       on_activate => sub {
          $CONN ? stop_game
                : start_game;
          1
       },
    );
-   $vbox->add (new CFPlus::UI::FancyFrame
+   $vbox->add (new DC::UI::FancyFrame
       label => "Registering",
       min_h => 200,
-      child => (new CFPlus::UI::Label valign => -1, ellipsise => 0,
+      child => (new DC::UI::Label valign => 0, ellipsise => 0,
                     markup =>
                        "To register a new account, choose a username that hasn't been taken yet and "
                      . "try to log-in. Follow the instructions in the Log tab in the message window.",
                ),
    );
    $vbox
 }
 sub server_setup {
-   my $vbox = new CFPlus::UI::VBox;
+   my $vbox = new DC::UI::VBox;
-   $vbox->add (new CFPlus::UI::FancyFrame
+   $vbox->add (new DC::UI::FancyFrame
       label => "Connection Settings",
-      child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
+      child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
    );
    my $row = 0;
-   $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
+   $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
    {
-      $table->add_at (1, $row, my $vbox = new CFPlus::UI::VBox);
+      $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
       $vbox->add (
-         $HOST_ENTRY = new CFPlus::UI::Entry
+         $HOST_ENTRY = new DC::UI::Entry
             expand => 1,
             text => $CFG->{profile}{default}{host},
             tooltip => "The hostname or ip address of the Deliantra server to connect to",
             on_changed => sub {
                my ($self, $value) = @_;
                1
             }
       );
       if (0) { #d# disabled
-      $vbox->add (new CFPlus::UI::Button
+      $vbox->add (new DC::UI::Button
          expand  => 1,
          text    => "Server List",
          other   => $METASERVER,
          tooltip => "Show a list of available crossfire servers",
          on_activate => sub { $METASERVER->toggle_visibility; 0 },
          on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
       );
       }#d#
    }
-   $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
+   $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
-   $table->add_at (1, $row, new CFPlus::UI::Slider
+   $table->add_at (1, $row, new DC::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. "
                . "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; 1 },
    );
-   $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
+   $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
-   $table->add_at (1, $row, new CFPlus::UI::Entry
+   $table->add_at (1, $row, new DC::UI::Entry
       text => $CFG->{output_rate},
       tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
                . "when sending data. When 0 or unset, the server "
                . "default will be used, which is usually around 100kb/s. Most servers will "
                . "dynamically find an optimal rate, so adjust this only when necessary.",
       on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
    );
-   $vbox->add (new CFPlus::UI::FancyFrame
+   $vbox->add (new DC::UI::FancyFrame
       label => "Server Info",
-      child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
+      child => ($SERVER_INFO = new DC::UI::Label ellipsise => 0),
    );
    $vbox
 }
 sub client_setup {
-   my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
+   my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
    my $row = 0;
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
-   $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, new DC::UI::CheckBox
       state   => $CFG->{show_tips},
       tooltip => "Show the <b>Tip of the day</b> window at startup?",
       on_changed => sub {
          my ($self, $value) = @_;
          $CFG->{show_tips} = $value;
          0
       }
    );
-   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size");
-   $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
+   $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
       text    => $CFG->{logview_max_par},
       tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
                . "sends more messages than this number, older messages get removed to save memory and "
                . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
       on_changed => sub {
    $table
 }
 sub autopickup_setup {
-   my $r = new CFPlus::UI::ScrolledWindow (
+   my $r = new DC::UI::ScrolledWindow (
       expand   => 1,
       scroll_y => 1
    );
-   $r->add (my $table = new CFPlus::UI::Table
+   $r->add (my $table = new DC::UI::Table
       row_expand => [0],
       col_expand => [0, 1, 0, 1],
    );
    for (
          ],
          ["Weight/Value ratio", 2, 17]
        )
    {
       my ($title, $x, $y, @bits) = @$_;
-      $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
+      $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
       for (@bits) {
          ++$y;
          my $mask = $_->[1];
-         $table->add_at ($x  , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
+         $table->add_at ($x  , $y, new DC::UI::Label text => $_->[0], align => 1, expand => 1);
-         $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
+         $table->add_at ($x+1, $y, my $checkbox = new DC::UI::CheckBox
             state => $::CFG->{pickup} & $mask,
             on_changed => sub {
                my ($box, $value) = @_;
                if ($value) {
          ${$_->[2]} = $checkbox if $_->[2];
       }
    }
-   $table->add_at (2, 18, new CFPlus::UI::ValSlider
+   $table->add_at (2, 18, new DC::UI::ValSlider
       range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
       template => ">= 99",
       to_value => sub { ">= " . 5 * $_[0] },
       on_changed => sub {
          my ($slider, $value) = @_;
          $::CFG->{pickup} |= int $value
             if $value;
          1;
       });
-   $table->add_at (3, 18, new CFPlus::UI::Button
+   $table->add_at (3, 18, new DC::UI::Button
       text => "set",
       on_activate => sub {
          $::CONN->send_command ("pickup $::CFG->{pickup}")
             if defined $::CONN;
          0
                    or $a->{type} <=> $b->{type}
              } @_ },
 );
 sub inventory_widget {
-   my $hb = new CFPlus::UI::HBox homogeneous => 1;
+   my $hb = new DC::UI::HBox homogeneous => 1;
-   $hb->add (my $vb1 = new CFPlus::UI::VBox);
+   $hb->add (my $vb1 = new DC::UI::VBox);
-   $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
+   $vb1->add (new DC::UI::Label text => "Player");
-   $vb1->add (my $hb1 = new CFPlus::UI::HBox);
+   $vb1->add (my $hb1 = new DC::UI::HBox);
    use sort 'stable';
-   $hb1->add (new CFPlus::UI::Selector
+   $hb1->add (new DC::UI::Selector
       value   => $::CFG->{inv_sort},
       options => [
          [type   => "Type/Name"],
          [mtime  => "Recent/Normal/Locked"],
          [weight => "Weight/Type"],
       on_changed => sub {
          $::CFG->{inv_sort} = $_[1];
          $INV->set_sort_order ($SORT_ORDER{$_[1]});
       },
    );
-   $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
+   $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
    #TODO# update to weigh/maxweight
-   $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
+   $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
-   $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
+   $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
-   $sw1->add ($INV = new CFPlus::UI::Inventory);
+   $sw1->add ($INV = new DC::UI::Inventory);
    $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
-   $hb->add (my $vb2 = new CFPlus::UI::VBox);
+   $hb->add (my $vb2 = new DC::UI::VBox);
-   $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
+   $vb2->add ($INVR_HB = new DC::UI::HBox);
-   $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
+   $vb2->add (my $sw2 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
-   $sw2->add ($INVR = new CFPlus::UI::Inventory);
+   $sw2->add ($INVR = new DC::UI::Inventory);
    # XXX: Call after $INVR = ... because set_opencont sets the items
-   CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
+   DC::Protocol::set_opencont ($::CONN, 0, "Floor");
    $hb
 }
 sub media_window {
-   my $vb = new CFPlus::UI::VBox;
+   my $vb = new DC::UI::VBox;
-   $vb->add (new CFPlus::UI::FancyFrame
+   $vb->add (new DC::UI::FancyFrame
       label => "Currently playing music",
-      child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
+      child => new DC::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
-                  child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
+                  child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
    );
-   $vb->add (new CFPlus::UI::FancyFrame
+   $vb->add (new DC::UI::FancyFrame
       label  => "Other media used in this session",
       expand => 1,
-      child  => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
+      child  => ($LICENSE_WIDGET = new DC::UI::TextScroller
                 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
    );
    $vb
 }
       or return;
    $LICENSE_WIDGET->add_paragraph ({
       fg     => [1, 1, 1, 1],
       markup => "<small>"
-              . "<b>Name:</b>	" . (CFPlus::asxml $meta->{name}) . "\n"
+              . "<b>Name:</b>	" . (DC::asxml $meta->{name}) . "\n"
-              . "<b>Author:</b>	" . (CFPlus::asxml $meta->{author}) . "\n"
+              . "<b>Author:</b>	" . (DC::asxml $meta->{author}) . "\n"
-              . "<b>Source:</b>	" . (CFPlus::asxml $meta->{source}) . "\n"
+              . "<b>Source:</b>	" . (DC::asxml $meta->{source}) . "\n"
-              . "<b>License:</b>	" . (CFPlus::asxml $meta->{license}) . "\n"
+              . "<b>License:</b>	" . (DC::asxml $meta->{license}) . "\n"
               . "</small>",
    });
    $LICENSE_WIDGET->scroll_to_bottom;
 }
       $PL_WINDOW->show;
    }
 }
 sub player_window {
-   my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
+   my $plwin = $PL_WINDOW = new DC::UI::Toplevel
       x       => "center",
       y       => "center",
       force_w => $WIDTH  * 9/10,
       force_h => $HEIGHT * 9/10,
       title   => "Player",
       has_close_button => 1
    ;
    my $ntb =
       $PL_NOTEBOOK =
-         new CFPlus::UI::Notebook expand => 1;
+         new DC::UI::Notebook expand => 1;
    $ntb->add_tab (
       "Statistics (F2)" => $STATS_PAGE = stats_window,
       "Shows statistics, where all your Stats and Resistances are shown."
    );
    $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);
+   my $spellsw = $SPELL_PAGE = new DC::UI::ScrolledWindow (expand => 1, scroll_y => 1);
-   $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
+   $spellsw->add ($SPELL_LIST = new DC::UI::SpellList);
    $ntb->add_tab (
       "Spellbook (F4)" => $spellsw,
       "Displays all spells you have and lets you edit keyboard shortcuts for them."
    );
    $ntb->add_tab (
    $plwin->add ($ntb);
    $plwin
 }
 sub keyboard_setup {
-   CFPlus::Macro::keyboard_setup
+   DC::Macro::keyboard_setup
 }
 sub help_window {
-   my $win = new CFPlus::UI::Toplevel
+   my $win = new DC::UI::Toplevel
       x       => 'center',
       y       => 'center',
       z       => 4,
       name    => 'doc_browser',
       force_w => int $WIDTH  * 7/8,
       force_h => int $HEIGHT * 7/8,
       title   => "Help Browser",
       has_close_button => 1;
-   $win->add (my $vbox = new CFPlus::UI::VBox);
+   $win->add (my $vbox = new DC::UI::VBox);
-   $vbox->add (new CFPlus::UI::FancyFrame
+   $vbox->add (new DC::UI::FancyFrame
       label => "Navigation",
-      child => (my $buttons = new CFPlus::UI::HBox),
+      child => (my $buttons = new DC::UI::HBox),
    );
-   $vbox->add (my $viewer  = new CFPlus::UI::TextScroller
+   $vbox->add (my $viewer  = new DC::UI::TextScroller
                    expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
    my @history;
    my @future;
    my $curnode;
    my $load_node; $load_node = sub {
       my ($node, $para) = @_;
       $buttons->clear;
-      $buttons->add (new CFPlus::UI::Button
+      $buttons->add (new DC::UI::Button
          text        => "⇤",
          tooltip     => "back to the starting page",
          on_activate => sub {
             unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
             unshift @future, @history;
             $load_node->(@{shift @future});
          },
       );
       if (@history) {
-         $buttons->add (new CFPlus::UI::Button
+         $buttons->add (new DC::UI::Button
             text        => "⋘",
-            tooltip     => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
+            tooltip     => "back to <i>" . (DC::asxml DC::Pod::full_path $history[-1][0]) . "</i>",
             on_activate => sub {
                unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
                $load_node->(@{pop @history});
             },
          );
       }
       if (@future) {
-         $buttons->add (new CFPlus::UI::Button
+         $buttons->add (new DC::UI::Button
             text        => "⋙",
-            tooltip     => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
+            tooltip     => "forward to <i>" . (DC::asxml DC::Pod::full_path $future[0][0]) . "</i>",
             on_activate => sub {
                push @history, [$curnode, $viewer->current_paragraph];
                $load_node->(@{shift @future});
             },
          );
       }
-      $buttons->add (new CFPlus::UI::Label text => " ");
+      $buttons->add (new DC::UI::Label text => " ");
-      my @path = CFPlus::Pod::full_path_of $node;
+      my @path = DC::Pod::full_path_of $node;
       pop @path; # drop current node
       for my $node (@path) {
-         $buttons->add (new CFPlus::UI::Button
+         $buttons->add (new DC::UI::Button
             text        => $node->{kw}[0],
-            tooltip     => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
+            tooltip     => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
             on_activate => sub {
                push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
                $load_node->($node);
             },
          );
-         $buttons->add (new CFPlus::UI::Label text => "/");
+         $buttons->add (new DC::UI::Label text => "/");
       }
-      $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
+      $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
       $curnode = $node;
       $viewer->clear;
-      $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
+      $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
       $viewer->scroll_to ($para);
    };
-   $load_node->(CFPlus::Pod::find pod => "mainpage");
+   $load_node->(DC::Pod::find pod => "mainpage");
-   $CFPlus::Pod::goto_document = sub {
+   $DC::Pod::goto_document = sub {
       my (@path) = @_;
       push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
-      $load_node->((CFPlus::Pod::find @path)[0]);
+      $load_node->((DC::Pod::find @path)[0]);
       $win->show;
    };
    $win
 }
 sub open_string_query {
    my ($title, $cb, $txt, $tooltip) = @_;
-   my $dialog = new CFPlus::UI::Toplevel
+   my $dialog = new DC::UI::Toplevel
       x => "center",
       y => "center",
       z => 50,
       force_w => $WIDTH * 4/5,
       title => $title;
    $dialog->add (
-      my $e = new CFPlus::UI::Entry
+      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
    );
    $dialog->show;
 }
 sub open_quit_dialog {
    unless ($QUIT_DIALOG) {
-      $QUIT_DIALOG = new CFPlus::UI::Toplevel
+      $QUIT_DIALOG = new DC::UI::Toplevel
          x     => "center",
          y     => "center",
          z     => 50,
          title => "Really Quit?",
          on_key_down => sub {
             my ($dialog, $ev) = @_;
             $ev->{sym} == 27 and $dialog->hide;
          }
       ;
-      $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
+      $QUIT_DIALOG->add (my $vb = new DC::UI::VBox expand => 1);
-      $vb->add (new CFPlus::UI::Label
+      $vb->add (new DC::UI::Label
          text      => "You should find a savebed and apply it first!",
          max_w     => $WIDTH * 0.25,
          ellipsize => 0,
       );
-      $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
+      $vb->add (my $hb = new DC::UI::HBox expand => 1);
-      $hb->add (new CFPlus::UI::Button
+      $hb->add (new DC::UI::Button
          text => "Ok",
          expand => 1,
          on_activate => sub { $QUIT_DIALOG->hide; 0 },
       );
-      $hb->add (new CFPlus::UI::Button
+      $hb->add (new DC::UI::Button
          text => "Quit anyway",
          expand => 1,
          on_activate => sub { EV::unloop EV::UNLOOP_ALL },
       );
    }
    $QUIT_DIALOG->grab_focus;
 }
 sub show_tip_of_the_day {
    # find all tips
-   my @tod = CFPlus::Pod::find tip_of_the_day => "*";
+   my @tod = DC::Pod::find tip_of_the_day => "*";
-   CFPlus::DB::get state => "tip_of_the_day", sub {
+   DC::DB::get state => "tip_of_the_day", sub {
       my ($todindex) = @_;
       $todindex = 0 if $todindex >= @tod;
-      CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
+      DC::DB::put state => tip_of_the_day => $todindex + 1, sub { };
       # create dialog
       my $dialog;
       my $close = sub {
          $dialog->destroy;
       };
-      $dialog = new CFPlus::UI::Toplevel
+      $dialog = new DC::UI::Toplevel
          x => "center",
          y => "center",
          z => 3,
          name    => 'tip_of_the_day',
          force_w => int $WIDTH  * 4/9,
          force_h => int $WIDTH  * 2/9,
          title   => "Tip of the day #" . (1 + $todindex),
-         child   => my $vbox = new CFPlus::UI::VBox,
+         child   => my $vbox = new DC::UI::VBox,
          has_close_button => 1,
          on_delete => $close,
       ;
-      $vbox->add (my $viewer  = new CFPlus::UI::TextScroller
+      $vbox->add (my $viewer  = new DC::UI::TextScroller
                       expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
-      $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
+      $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $tod[$todindex]);
-      $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
+      $vbox->add (my $table = new DC::UI::Table col_expand => [0, 1]);
-      $table->add_at (0, 0, new CFPlus::UI::Button
+      $table->add_at (0, 0, new DC::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 <b>Server Setup</b>.",
          on_activate => $close,
       );
-      $table->add_at (2, 0, new CFPlus::UI::Button
+      $table->add_at (2, 0, new DC::UI::Button
          text    => "Next",
          tooltip => "Show the next <b>Tip of the day</b>.",
          on_activate => sub {
             $close->();
             &show_tip_of_the_day;
       $dialog->show;
    };
 }
 sub sdl_init {
-   CFPlus::SDL_Init
+   DC::SDL_Init
       and die "SDL::Init failed!\n";
 }
 sub video_init {
    $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
    ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
    $FULLSCREEN = $CFG->{fullscreen};
    $FAST       = $CFG->{fast};
-   CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
+   DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
-      or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
+      or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
    $SDL_ACTIVE = 1;
    $LAST_REFRESH = time - 0.01;
-   CFPlus::OpenGL::init;
+   DC::OpenGL::init;
-   CFPlus::Macro::init;
+   DC::Macro::init;
    $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
-   $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
+   $DC::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
    #############################################################################
    if ($DEBUG_STATUS) {
-      CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
+      DC::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
    } else {
       # create/configure the widgets
-      $CFPlus::UI::ROOT->connect (key_down => sub {
+      $DC::UI::ROOT->connect (key_down => sub {
          my (undef, $ev) = @_;
-         if (my @macros = CFPlus::Macro::find $ev) {
+         if (my @macros = DC::Macro::find $ev) {
-            CFPlus::Macro::execute $_ for @macros;
+            DC::Macro::execute $_ for @macros;
             return 1;
          }
          0
       });
-      $DEBUG_STATUS = new CFPlus::UI::Label
+      $DEBUG_STATUS = new DC::UI::Label
          padding => 0,
          z       => 100,
          force_x => "max",
          force_y => 0;
       $DEBUG_STATUS->show;
-      $STATUSBOX = new CFPlus::UI::Statusbox;
+      $STATUSBOX = new DC::UI::Statusbox;
       $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
-      (new CFPlus::UI::Frame
+      (new DC::UI::Frame
          bg      => [0, 0, 0, 0.4],
          force_x => 0,
          force_y => "max",
          child   => $STATUSBOX,
       )->show;
-      CFPlus::UI::Toplevel->new (
+      DC::UI::Toplevel->new (
          title     => "Minimap",
          name      => "mapmap",
          x         => 0,
          y         => $FONTSIZE + 8,
          border_bg => [1, 1, 1, 192/255],
          bg        => [1, 1, 1, 0],
-         child     => ($MAPMAP = new CFPlus::MapWidget::MapMap
+         child     => ($MAPMAP = new DC::MapWidget::MapMap
             tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
          ),
       )->show;
-      $MAPWIDGET = new CFPlus::MapWidget;
+      $MAPWIDGET = new DC::MapWidget;
       $MAPWIDGET->connect (activate_console => sub {
          my ($mapwidget, $preset) = @_;
          $MESSAGE_WINDOW->activate_console ($preset)
             if $MESSAGE_WINDOW;
       });
       $MAPWIDGET->show;
       $MAPWIDGET->grab_focus;
-      $COMPLETER = new CFPlus::MapWidget::Command::
+      $COMPLETER = new DC::MapWidget::Command::
          command   => { },
          tooltip   => "#completer_help",
       ;
-      $SETUP_DIALOG = new CFPlus::UI::Toplevel
+      $SETUP_DIALOG = new DC::UI::Toplevel
          title   => "Setup",
          name    => "setup_dialog",
          x       => 'center',
          y       => 'center',
          z       => 2,
          force_h => $::HEIGHT * 0.6,
          has_close_button => 1,
       ;
       $METASERVER = metaserver_dialog;
-      $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
+      $MESSAGE_WINDOW = new DC::UI::MessageWindow;
-      $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
+      $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1,
-         filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
+         filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
       $SETUP_NOTEBOOK->add_tab (Login    => $SETUP_LOGIN = login_setup,
          "Configure the server to play on, your username and password.");
       $SETUP_NOTEBOOK->add_tab (Server   => $SETUP_SERVER = server_setup,
          "Configure other server related options.");
        . "After pressing the combo the binding will be saved automatically and the "
        . "binding editor closes");
       $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
+      $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
-      $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
+      $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 CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
+      $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
          tooltip => "Toggles the server message log, where the client collects <i>all</i> 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 CFPlus::UI::Flopper text => "Playerbook", other => player_window,
+      $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 CFPlus::UI::Button
+      $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} = CFPlus::UI::get_layout;
+            $::CFG->{layout} = DC::UI::get_layout;
-            CFPlus::write_cfg "$Deliantra::VARDIR/cfplusrc";
+            DC::write_cfg "$Deliantra::VARDIR/client.cf";
             status "Configuration Saved";
             0
          },
       );
-      $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
+      $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
          tooltip => "View Documentation");
-      $BUTTONBAR->add (new CFPlus::UI::Button
+      $BUTTONBAR->add (new DC::UI::Button
          text        => "Quit",
          tooltip     => "Terminates the program",
          on_activate => sub {
             if ($CONN) {
                open_quit_dialog;
    $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
 }
 sub video_shutdown {
-   CFPlus::OpenGL::shutdown;
+   DC::OpenGL::shutdown;
    undef $SDL_ACTIVE;
 }
 my %animate_object;
    if ($ENV{CFPLUS_DEBUG} & 4) {
       $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
       debug sprintf "%3.2f", $fps;
    }
-   $WANT_REFRESH->stop;
+   undef $WANT_REFRESH;
+   $_[0]->stop;
-   $CFPlus::UI::ROOT->draw;
+   $DC::UI::ROOT->draw;
-   CFPlus::SDL_GL_SwapBuffers;
+   DC::SDL_GL_SwapBuffers;
    $LAST_REFRESH = $NOW;
 }
-$WANT_REFRESH = EV::idle_ns \&force_refresh;
+my $want_refresh = EV::prepare_ns \&force_refresh;
-# 0.015 is server tick time / 8 ~~ 66.6...hz
-my $input = EV::periodic 0, 0.015, undef, sub {
+my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
-   $NOW = time;
+   $NOW = EV::now;
    ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
-      for CFPlus::poll_events;
+      for DC::poll_events;
    if (%animate_object) {
       $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
-      $WANT_REFRESH->start;
+      $WANT_REFRESH = 1;
    }
+   $want_refresh->start
+      if $WANT_REFRESH;
 };
 sub animation_start {
    my ($widget) = @_;
    $animate_object{$widget} = $widget;
    my ($widget) = @_;
    delete $animate_object{$widget};
 }
 %SDL_CB = (
-   CFPlus::SDL_QUIT => sub {
+   DC::SDL_QUIT => sub {
       EV::unloop EV::UNLOOP_ALL;
    },
-   CFPlus::SDL_VIDEORESIZE => sub {
+   DC::SDL_VIDEORESIZE => sub {
    },
-   CFPlus::SDL_VIDEOEXPOSE => sub {
+   DC::SDL_VIDEOEXPOSE => sub {
-      CFPlus::UI::full_refresh;
+      DC::UI::full_refresh;
    },
-   CFPlus::SDL_ACTIVEEVENT => sub {
+   DC::SDL_ACTIVEEVENT => sub {
 #      not useful, as APPACTIVE includes only iconified state, not unmapped
-#      printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
+#      printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
-#      printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
+#      printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
-#      printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
+#      printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
-#      printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
+#      printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
-#      printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
+#      printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
    },
-   CFPlus::SDL_KEYDOWN => sub {
+   DC::SDL_KEYDOWN => sub {
-      if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
+      if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
          # alt-enter
          $FULLSCREEN_ENABLE->toggle;
          video_shutdown;
          video_init;
       } else {
-         CFPlus::UI::feed_sdl_key_down_event ($_[0]);
+         DC::UI::feed_sdl_key_down_event ($_[0]);
       }
    },
-   CFPlus::SDL_KEYUP           => \&CFPlus::UI::feed_sdl_key_up_event,
+   DC::SDL_KEYUP           => \&DC::UI::feed_sdl_key_up_event,
-   CFPlus::SDL_MOUSEMOTION     => \&CFPlus::UI::feed_sdl_motion_event,
+   DC::SDL_MOUSEMOTION     => \&DC::UI::feed_sdl_motion_event,
-   CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
+   DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
-   CFPlus::SDL_MOUSEBUTTONUP   => \&CFPlus::UI::feed_sdl_button_up_event,
+   DC::SDL_MOUSEBUTTONUP   => \&DC::UI::feed_sdl_button_up_event,
-   CFPlus::SDL_USEREVENT       => sub {
+   DC::SDL_USEREVENT       => sub {
       if ($_[0]{code} == 1) {
          audio_channel_finished $_[0]{data1};
       } elsif ($_[0]{code} == 0) {
          audio_music_finished;
       }
    EV::unloop;
    #d# TODO calling exit here hangs the process in some futex
 };
 {
+   if (-e "$Deliantra::VARDIR/client.cf") {
+      DC::read_cfg "$Deliantra::VARDIR/client.cf";
+   } else {
+      #TODO: compatibility cruft
-   CFPlus::read_cfg "$Deliantra::VARDIR/cfplusrc";
+      DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
+      print STDERR "INFO: used old configuratrion file\n";
+   }
-   CFPlus::DB::Server::run;
+   DC::DB::Server::run;
-   CFPlus::UI::set_layout ($::CFG->{layout});
+   DC::UI::set_layout ($::CFG->{layout});
    my %DEF_CFG = (
       sdl_mode            => 0,
       fullscreen          => 1,
       fast                => 0,
       }
    }
    sdl_init;
-   @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
+   @SDL_MODES = DC::SDL_ListModes 8, 8;
-   @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
+   @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
-   @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
+   @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
    @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
    $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
    {
-      my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
+      my @fonts = map DC::find_rcfile "fonts/$_", qw(
          DejaVuSans.ttf
          DejaVuSansMono.ttf
          DejaVuSans-Bold.ttf
          DejaVuSansMono-Bold.ttf
          DejaVuSans-Oblique.ttf
          DejaVuSansMono-Oblique.ttf
          DejaVuSans-BoldOblique.ttf
          DejaVuSansMono-BoldOblique.ttf
       );
-      CFPlus::add_font $_ for @fonts;
+      DC::add_font $_ for @fonts;
-      CFPlus::pango_init;
+      DC::pango_init;
-      $FONT_PROP  = new_from_file CFPlus::Font $fonts[0];
+      $FONT_PROP  = new_from_file DC::Font $fonts[0];
-      $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
+      $FONT_FIXED = new_from_file DC::Font $fonts[1];
       $FONT_PROP->make_default;
    }
 #   compare mono (ft) vs. rgba (cairo)
 #   ft - 1.8s, cairo 3s, even in alpha-only mode
 #   for my $rgba (0..1) {
 #      my $t1 = Time::HiRes::time;
 #      for (1..1000) {
-#         my $layout = CFPlus::Layout->new ($rgba);
+#         my $layout = DC::Layout->new ($rgba);
 #         $layout->set_text ("hallo" x 100);
 #         $layout->render;
 #      }
 #      my $t2 = Time::HiRes::time;
 #      warn $t2-$t1;
 EV::loop;
 #video_shutdown;
 #audio_shutdown;
+DC::OpenGL::quit;
-CFPlus::SDL_Quit;
+DC::SDL_Quit;
-CFPlus::DB::Server::stop;
+DC::DB::Server::stop;
 =head1 NAME
 deliantra - A Deliantra MORPG game client

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.14 by root, Wed Dec 26 18:09:30 2007 UTC vs. Revision 1.22 by root, Sat Dec 29 13:44:31 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.14 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.22 by root, Sat Dec 29 13:44:31 2007 UTC