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.89 by root, Mon Jan 12 03:11:05 2009 UTC vs.
Revision 1.90 by root, Mon Jan 12 03:49:35 2009 UTC

… …
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;
… …
2258 ); 2258 );
2259 2259
2260 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress 2260 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2261 padding_x => 6, 2261 padding_x => 6,
2262 padding_y => 3, 2262 padding_y => 3,
2263 tooltip => "This progress bar shows your progress towards the next character level.", 2263 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2264 template => " Exp: 888,888,888,888 (lvl 188) ", 2264 template => " Exp: 888,888,888,888 (lvl 188) ",
2265 ); 2265 );
2266 2266
2267 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better? 2267 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2268 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character " 2268 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
… …
2597my $want_refresh = EV::prepare_ns \&force_refresh; 2597my $want_refresh = EV::prepare_ns \&force_refresh;
2598 2598
2599my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2599my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2600 $NOW = EV::now; 2600 $NOW = EV::now;
2601 2601
2602 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2602 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2603 for DC::poll_events; 2603 for DC::poll_events;
2604 2604
2605 if (%animate_object) { 2605 if (%animate_object) {
2606 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2606 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2607 $WANT_REFRESH = 1; 2607 $WANT_REFRESH = 1;
… …
2619sub animation_stop { 2619sub animation_stop {
2620 my ($widget) = @_; 2620 my ($widget) = @_;
2621 delete $animate_object{$widget}; 2621 delete $animate_object{$widget};
2622} 2622}
2623 2623
2624%SDL_CB = (
2625 DC::SDL_QUIT => sub { 2624$SDL_CB[DC::SDL_QUIT] = sub {
2626 crash "SDL_QUIT"; 2625 crash "SDL_QUIT";
2627 EV::unloop EV::UNLOOP_ALL; 2626 EV::unloop EV::UNLOOP_ALL;
2628 }, 2627};
2629 DC::SDL_VIDEORESIZE => sub { 2628$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2630 },
2631 DC::SDL_VIDEOEXPOSE => sub { 2629$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2632 DC::UI::full_refresh; 2630 DC::UI::full_refresh;
2633 }, 2631};
2634 DC::SDL_ACTIVEEVENT => sub { 2632$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2635# not useful, as APPACTIVE includes only iconified state, not unmapped 2633# not useful, as APPACTIVE includes only iconified state, not unmapped
2636# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2634# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2637# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2635# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2638# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2636# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2639# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2637# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2640# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2638# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2641 }, 2639};
2642 DC::SDL_KEYDOWN => sub { 2640$SDL_CB[DC::SDL_KEYDOWN] = sub {
2643 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2641 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2644 # alt-enter 2642 # alt-enter
2645 video_shutdown; 2643 video_shutdown;
2646 $FULLSCREEN_ENABLE->toggle; 2644 $FULLSCREEN_ENABLE->toggle;
2647 video_init; 2645 video_init;
2648 } else { 2646 } else {
2649 &DC::UI::feed_sdl_key_down_event; 2647 &DC::UI::feed_sdl_key_down_event;
2650 } 2648 }
2651 update_modbox; 2649 update_modbox;
2652 }, 2650};
2653 DC::SDL_KEYUP => sub { 2651$SDL_CB[DC::SDL_KEYUP] = sub {
2654 &DC::UI::feed_sdl_key_up_event; 2652 &DC::UI::feed_sdl_key_up_event;
2655 update_modbox; 2653 update_modbox;
2656 }, 2654};
2657 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2655$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2658 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2656$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2659 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2657$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2660 DC::SDL_USEREVENT => sub { 2658$SDL_CB[DC::SDL_USEREVENT] = sub {
2661 if ($_[0]{code} == 1) { 2659 if ($_[0]{code} == 1) {
2662 audio_channel_finished $_[0]{data1}; 2660 audio_channel_finished $_[0]{data1};
2663 } elsif ($_[0]{code} == 0) { 2661 } elsif ($_[0]{code} == 0) {
2664 audio_music_finished; 2662 audio_music_finished;
2665 }
2666 }, 2663 }
2667); 2664};
2668 2665
2669############################################################################# 2666#############################################################################
2670 2667
2671$SIG{INT} = $SIG{TERM} = sub { 2668$SIG{INT} = $SIG{TERM} = sub {
2672 EV::unloop; 2669 EV::unloop;

Diff Legend

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