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.85 by root, Sun Jan 11 03:19:47 2009 UTC vs.
Revision 1.101 by root, Thu Feb 4 20:01:09 2010 UTC

… …
56 56
57 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
58 # pango is relocatable on win32 58 # pango is relocatable on win32
59 } else { 59 } else {
60 # OS X 60 # OS X
61 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
62 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
63 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
64 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
65 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
66 } 64 }
67 65
68 unshift @INC, $root; 66 unshift @INC, $root;
69 } 67 }
70} 68}
71 69
72# prepend private library directory 70# prepend private library directory and prepare env
73BEGIN { 71BEGIN {
74 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
75 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
76 if (-d $path) { 74 if (-d $path) {
77 unshift @INC, $path; 75 unshift @INC, $path;
… …
135 crash "CRASH/EV::DIED: $@" => 0; 133 crash "CRASH/EV::DIED: $@" => 0;
136 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
137}; 135};
138 136
139my $MAX_FPS = 60; 137my $MAX_FPS = 60;
138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
140 140
141our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
142 142
143our $LAST_REFRESH; 143our $LAST_REFRESH;
144our $NOW; 144our $NOW;
… …
205our $FLOORBOX; 205our $FLOORBOX;
206our $GAUGES; 206our $GAUGES;
207our $STATWIDS; 207our $STATWIDS;
208 208
209our $SDL_ACTIVE; 209our $SDL_ACTIVE;
210our %SDL_CB; 210our @SDL_CB;
211 211
212our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
213our $STATUSBOX; 213our $STATUSBOX;
214our $MODBOX; 214our $MODBOX;
215our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
541 sub audio_tab_update; 541 sub audio_tab_update;
542 audio_tab_update; 542 audio_tab_update;
543} 543}
544 544
545sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
546 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
547 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
548 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
549 554
550 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
… …
818 823
819 on_connect => sub { 824 on_connect => sub {
820 if ($_[0]) { 825 if ($_[0]) {
821 DC::lowdelay fileno $CONN->{fh}; 826 DC::lowdelay fileno $CONN->{fh};
822 827
823 status "login successful"; 828 status "successfully connected to the server";
824 } else { 829 } else {
825 undef $CONN; 830 undef $CONN;
826 status "unable to connect: $!"; 831 status "unable to connect: $!";
827 stop_game(); 832 stop_game();
828 } 833 }
… …
830 ; 835 ;
831} 836}
832 837
833sub start_game { 838sub start_game {
834 status "logging in..."; 839 status "logging in...";
840
841 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
842 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
843 or return status "$server: unable to parse server address, try an empty field.";
835 844
836 $LOGIN_BUTTON->set_text ("Logout"); 845 $LOGIN_BUTTON->set_text ("Logout");
837 $SETUP_DIALOG->hide; 846 $SETUP_DIALOG->hide;
838
839 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
840 847
841 $MAP = new DC::Map; 848 $MAP = new DC::Map;
842 849
843 # hack to make SURE we find the IP address all right 850 # hack to make SURE we find the IP address all right
844 # can be removed once AnyEvent::DNS is proven stable. 851 # can be removed once AnyEvent::DNS is proven stable.
845 if ($host eq "gameserver.deliantra.net") { 852 if ($host eq "gameserver.deliantra.net") {
846 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 853 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
847 if ($_[0] ne "80.101.114.108") { # Perl 854 if ($_[0] ne "80.101.114.108") { # Perl
855 status "dns failure, trying differently";
856 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
857 unless (defined $host) {
848 status "dns failure, using hardcoded address"; 858 status "dns failure, using hardcoded address";
849 $host = "129.13.162.95"; 859 $host = "129.13.162.95";
860 }
850 } 861 }
851 862
852 dc_connect $host, $port; 863 dc_connect $host, $port;
853 }; 864 };
854 } else { 865 } else {
… …
1023 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1034 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1024 . "then disable this option. Changes take effect immdiately.", 1035 . "then disable this option. Changes take effect immdiately.",
1025 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1026 ); 1037 );
1027 1038
1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1040 $table->add_at (1, $row++, new DC::UI::CheckBox
1041 state => $CFG->{smooth_transitions},
1042 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1043 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1044 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1045 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1046 );
1047
1048
1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1029 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
1030 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1051 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1031 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1052 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1032 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
… …
1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1045 $table->add_at (1, $row++, new DC::UI::CheckBox 1066 $table->add_at (1, $row++, new DC::UI::CheckBox
1046 state => $CFG->{fow_enable}, 1067 state => $CFG->{fow_enable},
1047 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1068 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1069 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1070 );
1071
1072 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1073 $table->add_at (1, $row++, new DC::UI::ImageButton
1074 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1075 bg => [0.3, 0.3, 0.2],
1076 force_w => 64,
1077 force_h => 64,
1078 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1079 on_activate => sub {
1080 my ($self) = @_;
1081 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1082 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1083 $MAPWIDGET->update;
1084 }
1049 ); 1085 );
1050 1086
1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1087 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1052 $table->add_at (1, $row++, new DC::UI::Slider 1088 $table->add_at (1, $row++, new DC::UI::Slider
1053 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1089 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
1105 1141
1106 my $text = !$freq 1142 my $text = !$freq
1107 ? "audio is off" 1143 ? "audio is off"
1108 : "audio is enabled\n" 1144 : "audio is enabled\n"
1109 . "frequency (Hz): $freq\n" 1145 . "frequency (Hz): $freq\n"
1110 . "channels: $chans"; 1146 . "channels: $chans\n"
1147 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1148 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1111 1149
1112 $AUDIO_INFO->set_text ($text); 1150 $AUDIO_INFO->set_text ($text);
1113} 1151}
1114 1152
1115sub audio_setup { 1153sub audio_setup {
… …
1636 ); 1674 );
1637 1675
1638 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1676 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1639 $table->add_at (1, 4, new DC::UI::Entry 1677 $table->add_at (1, 4, new DC::UI::Entry
1640 text => $CFG->{profile}{default}{user}, 1678 text => $CFG->{profile}{default}{user},
1641 tooltip => "The name of your character on the server.", 1679 tooltip => "The name of your character on the server. The name is case-sensitive!",
1642 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1680 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1643 ); 1681 );
1644 1682
1645 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1683 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1646 $table->add_at (1, 5, new DC::UI::Entry 1684 $table->add_at (1, 5, new DC::UI::Entry
… …
1809 col_expand => [0, 1, 0, 1], 1847 col_expand => [0, 1, 0, 1],
1810 ); 1848 );
1811 1849
1812 for ( 1850 for (
1813 ["General", 0, 0, 1851 ["General", 0, 0,
1814 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1815 ["Inhibit autopickup" => PICKUP_INHIBIT], 1852# ["Inhibit autopickup" => PICKUP_INHIBIT],
1816 ["Stop before pickup" => PICKUP_STOP], 1853 ["Stop before pickup" => PICKUP_STOP],
1817 ["Debug autopickup" => PICKUP_DEBUG], 1854 ["Debug autopickup" => PICKUP_DEBUG],
1818 ], 1855 ],
1819 ["Weapons", 0, 6, 1856 ["Weapons", 0, 6,
1820 ["All weapons" => PICKUP_ALLWEAPON], 1857 ["All weapons" => PICKUP_ALLWEAPON],
… …
1868 $::CFG->{pickup} |= $mask; 1905 $::CFG->{pickup} |= $mask;
1869 } else { 1906 } else {
1870 $::CFG->{pickup} &= ~$mask; 1907 $::CFG->{pickup} &= ~$mask;
1871 } 1908 }
1872 1909
1873 $::CONN->send_command ("pickup $::CFG->{pickup}") 1910 $::CONN->send_pickup ($::CFG->{pickup})
1874 if defined $::CONN; 1911 if defined $::CONN;
1875 1912
1876 0 1913 0
1877 }); 1914 });
1878 1915
… …
1895 }); 1932 });
1896 1933
1897 $table->add_at (3, 18, new DC::UI::Button 1934 $table->add_at (3, 18, new DC::UI::Button
1898 text => "set", 1935 text => "set",
1899 on_activate => sub { 1936 on_activate => sub {
1900 $::CONN->send_command ("pickup $::CFG->{pickup}") 1937 $::CONN->send_pickup ($::CFG->{pickup})
1901 if defined $::CONN; 1938 if defined $::CONN;
1902 0 1939 0
1903 }); 1940 });
1904 1941
1905 $r 1942 $r
… …
2068 2105
2069sub keyboard_setup { 2106sub keyboard_setup {
2070 DC::Macro::keyboard_setup 2107 DC::Macro::keyboard_setup
2071} 2108}
2072 2109
2073sub help_window { 2110sub make_help_window {
2074 my $win = new DC::UI::Toplevel 2111 my $win = new DC::UI::Toplevel
2075 x => 'center', 2112 x => 'center',
2076 y => 'center', 2113 y => 'center',
2077 z => 4, 2114 z => 4,
2078 name => 'doc_browser', 2115 name => 'doc_browser',
… …
2167 2204
2168 $load_node->((DC::Pod::find @path)[0]); 2205 $load_node->((DC::Pod::find @path)[0]);
2169 $win->show; 2206 $win->show;
2170 }; 2207 };
2171 2208
2172 $win 2209 $HELP_WINDOW = $win;
2173} 2210}
2174 2211
2175sub open_quit_dialog { 2212sub open_quit_dialog {
2176 unless ($QUIT_DIALOG) { 2213 unless ($QUIT_DIALOG) {
2177 $QUIT_DIALOG = new DC::UI::Toplevel 2214 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2210 2247
2211 $QUIT_DIALOG->show; 2248 $QUIT_DIALOG->show;
2212 $QUIT_DIALOG->grab_focus; 2249 $QUIT_DIALOG->grab_focus;
2213} 2250}
2214 2251
2215sub make_menuframe { 2252sub make_menubar {
2216 $MENUFRAME = new DC::UI::Toplevel 2253 $MENUFRAME = new DC::UI::Toplevel
2217 border => 0, 2254 border => 0,
2218 force_x => 0, 2255 force_x => 0,
2219 force_y => 0, 2256 force_y => 0,
2220 force_w => $::WIDTH, 2257 force_w => $::WIDTH,
… …
2230# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2267# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231 2268
2232 make_playerbook; 2269 make_playerbook;
2233 2270
2234 $MENUPOPUP = DC::UI::Menu->new (items => [ 2271 $MENUPOPUP = DC::UI::Menu->new (items => [
2235 ["Setup…" , sub { $SETUP_DIALOG->toggle_visibility}], 2272 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2236 ["Playerbook…\tTab", sub { $PL_WINDOW ->toggle_visibility}], 2273 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2274 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2275 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2276 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2277 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2237 ["Help Browser…" , sub { $HELP_WINDOW ->toggle_visibility}], 2278 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2238 ["Quit…" , sub { 2279 ["Quit…" , sub {
2239 if ($CONN) { 2280 if ($CONN) {
2240 open_quit_dialog; 2281 open_quit_dialog;
2241 } else { 2282 } else {
2242 EV::unloop EV::UNLOOP_ALL; 2283 EV::unloop EV::UNLOOP_ALL;
2243 } 2284 }
2244 }], 2285 }],
2245 ]); 2286 ]);
2246 2287
2247 $BUTTONBAR->add (new DC::UI::Button text => "Menu…", 2288 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2248 tooltip => "Shows the main menu", 2289 tooltip => "Shows the main menu",
2249 on_button_down => sub { $MENUPOPUP->popup ($_[1]) }, 2290 on_button_down => sub {
2291 my ($self, $ev) = @_;
2292 local $ev->{x} = 0;
2293 local $ev->{y} = 0;
2294 $MENUPOPUP->popup ($ev);
2295 },
2250 ); 2296 );
2251 2297
2252 $MENUBAR->add ($GAUGES->{prg} = new DC::UI::ExperienceProgress 2298 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2253 c_rescale => 1,
2254 padding_x => 6, 2299 padding_x => 6,
2255 padding_y => 3, 2300 padding_y => 3,
2256 force_w => $::WIDTH * 0.1,
2257 tooltip => "This progress bar shows your progress towards the next character level.", 2301 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2302 template => " Exp: 888,888,888,888 (lvl 188) ",
2258 ); 2303 );
2259 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::Label 2304
2260 align => 1, can_hover => 1, can_events => 1, 2305 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2261 text => "Total Experience", 2306 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2262 tooltip => "#stat_exp", 2307 . "will automatically pick up items as defined by your item pickup settings "
2263 fontsize => 0.8, 2308 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2309 . "disable autopickup by disabling this checkbox.",
2310 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2311 on_changed => sub {
2312 my ($self, $value) = @_;
2313 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2314 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2315 $CONN->send_pickup ($CFG->{pickup})
2316 if $CONN;
2317 },
2264 ); 2318 );
2319
2265 $MENUBAR->add ($GAUGES->{sklprg} = new DC::UI::ExperienceProgress 2320 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2266 c_rescale => 1, 2321 c_rescale => 1,
2267 padding_x => 6, 2322 padding_x => 6,
2268 padding_y => 3, 2323 padding_y => 3,
2269 force_w => $::WIDTH * 0.2, 2324 force_w => $::WIDTH * 0.2,
2270 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.", 2325 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2326 template => "two handed weapons 99%",
2271 ); 2327 );
2328
2272 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label 2329 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2273 expand => 1, 2330 expand => 1,
2274 align => 1, can_hover => 1, can_events => 1, 2331 align => 1, can_hover => 1, can_events => 1,
2275 text => "Range and Combat Slots", 2332 text => "Range and Combat Slots",
2276 tooltip => "#stat_ranged", 2333 tooltip => "#stat_ranged",
… …
2462 2519
2463 DC::UI::Toplevel->new ( 2520 DC::UI::Toplevel->new (
2464 title => "Minimap", 2521 title => "Minimap",
2465 name => "mapmap", 2522 name => "mapmap",
2466 x => 0, 2523 x => 0,
2467 y => $FONTSIZE + 8, 2524 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2468 border_bg => [1, 1, 1, 192/255], 2525 border_bg => [1, 1, 1, 192/255],
2469 bg => [1, 1, 1, 0], 2526 bg => [1, 1, 1, 0],
2470 child => ($MAPMAP = new DC::MapWidget::MapMap 2527 child => ($MAPMAP = new DC::MapWidget::MapMap
2471 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2528 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2472 ), 2529 ),
… …
2501 $METASERVER = metaserver_dialog; 2558 $METASERVER = metaserver_dialog;
2502 # the name is changed to not conflict with the older name as users could have hidden it 2559 # the name is changed to not conflict with the older name as users could have hidden it
2503 $MESSAGE_WINDOW = new DC::UI::Dockbar 2560 $MESSAGE_WINDOW = new DC::UI::Dockbar
2504 name => "message_window2", 2561 name => "message_window2",
2505 title => 'Messages', 2562 title => 'Messages',
2563 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2506 force_w => $::WIDTH * 0.6, 2564 force_w => $::WIDTH * 0.6,
2507 force_h => $::HEIGHT * 0.25, 2565 force_h => $::HEIGHT * 0.25,
2508 ; 2566 ;
2509 2567
2510 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2568 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2530 . "After pressing the combo the binding will be saved automatically and the " 2588 . "After pressing the combo the binding will be saved automatically and the "
2531 . "binding editor closes"); 2589 . "binding editor closes");
2532 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2590 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2533 "Some debuggin' options. Do not ask."); 2591 "Some debuggin' options. Do not ask.");
2534 2592
2593 make_help_window;
2535 make_menuframe; 2594 make_menubar;
2536 2595
2537 $SETUP_DIALOG->show; 2596 $SETUP_DIALOG->show;
2538 $MESSAGE_WINDOW->show; 2597 $MESSAGE_WINDOW->show;
2539 } 2598 }
2540 2599
2541 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2600 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2542 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2601 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2543 2602
2544 $CAVEAT_LABEL->set_text ("None :)"); 2603 $CAVEAT_LABEL->set_text ("None :)");
2604 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2605 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2545 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2606 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2546 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2607 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2547 2608
2548 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2609 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2549} 2610}
… …
2577my $want_refresh = EV::prepare_ns \&force_refresh; 2638my $want_refresh = EV::prepare_ns \&force_refresh;
2578 2639
2579my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2640my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2580 $NOW = EV::now; 2641 $NOW = EV::now;
2581 2642
2582 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2643 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2583 for DC::poll_events; 2644 for DC::poll_events;
2584 2645
2585 if (%animate_object) { 2646 if (%animate_object) {
2586 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2647 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2587 $WANT_REFRESH = 1; 2648 $WANT_REFRESH = 1;
… …
2599sub animation_stop { 2660sub animation_stop {
2600 my ($widget) = @_; 2661 my ($widget) = @_;
2601 delete $animate_object{$widget}; 2662 delete $animate_object{$widget};
2602} 2663}
2603 2664
2604%SDL_CB = (
2605 DC::SDL_QUIT => sub { 2665$SDL_CB[DC::SDL_QUIT] = sub {
2606 crash "SDL_QUIT"; 2666 crash "SDL_QUIT";
2607 EV::unloop EV::UNLOOP_ALL; 2667 EV::unloop EV::UNLOOP_ALL;
2608 }, 2668};
2609 DC::SDL_VIDEORESIZE => sub { 2669$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2610 },
2611 DC::SDL_VIDEOEXPOSE => sub { 2670$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2612 DC::UI::full_refresh; 2671 DC::UI::full_refresh;
2613 }, 2672};
2614 DC::SDL_ACTIVEEVENT => sub { 2673$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2615# not useful, as APPACTIVE includes only iconified state, not unmapped 2674# not useful, as APPACTIVE includes only iconified state, not unmapped
2616# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2675# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2617# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2676# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2618# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2677# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2619# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2678# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2620# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2679# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2621 }, 2680};
2622 DC::SDL_KEYDOWN => sub { 2681$SDL_CB[DC::SDL_KEYDOWN] = sub {
2623 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2682 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2624 # alt-enter 2683 # alt-enter
2625 video_shutdown; 2684 video_shutdown;
2626 $FULLSCREEN_ENABLE->toggle; 2685 $FULLSCREEN_ENABLE->toggle;
2627 video_init; 2686 video_init;
2628 } else { 2687 } else {
2629 &DC::UI::feed_sdl_key_down_event; 2688 &DC::UI::feed_sdl_key_down_event;
2630 } 2689 }
2631 update_modbox; 2690 update_modbox;
2632 }, 2691};
2633 DC::SDL_KEYUP => sub { 2692$SDL_CB[DC::SDL_KEYUP] = sub {
2634 &DC::UI::feed_sdl_key_up_event; 2693 &DC::UI::feed_sdl_key_up_event;
2635 update_modbox; 2694 update_modbox;
2636 }, 2695};
2637 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2696$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2638 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2697$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2639 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2698$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2640 DC::SDL_USEREVENT => sub { 2699$SDL_CB[DC::SDL_USEREVENT] = sub {
2641 if ($_[0]{code} == 1) { 2700 if ($_[0]{code} == 1) {
2642 audio_channel_finished $_[0]{data1}; 2701 audio_channel_finished $_[0]{data1};
2643 } elsif ($_[0]{code} == 0) { 2702 } elsif ($_[0]{code} == 0) {
2644 audio_music_finished; 2703 audio_music_finished;
2645 }
2646 }, 2704 }
2647); 2705};
2648 2706
2649############################################################################# 2707#############################################################################
2650 2708
2651$SIG{INT} = $SIG{TERM} = sub { 2709$SIG{INT} = $SIG{TERM} = sub {
2652 EV::unloop; 2710 EV::unloop;
… …
2685 fullscreen => 1, 2743 fullscreen => 1,
2686 fast => 0, 2744 fast => 0,
2687 force_opengl11 => undef, 2745 force_opengl11 => undef,
2688 disable_alpha => 0, 2746 disable_alpha => 0,
2689 smooth_movement => 1, 2747 smooth_movement => 1,
2748 smooth_transitions => 1,
2690 texture_compression => 1, 2749 texture_compression => 1,
2691 map_scale => 1, 2750 map_scale => 1,
2692 fow_enable => 1, 2751 fow_enable => 1,
2693 fow_intensity => 0, 2752 fow_intensity => 0,
2753 fow_texture => 0,
2694 map_smoothing => 1, 2754 map_smoothing => 1,
2695 gui_fontsize => 1, 2755 gui_fontsize => 1,
2696 log_fontsize => 0.7, 2756 log_fontsize => 0.7,
2697 gauge_fontsize => 1, 2757 gauge_fontsize => 1,
2698 gauge_size => 0.35, 2758 gauge_size => 0.35,
… …
2706 effects_enable => 1, 2766 effects_enable => 1,
2707 effects_volume => 1, 2767 effects_volume => 1,
2708 bgm_enable => 1, 2768 bgm_enable => 1,
2709 bgm_volume => 0.5, 2769 bgm_volume => 0.5,
2710 output_rate => "", 2770 output_rate => "",
2711 pickup => 0, 2771 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2712 inv_sort => "mtime", 2772 inv_sort => "mtime",
2713 default => "profile", # default profile 2773 default => "profile", # default profile
2714 show_tips => 1, 2774 show_tips => 1,
2715 logview_max_par => 1000, 2775 logview_max_par => 1000,
2716 shift_fire_stop => 0, 2776 shift_fire_stop => 0,
2717 uitheme => "wood", 2777 uitheme => "wood",
2778 map_shift_x => -24, # arbitrary
2779 map_shift_y => +24, # arbitrary
2718 ); 2780 );
2719 2781
2720 while (my ($k, $v) = each %DEF_CFG) { 2782 while (my ($k, $v) = each %DEF_CFG) {
2721 $CFG->{$k} = $v unless exists $CFG->{$k}; 2783 $CFG->{$k} = $v unless exists $CFG->{$k};
2722 } 2784 }
… …
2736 } 2798 }
2737 } 2799 }
2738 2800
2739 sdl_init; 2801 sdl_init;
2740 2802
2803 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2804 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2805
2741 { 2806 {
2742 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2807 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2743 DejaVuSans.ttf 2808 DejaVuSans.ttf
2744 DejaVuSansMono.ttf 2809 DejaVuSansMono.ttf
2745 DejaVuSans-Bold.ttf 2810 DejaVuSans-Bold.ttf
2746 DejaVuSansMono-Bold.ttf 2811 DejaVuSansMono-Bold.ttf
2747 DejaVuSans-Oblique.ttf 2812 DejaVuSans-Oblique.ttf
2748 DejaVuSansMono-Oblique.ttf 2813 DejaVuSansMono-Oblique.ttf
2749 DejaVuSans-BoldOblique.ttf 2814 DejaVuSans-BoldOblique.ttf
2750 DejaVuSansMono-BoldOblique.ttf 2815 DejaVuSansMono-BoldOblique.ttf
2816 mona.ttf
2751 ); 2817 );
2752 2818
2753 DC::add_font $_ for @fonts; 2819 DC::add_font $_ for @fonts;
2754 2820
2755 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2821 $FONT_PROP = new_from_file DC::Font $fonts[0];

Diff Legend

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