… | |
… | |
78 | } |
78 | } |
79 | |
79 | |
80 | # prepend private library directory |
80 | # prepend private library directory |
81 | BEGIN { |
81 | BEGIN { |
82 | for (grep !ref, @INC) { |
82 | for (grep !ref, @INC) { |
83 | my $path = "$_/Deliantra/Client/private/dc"; |
83 | my $path = "$_/Deliantra/Client/private"; |
84 | if (-d $path) { |
84 | if (-d $path) { |
85 | unshift @INC, $path; |
85 | unshift @INC, $path; |
86 | last; |
86 | last; |
87 | } |
87 | } |
88 | } |
88 | } |
… | |
… | |
97 | use List::Util qw(max min); |
97 | use List::Util qw(max min); |
98 | |
98 | |
99 | use Deliantra; |
99 | use Deliantra; |
100 | use Deliantra::Protocol::Constants; |
100 | use Deliantra::Protocol::Constants; |
101 | |
101 | |
|
|
102 | use AnyEvent::DNS; |
|
|
103 | |
102 | use Compress::LZF; |
104 | use Compress::LZF; |
103 | |
105 | |
104 | use DC; |
106 | use DC; |
|
|
107 | BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } |
105 | use DC::OpenGL (); |
108 | use DC::OpenGL (); |
106 | use DC::Protocol; |
109 | use DC::Protocol; |
107 | use DC::DB; |
110 | use DC::DB; |
108 | use DC::UI; |
111 | use DC::UI; |
109 | use DC::UI::Canvas; |
112 | use DC::UI::Canvas; |
110 | use DC::UI::Inventory; |
113 | use DC::UI::Inventory; |
111 | use DC::UI::SpellList; |
114 | use DC::UI::SpellList; |
112 | use DC::UI::Dockable; |
115 | use DC::UI::Dockable; |
|
|
116 | use DC::UI::Dockbar; |
113 | use DC::UI::MessageWindow; |
117 | use DC::UI::MessageWindow; |
114 | use DC::UI::ChatView; |
118 | use DC::UI::ChatView; |
|
|
119 | use DC::MessageDistributor; |
115 | use DC::Pod; |
120 | use DC::Pod; |
116 | use DC::MapWidget; |
121 | use DC::MapWidget; |
117 | use DC::Macro; |
122 | use DC::Macro; |
118 | |
123 | |
119 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
124 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
… | |
… | |
178 | our $SPELL_PAGE; |
183 | our $SPELL_PAGE; |
179 | our $SPELL_LIST; |
184 | our $SPELL_LIST; |
180 | |
185 | |
181 | our $HELP_WINDOW; |
186 | our $HELP_WINDOW; |
182 | our $MESSAGE_WINDOW; |
187 | our $MESSAGE_WINDOW; |
|
|
188 | our $MESSAGE_DIST; |
183 | our $FLOORBOX; |
189 | our $FLOORBOX; |
184 | our $GAUGES; |
190 | our $GAUGES; |
185 | our $STATWIDS; |
191 | our $STATWIDS; |
186 | |
192 | |
187 | our $SDL_ACTIVE; |
193 | our $SDL_ACTIVE; |
188 | our %SDL_CB; |
194 | our %SDL_CB; |
189 | |
195 | |
190 | our $ALT_ENTER_MESSAGE; |
196 | our $ALT_ENTER_MESSAGE; |
191 | our $STATUSBOX; |
197 | our $STATUSBOX; |
|
|
198 | our $MODBOX; |
192 | our $DEBUG_STATUS; |
199 | our $DEBUG_STATUS; |
193 | |
200 | |
194 | our $INV; |
201 | our $INV; |
195 | our $INVR; |
202 | our $INVR; |
196 | our $INVR_HB; |
203 | our $INVR_HB; |
… | |
… | |
204 | sub debug { |
211 | sub debug { |
205 | $DEBUG_STATUS->set_text ($_[0]); |
212 | $DEBUG_STATUS->set_text ($_[0]); |
206 | } |
213 | } |
207 | |
214 | |
208 | sub message { |
215 | sub message { |
209 | $MESSAGE_WINDOW->message (@_); |
216 | $MESSAGE_DIST->message (@_); |
|
|
217 | } |
|
|
218 | |
|
|
219 | sub update_modbox { |
|
|
220 | my $mod = DC::SDL_GetModState; |
|
|
221 | |
|
|
222 | my $markup; |
|
|
223 | |
|
|
224 | $markup .= $mod & DC::KMOD_CTRL |
|
|
225 | ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]") |
|
|
226 | : "[<span foreground='#888'> once </span>]"; |
|
|
227 | |
|
|
228 | $markup .= $mod & DC::KMOD_SHIFT |
|
|
229 | ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]") |
|
|
230 | : "[<span foreground='#888'>move</span>]"; |
|
|
231 | |
|
|
232 | $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META) |
|
|
233 | ? "[ALT]" |
|
|
234 | : "[<span foreground='#888'>alt</span>]"; |
|
|
235 | |
|
|
236 | $markup .= $mod & DC::KMOD_NUM |
|
|
237 | ? "[NUM]" |
|
|
238 | : "[<span foreground='#888'>num</span>]"; |
|
|
239 | |
|
|
240 | # <tt> around next statement works around some bug that keeps the |
|
|
241 | # "font =>" from being used on windows |
|
|
242 | $MODBOX->set_markup ("<tt>$markup</tt>"); |
210 | } |
243 | } |
211 | |
244 | |
212 | ############################################################################# |
245 | ############################################################################# |
213 | #TODO: maybe move into own audio module... |
246 | #TODO: maybe move into own audio module... |
214 | |
247 | |
… | |
… | |
634 | # right: accept |
667 | # right: accept |
635 | $table->add_at (4, 0, new DC::UI::Button |
668 | $table->add_at (4, 0, new DC::UI::Button |
636 | text => "Accept", |
669 | text => "Accept", |
637 | on_activate => sub { |
670 | on_activate => sub { |
638 | $conn->send ("reply n"); |
671 | $conn->send ("reply n"); |
639 | $STATS_PAGE->hide; |
|
|
640 | destroy_query_dialog $conn; |
672 | destroy_query_dialog $conn; |
641 | 0 |
673 | 0 |
642 | }, |
674 | }, |
643 | ); |
675 | ); |
644 | |
676 | |
… | |
… | |
696 | |
728 | |
697 | $vbox->add (@dialog); |
729 | $vbox->add (@dialog); |
698 | $dialog->show; |
730 | $dialog->show; |
699 | } |
731 | } |
700 | |
732 | |
701 | sub start_game { |
733 | sub dc_connect { |
702 | status "logging in..."; |
734 | my ($host, $port) = @_; |
703 | |
|
|
704 | $LOGIN_BUTTON->set_text ("Logout"); |
|
|
705 | $SETUP_DIALOG->hide; |
|
|
706 | |
735 | |
707 | my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
736 | my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
708 | |
737 | |
709 | my ($host, $port) = split /:/, $PROFILE->{host}; |
|
|
710 | |
|
|
711 | $MAP = new DC::Map; |
|
|
712 | |
|
|
713 | $CONN = eval { |
738 | $CONN = |
714 | new DC::Protocol |
739 | new DC::Protocol |
715 | host => $host, |
740 | host => $host, |
716 | port => $port || 13327, |
741 | port => $port || 13327, |
717 | user => $PROFILE->{user}, |
742 | user => $PROFILE->{user}, |
718 | pass => $PROFILE->{password}, |
743 | pass => $PROFILE->{password}, |
719 | mapw => $mapsize, |
744 | mapw => $mapsize, |
720 | maph => $mapsize, |
745 | maph => $mapsize, |
721 | |
746 | |
722 | client => "cfplus $DC::VERSION $] $^O", |
747 | client => "$DC::VERSION $] $^O", |
723 | |
748 | |
724 | map_widget => $MAPWIDGET, |
749 | map_widget => $MAPWIDGET, |
725 | statusbox => $STATUSBOX, |
750 | statusbox => $STATUSBOX, |
726 | map => $MAP, |
751 | map => $MAP, |
727 | mapmap => $MAPMAP, |
752 | mapmap => $MAPMAP, |
728 | query => \&server_query, |
753 | query => \&server_query, |
729 | |
754 | |
730 | setup_req => { |
755 | setup_req => { |
731 | smoothing => $CFG->{map_smoothing}*1, |
756 | smoothing => $CFG->{map_smoothing}*1, |
732 | }, |
757 | }, |
733 | }; |
|
|
734 | |
758 | |
735 | if ($CONN) { |
759 | on_connect => sub { |
|
|
760 | if ($_[0]) { |
736 | DC::lowdelay fileno $CONN->{fh}; |
761 | DC::lowdelay fileno $CONN->{fh}; |
737 | |
762 | |
738 | status "login successful"; |
763 | status "login successful"; |
|
|
764 | } else { |
|
|
765 | undef $CONN; |
|
|
766 | status "unable to connect: $!"; |
|
|
767 | stop_game(); |
|
|
768 | } |
|
|
769 | }, |
|
|
770 | ; |
|
|
771 | } |
|
|
772 | |
|
|
773 | sub start_game { |
|
|
774 | status "logging in..."; |
|
|
775 | |
|
|
776 | $LOGIN_BUTTON->set_text ("Logout"); |
|
|
777 | $SETUP_DIALOG->hide; |
|
|
778 | |
|
|
779 | my ($host, $port) = split /:/, $PROFILE->{host}; |
|
|
780 | |
|
|
781 | $MAP = new DC::Map; |
|
|
782 | |
|
|
783 | # hack to make SURE we find the IP address all right |
|
|
784 | # can be removed once AnyEvent::DNS is proven stable. |
|
|
785 | if ($host eq "gameserver.deliantra.net") { |
|
|
786 | AnyEvent::DNS::a "dnstest.deliantra.net", sub { |
|
|
787 | if ($_[0] ne "80.101.114.108") { # Perl |
|
|
788 | status "dns failure, using hardcoded address"; |
|
|
789 | $host = "129.13.162.95"; |
|
|
790 | } |
|
|
791 | |
|
|
792 | dc_connect $host, $port; |
|
|
793 | }; |
739 | } else { |
794 | } else { |
740 | status "unable to connect"; |
795 | dc_connect $host, $port; |
741 | stop_game(); |
|
|
742 | } |
796 | } |
743 | } |
797 | } |
744 | |
798 | |
745 | sub stop_game { |
799 | sub stop_game { |
746 | $LOGIN_BUTTON->set_text ("Login / Register"); |
800 | $LOGIN_BUTTON->set_text ("Login / Register"); |
… | |
… | |
805 | ); |
859 | ); |
806 | |
860 | |
807 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); |
861 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); |
808 | $table->add_at (1, $row++, new DC::UI::CheckBox |
862 | $table->add_at (1, $row++, new DC::UI::CheckBox |
809 | state => $CFG->{force_opengl11}, |
863 | state => $CFG->{force_opengl11}, |
810 | tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " |
864 | tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " |
811 | . "higher memory usage and slower performance. It will, however, help tremendously on " |
865 | . "higher memory usage and slower performance. It will, however, help tremendously on " |
812 | . "cards that claim to support a feature but fall back to software rendering. " |
866 | . "cards that claim to support a feature but fall back to software rendering. " |
813 | . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " |
867 | . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " |
814 | . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " |
868 | . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " |
815 | . "experience extremely low framerates and your card should do better, try this option.</b>", |
869 | . "experience extremely low framerates and your card should do better, try this option.</b>", |
… | |
… | |
883 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); |
937 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); |
884 | $table->add_at (1, $row++, new DC::UI::Slider |
938 | $table->add_at (1, $row++, new DC::UI::Slider |
885 | range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], |
939 | range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], |
886 | tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " |
940 | tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " |
887 | . "but you still need to press apply to correctly re-layout the widget.", |
941 | . "but you still need to press apply to correctly re-layout the widget.", |
888 | on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, |
942 | on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, |
889 | ); |
943 | ); |
890 | |
944 | |
891 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); |
945 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); |
892 | $table->add_at (1, $row++, new DC::UI::Slider |
946 | $table->add_at (1, $row++, new DC::UI::Slider |
893 | range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], |
947 | range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], |
… | |
… | |
1525 | |
1579 | |
1526 | $vbox->add ( |
1580 | $vbox->add ( |
1527 | $HOST_ENTRY = new DC::UI::Entry |
1581 | $HOST_ENTRY = new DC::UI::Entry |
1528 | expand => 1, |
1582 | expand => 1, |
1529 | text => $CFG->{profile}{default}{host}, |
1583 | text => $CFG->{profile}{default}{host}, |
1530 | tooltip => "The hostname or ip address of the Deliantra server to connect to", |
1584 | tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", |
1531 | on_changed => sub { |
1585 | on_changed => sub { |
1532 | my ($self, $value) = @_; |
1586 | my ($self, $value) = @_; |
1533 | $CFG->{profile}{default}{host} = $value; |
1587 | $CFG->{profile}{default}{host} = $value; |
1534 | 1 |
1588 | 1 |
1535 | } |
1589 | } |
… | |
… | |
1538 | if (0) { #d# disabled |
1592 | if (0) { #d# disabled |
1539 | $vbox->add (new DC::UI::Button |
1593 | $vbox->add (new DC::UI::Button |
1540 | expand => 1, |
1594 | expand => 1, |
1541 | text => "Server List", |
1595 | text => "Server List", |
1542 | other => $METASERVER, |
1596 | other => $METASERVER, |
1543 | tooltip => "Show a list of available crossfire servers", |
1597 | tooltip => "Show a list of available Deliantra servers", |
1544 | on_activate => sub { $METASERVER->toggle_visibility; 0 }, |
1598 | on_activate => sub { $METASERVER->toggle_visibility; 0 }, |
1545 | on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, |
1599 | on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, |
1546 | ); |
1600 | ); |
1547 | }#d# |
1601 | }#d# |
1548 | } |
1602 | } |
… | |
… | |
1590 | $CFG->{show_tips} = $value; |
1644 | $CFG->{show_tips} = $value; |
1591 | 0 |
1645 | 0 |
1592 | } |
1646 | } |
1593 | ); |
1647 | ); |
1594 | |
1648 | |
1595 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); |
1649 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); |
1596 | $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry |
1650 | $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry |
1597 | text => $CFG->{logview_max_par}, |
1651 | text => $CFG->{logview_max_par}, |
1598 | tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " |
1652 | tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " |
1599 | . "sends more messages than this number, older messages get removed to save memory and " |
1653 | . "sends more messages than this number, older messages get removed to save memory and " |
1600 | . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", |
1654 | . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", |
1601 | on_changed => sub { |
1655 | on_changed => sub { |
1602 | my ($self, $value) = @_; |
1656 | my ($self, $value) = @_; |
1603 | $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); |
1657 | $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); |
1604 | 0 |
1658 | 0 |
1605 | }, |
1659 | }, |
1606 | ); |
1660 | ); |
1607 | |
1661 | |
1608 | $table |
1662 | $table |
… | |
… | |
1712 | |
1766 | |
1713 | $r |
1767 | $r |
1714 | } |
1768 | } |
1715 | |
1769 | |
1716 | my %SORT_ORDER = ( |
1770 | my %SORT_ORDER = ( |
1717 | type => undef, |
1771 | type => sub { |
|
|
1772 | sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ |
|
|
1773 | }, |
1718 | mtime => sub { |
1774 | mtime => sub { |
1719 | my $NOW = time; |
1775 | my $NOW = time; |
1720 | sort { |
1776 | sort { |
1721 | my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; |
1777 | my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; |
1722 | my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; |
1778 | my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; |
… | |
… | |
1944 | my @path = DC::Pod::full_path_of $node; |
2000 | my @path = DC::Pod::full_path_of $node; |
1945 | pop @path; # drop current node |
2001 | pop @path; # drop current node |
1946 | |
2002 | |
1947 | for my $node (@path) { |
2003 | for my $node (@path) { |
1948 | $buttons->add (new DC::UI::Button |
2004 | $buttons->add (new DC::UI::Button |
1949 | text => $node->{kw}[0], |
2005 | text => $node->[DC::Pod::N_KW][0], |
1950 | tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", |
2006 | tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", |
1951 | on_activate => sub { |
2007 | on_activate => sub { |
1952 | push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); |
2008 | push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); |
1953 | $load_node->($node); |
2009 | $load_node->($node); |
1954 | }, |
2010 | }, |
1955 | ); |
2011 | ); |
1956 | $buttons->add (new DC::UI::Label text => "/"); |
2012 | $buttons->add (new DC::UI::Label text => "/"); |
1957 | } |
2013 | } |
1958 | |
2014 | |
1959 | $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); |
2015 | $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4); |
1960 | |
2016 | |
1961 | $curnode = $node; |
2017 | $curnode = $node; |
1962 | |
2018 | |
1963 | $viewer->clear; |
2019 | $viewer->clear; |
1964 | $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); |
2020 | $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); |
… | |
… | |
2143 | force_x => "max", |
2199 | force_x => "max", |
2144 | force_y => 0; |
2200 | force_y => 0; |
2145 | $DEBUG_STATUS->show; |
2201 | $DEBUG_STATUS->show; |
2146 | |
2202 | |
2147 | $STATUSBOX = new DC::UI::Statusbox; |
2203 | $STATUSBOX = new DC::UI::Statusbox; |
2148 | $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); |
2204 | |
|
|
2205 | $MODBOX = new DC::UI::Label |
|
|
2206 | can_events => 1, |
|
|
2207 | can_hover => 1, |
|
|
2208 | markup => "", |
|
|
2209 | align => 0, |
|
|
2210 | font => $FONT_FIXED, |
|
|
2211 | tooltip => "#modifier_box", |
|
|
2212 | tooltip_width => 0.67, |
|
|
2213 | ; |
|
|
2214 | |
|
|
2215 | update_modbox; |
2149 | |
2216 | |
2150 | (new DC::UI::Frame |
2217 | (new DC::UI::Frame |
2151 | bg => [0, 0, 0, 0.4], |
2218 | bg => [0, 0, 0, 0.4], |
2152 | force_x => 0, |
2219 | force_x => 0, |
2153 | force_y => "max", |
2220 | force_y => "max", |
2154 | child => $STATUSBOX, |
2221 | child => (my $LR = new DC::UI::VBox), |
2155 | )->show; |
2222 | )->show; |
|
|
2223 | |
|
|
2224 | $LR->add ($STATUSBOX); |
|
|
2225 | $LR->add ($MODBOX); |
|
|
2226 | $LR->add (new DC::UI::Label |
|
|
2227 | align => 0, |
|
|
2228 | markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", |
|
|
2229 | fontsize => 0.5, |
|
|
2230 | fg => [1, 1, 0, 0.7], |
|
|
2231 | ); |
2156 | |
2232 | |
2157 | DC::UI::Toplevel->new ( |
2233 | DC::UI::Toplevel->new ( |
2158 | title => "Minimap", |
2234 | title => "Minimap", |
2159 | name => "mapmap", |
2235 | name => "mapmap", |
2160 | x => 0, |
2236 | x => 0, |
… | |
… | |
2168 | |
2244 | |
2169 | $MAPWIDGET = new DC::MapWidget; |
2245 | $MAPWIDGET = new DC::MapWidget; |
2170 | $MAPWIDGET->connect (activate_console => sub { |
2246 | $MAPWIDGET->connect (activate_console => sub { |
2171 | my ($mapwidget, $preset) = @_; |
2247 | my ($mapwidget, $preset) = @_; |
2172 | |
2248 | |
2173 | $MESSAGE_WINDOW->activate_console ($preset) |
2249 | $MESSAGE_DIST->activate_console ($preset) |
2174 | if $MESSAGE_WINDOW; |
2250 | if $MESSAGE_DIST; |
2175 | }); |
2251 | }); |
2176 | $MAPWIDGET->show; |
2252 | $MAPWIDGET->show; |
2177 | $MAPWIDGET->grab_focus; |
2253 | $MAPWIDGET->grab_focus; |
2178 | |
2254 | |
2179 | $COMPLETER = new DC::MapWidget::Command:: |
2255 | $COMPLETER = new DC::MapWidget::Command:: |
… | |
… | |
2191 | force_h => $::HEIGHT * 0.6, |
2267 | force_h => $::HEIGHT * 0.6, |
2192 | has_close_button => 1, |
2268 | has_close_button => 1, |
2193 | ; |
2269 | ; |
2194 | |
2270 | |
2195 | $METASERVER = metaserver_dialog; |
2271 | $METASERVER = metaserver_dialog; |
|
|
2272 | # the name is changed to not conflict with the older name as users could have hidden it |
2196 | $MESSAGE_WINDOW = new DC::UI::MessageWindow; |
2273 | $MESSAGE_WINDOW = new DC::UI::Dockbar |
|
|
2274 | name => "message_window2", |
|
|
2275 | title => 'Messages', |
|
|
2276 | force_w => $::WIDTH * 0.6, |
|
|
2277 | force_h => $::HEIGHT * 0.25, |
|
|
2278 | ; |
2197 | |
2279 | |
|
|
2280 | $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; |
|
|
2281 | |
2198 | $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, |
2282 | $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, |
2199 | filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); |
2283 | filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); |
2200 | |
2284 | |
2201 | $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, |
2285 | $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, |
2202 | "Configure the server to play on, your username and password."); |
2286 | "Configure the server to play on, your username and password."); |
2203 | $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, |
2287 | $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, |
… | |
… | |
2221 | $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top |
2305 | $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top |
2222 | |
2306 | |
2223 | $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, |
2307 | $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, |
2224 | tooltip => "Toggles a dialog where you can configure all aspects of this client."); |
2308 | tooltip => "Toggles a dialog where you can configure all aspects of this client."); |
2225 | |
2309 | |
2226 | $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, |
2310 | # $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, |
2227 | tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); |
2311 | # tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); |
2228 | |
2312 | |
2229 | 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 |
2313 | 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 |
2230 | |
2314 | |
2231 | $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, |
2315 | $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, |
2232 | tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); |
2316 | tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); |
… | |
… | |
2234 | $BUTTONBAR->add (new DC::UI::Button |
2318 | $BUTTONBAR->add (new DC::UI::Button |
2235 | text => "Save Config", |
2319 | text => "Save Config", |
2236 | tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", |
2320 | tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", |
2237 | on_activate => sub { |
2321 | on_activate => sub { |
2238 | $::CFG->{layout} = DC::UI::get_layout; |
2322 | $::CFG->{layout} = DC::UI::get_layout; |
2239 | DC::write_cfg "$Deliantra::VARDIR/client.cf"; |
2323 | DC::write_cfg; |
2240 | status "Configuration Saved"; |
2324 | status "Configuration Saved"; |
2241 | 0 |
2325 | 0 |
2242 | }, |
2326 | }, |
2243 | ); |
2327 | ); |
2244 | |
2328 | |
2245 | $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, |
2329 | $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, |
2246 | tooltip => "View Documentation"); |
2330 | tooltip => "View Documentation"); |
2247 | |
|
|
2248 | |
2331 | |
2249 | $BUTTONBAR->add (new DC::UI::Button |
2332 | $BUTTONBAR->add (new DC::UI::Button |
2250 | text => "Quit", |
2333 | text => "Quit", |
2251 | tooltip => "Terminates the program", |
2334 | tooltip => "Terminates the program", |
2252 | on_activate => sub { |
2335 | on_activate => sub { |
… | |
… | |
2341 | # alt-enter |
2424 | # alt-enter |
2342 | $FULLSCREEN_ENABLE->toggle; |
2425 | $FULLSCREEN_ENABLE->toggle; |
2343 | video_shutdown; |
2426 | video_shutdown; |
2344 | video_init; |
2427 | video_init; |
2345 | } else { |
2428 | } else { |
2346 | DC::UI::feed_sdl_key_down_event ($_[0]); |
2429 | &DC::UI::feed_sdl_key_down_event; |
2347 | } |
2430 | } |
|
|
2431 | update_modbox; |
2348 | }, |
2432 | }, |
2349 | DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, |
2433 | DC::SDL_KEYUP => sub { |
|
|
2434 | &DC::UI::feed_sdl_key_up_event; |
|
|
2435 | update_modbox; |
|
|
2436 | }, |
2350 | DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, |
2437 | DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, |
2351 | DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, |
2438 | DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, |
2352 | DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, |
2439 | DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, |
2353 | DC::SDL_USEREVENT => sub { |
2440 | DC::SDL_USEREVENT => sub { |
2354 | if ($_[0]{code} == 1) { |
2441 | if ($_[0]{code} == 1) { |
… | |
… | |
2365 | EV::unloop; |
2452 | EV::unloop; |
2366 | #d# TODO calling exit here hangs the process in some futex |
2453 | #d# TODO calling exit here hangs the process in some futex |
2367 | }; |
2454 | }; |
2368 | |
2455 | |
2369 | { |
2456 | { |
|
|
2457 | DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; |
|
|
2458 | |
2370 | if (-e "$Deliantra::VARDIR/client.cf") { |
2459 | if (-e "$Deliantra::VARDIR/client.cf") { |
2371 | DC::read_cfg "$Deliantra::VARDIR/client.cf"; |
2460 | DC::read_cfg "$Deliantra::VARDIR/client.cf"; |
2372 | } else { |
2461 | } else { |
2373 | #TODO: compatibility cruft |
2462 | #TODO: compatibility cruft |
2374 | DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; |
2463 | DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; |
2375 | print STDERR "INFO: used old configuratrion file\n"; |
2464 | print STDERR "INFO: used old configuration file\n"; |
2376 | } |
2465 | } |
2377 | |
2466 | |
2378 | DC::DB::Server::run; |
2467 | DC::DB::Server::run; |
|
|
2468 | |
|
|
2469 | if ($CFG->{db_schema} < 1) { |
|
|
2470 | warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; |
|
|
2471 | DC::DB::nuke_db; |
|
|
2472 | $CFG->{db_schema} = 1; |
|
|
2473 | DC::write_cfg; |
|
|
2474 | } |
|
|
2475 | |
|
|
2476 | DC::DB::open_db; |
2379 | |
2477 | |
2380 | DC::UI::set_layout ($::CFG->{layout}); |
2478 | DC::UI::set_layout ($::CFG->{layout}); |
2381 | |
2479 | |
2382 | my %DEF_CFG = ( |
2480 | my %DEF_CFG = ( |
2383 | sdl_mode => 0, |
2481 | sdl_mode => 0, |
… | |
… | |
2408 | pickup => 0, |
2506 | pickup => 0, |
2409 | inv_sort => "mtime", |
2507 | inv_sort => "mtime", |
2410 | default => "profile", # default profile |
2508 | default => "profile", # default profile |
2411 | show_tips => 1, |
2509 | show_tips => 1, |
2412 | logview_max_par => 1000, |
2510 | logview_max_par => 1000, |
|
|
2511 | shift_fire_stop => 0, |
2413 | ); |
2512 | ); |
2414 | |
2513 | |
2415 | while (my ($k, $v) = each %DEF_CFG) { |
2514 | while (my ($k, $v) = each %DEF_CFG) { |
2416 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
2515 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
2417 | } |
2516 | } |
… | |
… | |
2453 | DejaVuSansMono-BoldOblique.ttf |
2552 | DejaVuSansMono-BoldOblique.ttf |
2454 | ); |
2553 | ); |
2455 | |
2554 | |
2456 | DC::add_font $_ for @fonts; |
2555 | DC::add_font $_ for @fonts; |
2457 | |
2556 | |
2458 | DC::pango_init; |
|
|
2459 | |
|
|
2460 | $FONT_PROP = new_from_file DC::Font $fonts[0]; |
2557 | $FONT_PROP = new_from_file DC::Font $fonts[0]; |
2461 | $FONT_FIXED = new_from_file DC::Font $fonts[1]; |
2558 | $FONT_FIXED = new_from_file DC::Font $fonts[1]; |
2462 | |
2559 | |
2463 | $FONT_PROP->make_default; |
2560 | $FONT_PROP->make_default; |
|
|
2561 | |
|
|
2562 | DC::pango_init; |
2464 | } |
2563 | } |
2465 | |
2564 | |
2466 | # compare mono (ft) vs. rgba (cairo) |
2565 | # compare mono (ft) vs. rgba (cairo) |
2467 | # ft - 1.8s, cairo 3s, even in alpha-only mode |
2566 | # ft - 1.8s, cairo 3s, even in alpha-only mode |
2468 | # for my $rgba (0..1) { |
2567 | # for my $rgba (0..1) { |
… | |
… | |
2485 | our $STARTUP_CANCEL = EV::idle sub { |
2584 | our $STARTUP_CANCEL = EV::idle sub { |
2486 | undef $::STARTUP_CANCEL; |
2585 | undef $::STARTUP_CANCEL; |
2487 | $startup_done->(); |
2586 | $startup_done->(); |
2488 | }; |
2587 | }; |
2489 | |
2588 | |
|
|
2589 | delete $SIG{__DIE__}; |
2490 | EV::loop; |
2590 | EV::loop; |
2491 | |
2591 | |
2492 | #video_shutdown; |
2592 | #video_shutdown; |
2493 | #audio_shutdown; |
2593 | #audio_shutdown; |
2494 | DC::OpenGL::quit; |
2594 | DC::OpenGL::quit; |