ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.25 by elmex, Sun Jan 6 17:40:45 2008 UTC vs.
Revision 1.65 by root, Sat Aug 30 06:49:05 2008 UTC

… …
49 } 49 }
50 } 50 }
51 51
52 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 53 # pango is relocatable on win32
54 } else { 54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!"; 56 or die "pangoversion: $!";
57 my $PANGO = <$fh>; 57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file 58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
… …
69 69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!"; 72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n"; 73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else {
75 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things
74 } 81 }
75 82
76 unshift @INC, $root; 83 unshift @INC, $root;
77 } 84 }
78} 85}
… …
97use List::Util qw(max min); 104use List::Util qw(max min);
98 105
99use Deliantra; 106use Deliantra;
100use Deliantra::Protocol::Constants; 107use Deliantra::Protocol::Constants;
101 108
109use AnyEvent::DNS;
110use AnyEvent::Socket ();
111
102use Compress::LZF; 112use Compress::LZF;
103 113
104use DC; 114use DC;
115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }
105use DC::OpenGL (); 116use DC::OpenGL ();
106use DC::Protocol; 117use DC::Protocol;
107use DC::DB; 118use DC::DB;
108use DC::UI; 119use DC::UI;
109use DC::UI::Canvas; 120use DC::UI::Canvas;
110use DC::UI::Inventory; 121use DC::UI::Inventory;
111use DC::UI::SpellList; 122use DC::UI::SpellList;
112use DC::UI::Dockable; 123use DC::UI::Dockable;
113use DC::UI::Dockbar; 124use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 125use DC::UI::ChatView;
116use DC::MessageDistributor; 126use DC::MessageDistributor;
117use DC::Pod; 127use DC::Pod;
118use DC::MapWidget; 128use DC::MapWidget;
119use DC::Macro; 129use DC::Macro;
… …
137our $PROFILE; # current profile 147our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 149
140our $WANT_REFRESH; 150our $WANT_REFRESH;
141 151
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
154
142our @SDL_MODES; 155our @SDL_MODES;
156our $SDL_REINIT = 1;
143our $WIDTH; 157our $WIDTH;
144our $HEIGHT; 158our $HEIGHT;
145our $FULLSCREEN; 159our $FULLSCREEN;
146our $FONTSIZE; 160our $FONTSIZE;
147 161
… …
190our $SDL_ACTIVE; 204our $SDL_ACTIVE;
191our %SDL_CB; 205our %SDL_CB;
192 206
193our $ALT_ENTER_MESSAGE; 207our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 208our $STATUSBOX;
209our $MODBOX;
195our $DEBUG_STATUS; 210our $DEBUG_STATUS;
196 211
197our $INV; 212our $INV;
198our $INVR; 213our $INVR;
199our $INVR_HB; 214our $INVR_HB;
… …
208 $DEBUG_STATUS->set_text ($_[0]); 223 $DEBUG_STATUS->set_text ($_[0]);
209} 224}
210 225
211sub message { 226sub message {
212 $MESSAGE_DIST->message (@_); 227 $MESSAGE_DIST->message (@_);
228}
229
230sub update_modbox {
231 my $mod = DC::SDL_GetModState;
232
233 my $markup;
234
235 $markup .= $mod & DC::KMOD_CTRL
236 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
237 : "[<span foreground='#888'> once </span>]";
238
239 $markup .= $mod & DC::KMOD_SHIFT
240 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
241 : "[<span foreground='#888'>move</span>]";
242
243 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
244 ? "[ALT]"
245 : "[<span foreground='#888'>alt</span>]";
246
247 $markup .= $mod & DC::KMOD_NUM
248 ? "[NUM]"
249 : "[<span foreground='#888'>num</span>]";
250
251 # <tt> around next statement works around some bug that keeps the
252 # "font =>" from being used on windows
253 $MODBOX->set_markup ("<tt>$markup</tt>");
213} 254}
214 255
215############################################################################# 256#############################################################################
216#TODO: maybe move into own audio module... 257#TODO: maybe move into own audio module...
217 258
… …
637 # right: accept 678 # right: accept
638 $table->add_at (4, 0, new DC::UI::Button 679 $table->add_at (4, 0, new DC::UI::Button
639 text => "Accept", 680 text => "Accept",
640 on_activate => sub { 681 on_activate => sub {
641 $conn->send ("reply n"); 682 $conn->send ("reply n");
642 $STATS_PAGE->hide;
643 destroy_query_dialog $conn; 683 destroy_query_dialog $conn;
644 0 684 0
645 }, 685 },
646 ); 686 );
647 687
… …
699 739
700 $vbox->add (@dialog); 740 $vbox->add (@dialog);
701 $dialog->show; 741 $dialog->show;
702} 742}
703 743
704sub start_game { 744sub dc_connect {
705 status "logging in..."; 745 my ($host, $port) = @_;
706
707 $LOGIN_BUTTON->set_text ("Logout");
708 $SETUP_DIALOG->hide;
709 746
710 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 747 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
711 748
712 my ($host, $port) = split /:/, $PROFILE->{host};
713
714 $MAP = new DC::Map;
715
716 $CONN = eval { 749 $CONN =
717 new DC::Protocol 750 new DC::Protocol
718 host => $host, 751 host => $host,
719 port => $port || 13327, 752 port => $port,
720 user => $PROFILE->{user}, 753 user => $PROFILE->{user},
721 pass => $PROFILE->{password}, 754 pass => $PROFILE->{password},
722 mapw => $mapsize, 755 mapw => $mapsize,
723 maph => $mapsize, 756 maph => $mapsize,
724 757
725 client => "cfplus $DC::VERSION $] $^O", 758 client => "$DC::VERSION $] $^O",
726 759
727 map_widget => $MAPWIDGET, 760 map_widget => $MAPWIDGET,
728 statusbox => $STATUSBOX, 761 statusbox => $STATUSBOX,
729 map => $MAP, 762 map => $MAP,
730 mapmap => $MAPMAP, 763 mapmap => $MAPMAP,
731 query => \&server_query, 764 query => \&server_query,
732 765
733 setup_req => { 766 setup_req => {
734 smoothing => $CFG->{map_smoothing}*1, 767 smoothing => $CFG->{map_smoothing}*1,
735 }, 768 },
736 };
737 769
738 if ($CONN) { 770 on_connect => sub {
771 if ($_[0]) {
739 DC::lowdelay fileno $CONN->{fh}; 772 DC::lowdelay fileno $CONN->{fh};
740 773
741 status "login successful"; 774 status "login successful";
775 } else {
776 undef $CONN;
777 status "unable to connect: $!";
778 stop_game();
779 }
780 },
781 ;
782}
783
784sub start_game {
785 status "logging in...";
786
787 $LOGIN_BUTTON->set_text ("Logout");
788 $SETUP_DIALOG->hide;
789
790 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
791
792 $MAP = new DC::Map;
793
794 # hack to make SURE we find the IP address all right
795 # can be removed once AnyEvent::DNS is proven stable.
796 if ($host eq "gameserver.deliantra.net") {
797 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
798 if ($_[0] ne "80.101.114.108") { # Perl
799 status "dns failure, using hardcoded address";
800 $host = "129.13.162.95";
801 }
802
803 dc_connect $host, $port;
804 };
742 } else { 805 } else {
743 status "unable to connect"; 806 dc_connect $host, $port;
744 stop_game();
745 } 807 }
746} 808}
747 809
748sub stop_game { 810sub stop_game {
749 $LOGIN_BUTTON->set_text ("Login / Register"); 811 $LOGIN_BUTTON->set_text ("Login / Register");
… …
773 835
774 my $row = 0; 836 my $row = 0;
775 837
776 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
777 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 839 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
778 can_events => 1, 840 can_events => 1,
779 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 841 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
842
843 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
844 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
845 can_events => 1,
846 tooltip => "This field shows any known issues with your config or driver, such as "
847 . "a non-accelerated display format. You can try to work around these issues "
848 . "by selecting a different video mode, changing the settings below or "
849 . "by installing the right driver for your graphics card.");
780 850
781 my $vidmode_tooltip = 851 my $vidmode_tooltip =
782 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 852 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
783 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 853 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
784 854
785 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 855 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
786 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 856 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
787 857
788 $hbox->add (my $mode_slider = new DC::UI::Slider 858 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
789 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 859 force_w => $WIDTH * 0.1, expand => 1,
860 range => [ ($CFG->{sdl_mode}) x 3 ],
790 tooltip => $vidmode_tooltip); 861 tooltip => $vidmode_tooltip);
791 $hbox->add (my $mode_label = new DC::UI::Label 862 $hbox->add (my $mode_label = new DC::UI::Label
792 height => 0.8, template => "9999x9999@9+9", 863 height => 0.8, template => "9999x9999@9+9",
793 can_events => 1, tooltip => $vidmode_tooltip); 864 can_events => 1, tooltip => $vidmode_tooltip);
794 865
795 $mode_slider->connect (changed => sub { 866 $MODE_SLIDER->connect (changed => sub {
796 my ($self, $value) = @_; 867 my ($self, $value) = @_;
797 868
798 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 869 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
799 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 870 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
800 }); 871 });
801 $mode_slider->emit (changed => $mode_slider->{range}[0]); 872 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
802 873
803 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 874 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
804 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 875 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
805 state => $CFG->{fullscreen}, 876 state => $CFG->{fullscreen},
806 tooltip => "Bring the client into fullscreen mode.", 877 tooltip => "Bring the client into fullscreen mode.",
… …
812 state => $CFG->{force_opengl11}, 883 state => $CFG->{force_opengl11},
813 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 884 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
814 . "higher memory usage and slower performance. It will, however, help tremendously on " 885 . "higher memory usage and slower performance. It will, however, help tremendously on "
815 . "cards that claim to support a feature but fall back to software rendering. " 886 . "cards that claim to support a feature but fall back to software rendering. "
816 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 887 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
817 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 888 . "but cards and drivers from other vendors (ATI) are often just as bad. "
818 . "experience extremely low framerates and your card should do better, try this option.</b>", 889 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
819 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 890 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
891 );
892
893 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
894 $table->add_at (1, $row++, new DC::UI::CheckBox
895 state => $CFG->{disable_alpha},
896 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
897 . "by disabling a number of textures and transparency effects. Normally, these "
898 . "effects do not cost a lot of resources, but some graphics cards might fall "
899 . "back to etxremely slow rendering if this is enabled. If disabling this option "
900 . "noticably improves the framerate of the client please report this! "
901 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
902 on_changed => sub {
903 my ($self, $value) = @_;
904 $CFG->{disable_alpha} = $value;
905 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
906 0
907 }
820 ); 908 );
821 909
822 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 910 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
823 $table->add_at (1, $row++, new DC::UI::CheckBox 911 $table->add_at (1, $row++, new DC::UI::CheckBox
824 state => $CFG->{texture_compression}, 912 state => $CFG->{texture_compression},
825 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 913 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
826 . "will save a lot of memory and increase performance. The compression algorithm " 914 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
827 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 915 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
828 . "forced OpenGL 1.1 mode.", 916 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
829 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 917 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
830 ); 918 );
831 919
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
833 $table->add_at (1, $row++, new DC::UI::CheckBox 921 $table->add_at (1, $row++, new DC::UI::CheckBox
… …
849 on_activate => sub { 937 on_activate => sub {
850 video_shutdown (); 938 video_shutdown ();
851 video_init (); 939 video_init ();
852 0 940 0
853 } 941 }
942 );
943
944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
945 $table->add_at (1, $row++, new DC::UI::CheckBox
946 state => $CFG->{smooth_movement},
947 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
948 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
949 . "then disable this option. Changes take effect immdiately.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
854 ); 951 );
855 952
856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
857 $table->add_at (1, $row++, new DC::UI::Slider 954 $table->add_at (1, $row++, new DC::UI::Slider
858 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 955 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1498 1 1595 1
1499 }, 1596 },
1500 ); 1597 );
1501 1598
1502 $vbox->add (new DC::UI::FancyFrame 1599 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1600 label => "How to Play",
1504 min_h => 200, 1601 min_h => 240,
1505 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1602 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1603 markup =>
1604 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1605 . "Then register a new account (or use an existing one if you have one). "
1507 "To register a new account, choose a username that hasn't been taken yet and " 1606 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1508 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1607 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1608 ),
1510 ); 1609 );
1511 1610
1512 $vbox 1611 $vbox
… …
1528 1627
1529 $vbox->add ( 1628 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1629 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1630 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1631 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1632 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1633 on_changed => sub {
1535 my ($self, $value) = @_; 1634 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1635 $CFG->{profile}{default}{host} = $value;
1537 1 1636 1
1538 } 1637 }
… …
1541 if (0) { #d# disabled 1640 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1641 $vbox->add (new DC::UI::Button
1543 expand => 1, 1642 expand => 1,
1544 text => "Server List", 1643 text => "Server List",
1545 other => $METASERVER, 1644 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1645 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1646 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1647 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1648 );
1550 }#d# 1649 }#d#
1551 } 1650 }
… …
1593 $CFG->{show_tips} = $value; 1692 $CFG->{show_tips} = $value;
1594 0 1693 0
1595 } 1694 }
1596 ); 1695 );
1597 1696
1598 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1697 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1698 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1699 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1700 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1602 . "sends more messages than this number, older messages get removed to save memory and " 1701 . "sends more messages than this number, older messages get removed to save memory and "
1603 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1702 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1703 on_changed => sub {
1605 my ($self, $value) = @_; 1704 my ($self, $value) = @_;
1606 $MESSAGE_DIST->set_max_para ($CFG->{logview_max_par} = $value*1); 1705 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1706 0
1608 }, 1707 },
1609 ); 1708 );
1610 1709
1611 $table 1710 $table
… …
1658 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1757 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1659 ["Ignore cursed" => PICKUP_NOT_CURSED], 1758 ["Ignore cursed" => PICKUP_NOT_CURSED],
1660 ["Jewelery" => PICKUP_JEWELS], 1759 ["Jewelery" => PICKUP_JEWELS],
1661 ["Flesh" => PICKUP_FLESH], 1760 ["Flesh" => PICKUP_FLESH],
1662 ], 1761 ],
1663 ["Weight/Value ratio", 2, 17] 1762 ["Value/Weight ratio", 2, 17]
1664 ) 1763 )
1665 { 1764 {
1666 my ($title, $x, $y, @bits) = @$_; 1765 my ($title, $x, $y, @bits) = @$_;
1667 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1766 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1668 1767
… …
1693 } 1792 }
1694 1793
1695 $table->add_at (2, 18, new DC::UI::ValSlider 1794 $table->add_at (2, 18, new DC::UI::ValSlider
1696 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1795 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1697 template => ">= 99", 1796 template => ">= 99",
1797 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1698 to_value => sub { ">= " . 5 * $_[0] }, 1798 to_value => sub { ">= " . 5 * $_[0] },
1699 on_changed => sub { 1799 on_changed => sub {
1700 my ($slider, $value) = @_; 1800 my ($slider, $value) = @_;
1701 1801
1702 $::CFG->{pickup} &= ~0xF; 1802 $::CFG->{pickup} &= ~0xF;
… …
1715 1815
1716 $r 1816 $r
1717} 1817}
1718 1818
1719my %SORT_ORDER = ( 1819my %SORT_ORDER = (
1720 type => undef, 1820 type => sub {
1821 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1822 },
1721 mtime => sub { 1823 mtime => sub {
1722 my $NOW = time; 1824 my $NOW = time;
1723 sort { 1825 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1826 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1725 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1827 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1756 $::CFG->{inv_sort} = $_[1]; 1858 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1859 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1860 },
1759 ); 1861 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1862 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1863 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1864 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1865
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1866 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1867 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1868 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1947 my @path = DC::Pod::full_path_of $node; 2049 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2050 pop @path; # drop current node
1949 2051
1950 for my $node (@path) { 2052 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2053 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2054 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2055 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2056 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2057 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2058 $load_node->($node);
1957 }, 2059 },
1958 ); 2060 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2061 $buttons->add (new DC::UI::Label text => "/");
1960 } 2062 }
1961 2063
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2064 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2065
1964 $curnode = $node; 2066 $curnode = $node;
1965 2067
1966 $viewer->clear; 2068 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2069 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2093 $dialog->show; 2195 $dialog->show;
2094 }; 2196 };
2095} 2197}
2096 2198
2097sub sdl_init { 2199sub sdl_init {
2098 DC::SDL_Init 2200 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2201 and die "SDL::Init failed!\n";
2100} 2202}
2101 2203
2102sub video_init { 2204sub video_init {
2205 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2206 $SDL_REINIT = 0;
2207
2208 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2209 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2210 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2211 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2212
2213 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2214
2103 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2215 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2216 $CFG->{sdl_mode} = 0; # lowest resolution by default
2217
2218 # now choose biggets mode <= 1024x768
2219 for (0 .. $#SDL_MODES) {
2220 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2221 $CFG->{sdl_mode} = $_;
2222 }
2223 }
2224 }
2104 2225
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2226 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2227
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2228 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2229 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2230 $FAST = $CFG->{fast};
2110 2231
2232 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2111 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2233 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2234 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2235 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2236
2114 $SDL_ACTIVE = 1; 2237 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2238 $LAST_REFRESH = time - 0.01;
2116 2239
… …
2146 force_x => "max", 2269 force_x => "max",
2147 force_y => 0; 2270 force_y => 0;
2148 $DEBUG_STATUS->show; 2271 $DEBUG_STATUS->show;
2149 2272
2150 $STATUSBOX = new DC::UI::Statusbox; 2273 $STATUSBOX = new DC::UI::Statusbox;
2151 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2274
2275 $MODBOX = new DC::UI::Label
2276 can_events => 1,
2277 can_hover => 1,
2278 markup => "",
2279 align => 0,
2280 font => $FONT_FIXED,
2281 tooltip => "#modifier_box",
2282 tooltip_width => 0.67,
2283 ;
2284
2285 update_modbox;
2152 2286
2153 (new DC::UI::Frame 2287 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2288 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2289 force_x => 0,
2156 force_y => "max", 2290 force_y => "max",
2157 child => $STATUSBOX, 2291 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2292 )->show;
2293
2294 $LR->add ($STATUSBOX);
2295 $LR->add ($MODBOX);
2296 $LR->add (new DC::UI::Label
2297 align => 0,
2298 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2299 fontsize => 0.5,
2300 fg => [1, 1, 0, 0.7],
2301 );
2159 2302
2160 DC::UI::Toplevel->new ( 2303 DC::UI::Toplevel->new (
2161 title => "Minimap", 2304 title => "Minimap",
2162 name => "mapmap", 2305 name => "mapmap",
2163 x => 0, 2306 x => 0,
… …
2194 force_h => $::HEIGHT * 0.6, 2337 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2338 has_close_button => 1,
2196 ; 2339 ;
2197 2340
2198 $METASERVER = metaserver_dialog; 2341 $METASERVER = metaserver_dialog;
2199 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2342 # the name is changed to not conflict with the older name as users could have hidden it
2343 $MESSAGE_WINDOW = new DC::UI::Dockbar
2344 name => "message_window2",
2345 title => 'Messages',
2346 force_w => $::WIDTH * 0.6,
2347 force_h => $::HEIGHT * 0.25,
2348 ;
2349
2200 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2350 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2351
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2352 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2353 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2354
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2355 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2356 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2357 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2375 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2376
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2377 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2378 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2379
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2380# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2381# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2382
2233 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 2383 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
2234 2384
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2385 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2386 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2238 $BUTTONBAR->add (new DC::UI::Button 2388 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2389 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2390 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub { 2391 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2392 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2393 DC::write_cfg;
2244 status "Configuration Saved"; 2394 status "Configuration Saved";
2245 0 2395 0
2246 }, 2396 },
2247 ); 2397 );
2248 2398
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2399 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2400 tooltip => "View Documentation");
2251
2252 2401
2253 $BUTTONBAR->add (new DC::UI::Button 2402 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2403 text => "Quit",
2255 tooltip => "Terminates the program", 2404 tooltip => "Terminates the program",
2256 on_activate => sub { 2405 on_activate => sub {
… …
2266 $BUTTONBAR->show; 2415 $BUTTONBAR->show;
2267 $SETUP_DIALOG->show; 2416 $SETUP_DIALOG->show;
2268 $MESSAGE_WINDOW->show; 2417 $MESSAGE_WINDOW->show;
2269 } 2418 }
2270 2419
2420 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2421 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2422
2423 $CAVEAT_LABEL->set_text ("None :)");
2424 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2425 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2426
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2427 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2428}
2273 2429
2274sub video_shutdown { 2430sub video_shutdown {
2275 DC::OpenGL::shutdown; 2431 DC::OpenGL::shutdown;
2432 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2433
2277 undef $SDL_ACTIVE; 2434 undef $SDL_ACTIVE;
2278} 2435}
2279 2436
2280my %animate_object; 2437my %animate_object;
… …
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2498# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2499 },
2343 DC::SDL_KEYDOWN => sub { 2500 DC::SDL_KEYDOWN => sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2501 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2502 # alt-enter
2503 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2504 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2505 video_init;
2349 } else { 2506 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2507 &DC::UI::feed_sdl_key_down_event;
2351 } 2508 }
2509 update_modbox;
2352 }, 2510 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2511 DC::SDL_KEYUP => sub {
2512 &DC::UI::feed_sdl_key_up_event;
2513 update_modbox;
2514 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2515 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2516 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2517 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2518 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2519 if ($_[0]{code} == 1) {
… …
2368$SIG{INT} = $SIG{TERM} = sub { 2529$SIG{INT} = $SIG{TERM} = sub {
2369 EV::unloop; 2530 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2531 #d# TODO calling exit here hangs the process in some futex
2371}; 2532};
2372 2533
2373{ 2534# due to mac os x + sdl combined briandamage, we need this contortion
2535sub main {
2536 {
2537 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2538
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2539 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2540 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2541 } else {
2377 #TODO: compatibility cruft 2542 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2543 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2544 print STDERR "INFO: used old configuration file\n";
2380 } 2545 }
2381 2546
2382 DC::DB::Server::run; 2547 DC::DB::Server::run;
2383 2548
2549 if ($CFG->{db_schema} < 1) {
2550 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2551 DC::DB::nuke_db;
2552 $CFG->{db_schema} = 1;
2553 DC::write_cfg;
2554 }
2555
2556 DC::DB::open_db;
2557
2384 DC::UI::set_layout ($::CFG->{layout}); 2558 DC::UI::set_layout ($::CFG->{layout});
2385 2559
2386 my %DEF_CFG = ( 2560 my %DEF_CFG = (
2387 sdl_mode => 0, 2561 sdl_mode => undef,
2388 fullscreen => 1, 2562 fullscreen => 1,
2389 fast => 0, 2563 fast => 0,
2390 force_opengl11 => undef, 2564 force_opengl11 => undef,
2565 disable_alpha => 0,
2566 smooth_movement => 1,
2391 texture_compression => 1, 2567 texture_compression => 1,
2392 map_scale => 1, 2568 map_scale => 1,
2393 fow_enable => 1, 2569 fow_enable => 1,
2394 fow_intensity => 0, 2570 fow_intensity => 0,
2395 map_smoothing => 1, 2571 map_smoothing => 1,
2396 gui_fontsize => 1, 2572 gui_fontsize => 1,
2397 log_fontsize => 0.7, 2573 log_fontsize => 0.7,
2398 gauge_fontsize => 1, 2574 gauge_fontsize => 1,
2399 gauge_size => 0.35, 2575 gauge_size => 0.35,
2400 stat_fontsize => 0.7, 2576 stat_fontsize => 0.7,
2401 mapsize => 100, 2577 mapsize => 100,
2402 audio_enable => 1, 2578 audio_enable => 1,
2403 audio_hw_channels => 0, 2579 audio_hw_channels => 0,
2404 audio_hw_frequency => 0, 2580 audio_hw_frequency => 0,
2405 audio_hw_chunksize => 0, 2581 audio_hw_chunksize => 0,
2406 audio_mix_channels => 8, 2582 audio_mix_channels => 8,
2407 effects_enable => 1, 2583 effects_enable => 1,
2408 effects_volume => 1, 2584 effects_volume => 1,
2409 bgm_enable => 1, 2585 bgm_enable => 1,
2410 bgm_volume => 0.5, 2586 bgm_volume => 0.5,
2411 output_rate => "", 2587 output_rate => "",
2412 pickup => 0, 2588 pickup => 0,
2413 inv_sort => "mtime", 2589 inv_sort => "mtime",
2414 default => "profile", # default profile 2590 default => "profile", # default profile
2415 show_tips => 1, 2591 show_tips => 1,
2416 logview_max_par => 1000, 2592 logview_max_par => 1000,
2593 shift_fire_stop => 0,
2417 ); 2594 );
2418 2595
2419 while (my ($k, $v) = each %DEF_CFG) { 2596 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2597 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2598 }
2422 2599
2423 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2600 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2424 $PROFILE = $CFG->{profile}{default}; 2601 $PROFILE = $CFG->{profile}{default};
2425 2602
2426 # convert old bindings (only default profile matters) 2603 # convert old bindings (only default profile matters)
2427 if (my $bindings = delete $PROFILE->{bindings}) { 2604 if (my $bindings = delete $PROFILE->{bindings}) {
2428 while (my ($mod, $syms) = each %$bindings) { 2605 while (my ($mod, $syms) = each %$bindings) {
2429 while (my ($sym, $cmds) = each %$syms) { 2606 while (my ($sym, $cmds) = each %$syms) {
2430 push @{ $PROFILE->{macro} }, { 2607 push @{ $PROFILE->{macro} }, {
2431 accelkey => [$mod*1, $sym*1], 2608 accelkey => [$mod*1, $sym*1],
2432 action => $cmds, 2609 action => $cmds,
2610 };
2433 }; 2611 }
2434 } 2612 }
2435 } 2613 }
2436 }
2437 2614
2438 sdl_init; 2615 sdl_init;
2439 2616
2440 @SDL_MODES = DC::SDL_ListModes 8, 8; 2617 {
2441 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2442 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2443
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2445
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447
2448 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2618 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2619 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2620 DejaVuSansMono.ttf
2452 DejaVuSans-Bold.ttf 2621 DejaVuSans-Bold.ttf
2453 DejaVuSansMono-Bold.ttf 2622 DejaVuSansMono-Bold.ttf
2454 DejaVuSans-Oblique.ttf 2623 DejaVuSans-Oblique.ttf
2455 DejaVuSansMono-Oblique.ttf 2624 DejaVuSansMono-Oblique.ttf
2456 DejaVuSans-BoldOblique.ttf 2625 DejaVuSans-BoldOblique.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2626 DejaVuSansMono-BoldOblique.ttf
2458 ); 2627 );
2459 2628
2460 DC::add_font $_ for @fonts; 2629 DC::add_font $_ for @fonts;
2461 2630
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2631 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2632 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2633
2467 $FONT_PROP->make_default; 2634 $FONT_PROP->make_default;
2468 } 2635
2636 DC::pango_init;
2637 }
2469 2638
2470# compare mono (ft) vs. rgba (cairo) 2639# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2640# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2641# for my $rgba (0..1) {
2473# my $t1 = Time::HiRes::time; 2642# my $t1 = Time::HiRes::time;
… …
2478# } 2647# }
2479# my $t2 = Time::HiRes::time; 2648# my $t2 = Time::HiRes::time;
2480# warn $t2-$t1; 2649# warn $t2-$t1;
2481# } 2650# }
2482 2651
2483 video_init; 2652 video_init;
2484 audio_init; 2653 audio_init;
2485} 2654 }
2486 2655
2487show_tip_of_the_day if $CFG->{show_tips}; 2656 show_tip_of_the_day if $CFG->{show_tips};
2488 2657
2489our $STARTUP_CANCEL = EV::idle sub { 2658 our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2659 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2660 $startup_done->();
2492}; 2661 };
2493 2662
2663 delete $SIG{__DIE__};
2494EV::loop; 2664 EV::loop;
2495 2665
2496#video_shutdown; 2666#video_shutdown;
2497#audio_shutdown; 2667#audio_shutdown;
2498DC::OpenGL::quit; 2668 DC::OpenGL::quit;
2499DC::SDL_Quit; 2669 DC::SDL_Quit;
2500DC::DB::Server::stop; 2670 DC::DB::Server::stop;
2671}
2672
2673DC::SDL_braino; # see sub above
2501 2674
2502=head1 NAME 2675=head1 NAME
2503 2676
2504deliantra - A Deliantra MORPG game client 2677deliantra - A Deliantra MORPG game client
2505 2678
… …
2522 4 show fps 2695 4 show fps
2523 8 suppress tooltips 2696 8 suppress tooltips
2524 2697
2525=head1 AUTHOR 2698=head1 AUTHOR
2526 2699
2527Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2700Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2528 2701
2529 2702
2530 2703

Diff Legend

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