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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.219 by root, Tue Aug 21 00:59:34 2007 UTC vs.
Revision 1.227 by root, Sun Sep 2 09:48:42 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3# do splash-screen thingy on win32
3my $startup_done = sub { }; 4my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN { 5BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") { 6 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) { 7 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 8 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 } 9 }
… …
30# do things only needed for single-binary version (par) 28# do things only needed for single-binary version (par)
31BEGIN { 29BEGIN {
32 if (%PAR::LibCache) { 30 if (%PAR::LibCache) {
33 @INC = grep ref, @INC; # weed out all paths except pars loader refs 31 @INC = grep ref, @INC; # weed out all paths except pars loader refs
34 32
35 my $tmp = $ENV{PAR_TEMP}; 33 my $root = $ENV{PAR_TEMP};
36 34
37 while (my ($filename, $zip) = each %PAR::LibCache) { 35 while (my ($filename, $zip) = each %PAR::LibCache) {
38 for ($zip->memberNames) { 36 for ($zip->memberNames) {
39 next unless /^root\/(.*)/; 37 next unless /^root\/(.*)/;
40 $zip->extractMember ($_, "$tmp/$1") 38 $zip->extractMember ($_, "$root/$1")
41 unless -e "$tmp/$1"; 39 unless -e "$root/$1";
42 } 40 }
43 } 41 }
44 42
45 if ($^O eq "MSWin32") { 43 if ($^O eq "MSWin32") {
46 # relocatable 44 # pango is relocatable on win32
47 } else { 45 } else {
46 open my $fh, "<:perlio", "$root/pangoversion"
47 or die "pangoversion: $!";
48 my $PANGO = <$fh>;
48 # unix, need to patch pango rc file 49 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 50 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!"; 51 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/; 52 local $/;
52 my $rc = <$fh>; 53 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones 54 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
54 55
55 mkdir "$tmp/pango-modules"; 56 mkdir "$root/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules" 57 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!"; 58 or die "$root/pango-modules/pango.modules: $!";
58 print $fh $rc; 59 print $fh $rc;
59 60
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!"; 63 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n"; 64 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
64 } 65 }
65 66
66 unshift @INC, $tmp; 67 unshift @INC, $root;
67 } 68 }
68} 69}
69 70
70# need to do it again because that pile of garbage called PAR nukes it before main 71# need to do it again because that pile of garbage called PAR nukes it before main
71unshift @INC, $ENV{PAR_TEMP} 72unshift @INC, $ENV{PAR_TEMP}
… …
86use CFPlus::DB; 87use CFPlus::DB;
87use CFPlus::UI; 88use CFPlus::UI;
88use CFPlus::UI::Canvas; 89use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory; 90use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList; 91use CFPlus::UI::SpellList;
92use CFPlus::UI::Dockable;
91use CFPlus::UI::MessageWindow; 93use CFPlus::UI::MessageWindow;
94use CFPlus::UI::ChatView;
92use CFPlus::Pod; 95use CFPlus::Pod;
93use CFPlus::MapWidget; 96use CFPlus::MapWidget;
94use CFPlus::Macro; 97use CFPlus::Macro;
95 98
96$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
126our $FONT_FIXED; 129our $FONT_FIXED;
127 130
128our $MAP; 131our $MAP;
129our $MAPMAP; 132our $MAPMAP;
130our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
131our $BUTTONBAR; 135our $BUTTONBAR;
132our $METASERVER; 136our $METASERVER;
133our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
134our $QUIT_DIALOG; 138our $QUIT_DIALOG;
135our $HOST_ENTRY; 139our $HOST_ENTRY;
… …
146our $PL_WINDOW; 150our $PL_WINDOW;
147 151
148our $MUSIC_PLAYING_WIDGET; 152our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET; 153our $LICENSE_WIDGET;
150 154
155our $PICKUP_PAGE;
151our $INVENTORY_PAGE; 156our $INVENTORY_PAGE;
152our $STATS_PAGE; 157our $STATS_PAGE;
153our $SKILL_PAGE; 158our $SKILL_PAGE;
154our $SPELL_PAGE; 159our $SPELL_PAGE;
155our $SPELL_LIST; 160our $SPELL_LIST;
… …
180sub debug { 185sub debug {
181 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
182} 187}
183 188
184sub message { 189sub message {
185 my ($para) = @_;
186 $MESSAGE_WINDOW->message ($para); 190 $MESSAGE_WINDOW->message (@_);
187} 191}
188 192
189############################################################################# 193#############################################################################
190#TODO: maybe move into own audio module... 194#TODO: maybe move into own audio module...
191 195
… …
313 317
314 my $NOW = time; 318 my $NOW = time;
315 319
316 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 320 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
317 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 321 my $pos = $MUSIC_PLAYING_META->{stop_pos};
318 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos); 322 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
319 $MUSIC_START = time - $pos; 323 $MUSIC_START = time - $pos;
320 } else { 324 } else {
321 $MUSIC_PLAYER->play (0); 325 $MUSIC_PLAYER->play (0);
322 $MUSIC_START = time; 326 $MUSIC_START = time;
323 } 327 }
… …
341 my @have = 345 my @have =
342 grep $_ && $_->{data}, 346 grep $_ && $_->{data},
343 map $CONN->{face}[$_], 347 map $CONN->{face}[$_],
344 @$MUSIC_WANT; 348 @$MUSIC_WANT;
345 349
350 # randomize music a bit so that the order is not always the same
351 $_->{stop_time} ||= rand for @have;
352
346 @MUSIC_HAVE = @have 353 @MUSIC_HAVE = @have
347 if @have; 354 if @have;
348 355
349 # default MUSIC_HAVE == MUSIC_DEFAULT 356 # default MUSIC_HAVE == MUSIC_DEFAULT
350 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 357 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
351 $fade_out = 1000; 358 $fade_out = 700;
352 } 359 }
353 360
354 # if the currently playing song is acceptable, let it continue 361 # if the currently playing song is acceptable, let it continue
355 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 362 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
356 363
… …
365 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 372 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
366 373
367 # if the most recently-played piece played very recently, 374 # if the most recently-played piece played very recently,
368 # resume it, else choose the oldest piece for rotation. 375 # resume it, else choose the oldest piece for rotation.
369 audio_music_set_meta 376 audio_music_set_meta
370 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 377 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
371 ? $MUSIC_HAVE[-1] 378 ? $MUSIC_HAVE[-1]
372 : $MUSIC_HAVE[0]; 379 : $MUSIC_HAVE[0];
373 380
374 audio_music_start; 381 audio_music_start;
375 } 382 }
… …
381 $MUSIC_WANT = $songs; 388 $MUSIC_WANT = $songs;
382 audio_music_push; 389 audio_music_push;
383} 390}
384 391
385sub audio_music_finished { 392sub audio_music_finished {
393 if ($MUSIC_PLAYING_META) {
394 $MUSIC_PLAYING_META->{stop_time} = time;
395 }
396
386 # we compress multiple jingles of the same type 397 # we compress multiple jingles of the same type
387 shift @MUSIC_JINGLE 398 shift @MUSIC_JINGLE
388 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 399 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
389 400
390 $MUSIC_PLAYING_WIDGET->clear; 401 $MUSIC_PLAYING_WIDGET->clear;
… …
984 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 995 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
985 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 996 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
986 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 997 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
987 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 998 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
988 999
989 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1000 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1001 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1002 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
990 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1003 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
991 1004
992 $GAUGES = { 1005 $GAUGES = {
1006 exp => $exp, prg => $prg, sklprg => $sklprg,
993 exp => $exp, win => $win, range => $rng, 1007 win => $win, range => $rng,
994 food => $fg, mana => $mg, hp => $hg, grace => $gg 1008 hp => $hg, mana => $mg, grace => $gg, food => $fg,
995 }; 1009 };
996 1010
997 &set_gauge_window_fontsize; 1011 &set_gauge_window_fontsize;
998 1012
999 $win 1013 $win
… …
1200 $r 1214 $r
1201} 1215}
1202 1216
1203sub skill_window { 1217sub skill_window {
1204 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1218 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1219
1205 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1220 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1221
1206 $sw 1222 $sw
1207} 1223}
1208 1224
1209sub formsep($) { 1225sub formsep($) {
1210 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1226 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1719 $ntb->add_tab ( 1735 $ntb->add_tab (
1720 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1736 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1721 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1737 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1722 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1738 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1723 ); 1739 );
1724 $ntb->add_tab (Pickup => autopickup_setup, 1740 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1725 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1741 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1726 1742
1727 $ntb->add_tab (Media => media_window, 1743 $ntb->add_tab (Media => media_window,
1728 "License, Author and Source info for media sent by the server."); 1744 "License, Author and Source info for media sent by the server.");
1729 1745
… …
1970 1986
1971 $SDL_ACTIVE = 1; 1987 $SDL_ACTIVE = 1;
1972 $LAST_REFRESH = time - 0.01; 1988 $LAST_REFRESH = time - 0.01;
1973 1989
1974 CFPlus::OpenGL::init; 1990 CFPlus::OpenGL::init;
1991 CFPlus::Macro::init;
1975 1992
1976 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1993 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1977 1994
1978 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1995 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1979 1996
1980 ############################################################################# 1997 #############################################################################
1981 1998
1982 if ($DEBUG_STATUS) { 1999 if ($DEBUG_STATUS) {
1983 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2000 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1984 } else { 2001 } else {
1985 # create the widgets 2002 # create/configure the widgets
2003
2004 $CFPlus::UI::ROOT->connect (key_down => sub {
2005 my (undef, $ev) = @_;
2006
2007 if (my @macros = CFPlus::Macro::find $ev) {
2008 CFPlus::Macro::execute $_ for @macros;
2009
2010 return 1;
2011 }
2012
2013 0
2014 });
1986 2015
1987 $DEBUG_STATUS = new CFPlus::UI::Label 2016 $DEBUG_STATUS = new CFPlus::UI::Label
1988 padding => 0, 2017 padding => 0,
1989 z => 100, 2018 z => 100,
1990 force_x => "max", 2019 force_x => "max",
… …
2020 $MESSAGE_WINDOW->activate_console ($preset) 2049 $MESSAGE_WINDOW->activate_console ($preset)
2021 if $MESSAGE_WINDOW; 2050 if $MESSAGE_WINDOW;
2022 }); 2051 });
2023 $MAPWIDGET->show; 2052 $MAPWIDGET->show;
2024 $MAPWIDGET->grab_focus; 2053 $MAPWIDGET->grab_focus;
2054
2055 $COMPLETER = new CFPlus::MapWidget::Command::
2056 command => { },
2057 tooltip => "#completer_help",
2058 ;
2025 2059
2026 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2060 $SETUP_DIALOG = new CFPlus::UI::Toplevel
2027 title => "Setup", 2061 title => "Setup",
2028 name => "setup_dialog", 2062 name => "setup_dialog",
2029 x => 'center', 2063 x => 'center',
… …
2154 delete $animate_object{$widget}; 2188 delete $animate_object{$widget};
2155} 2189}
2156 2190
2157%SDL_CB = ( 2191%SDL_CB = (
2158 CFPlus::SDL_QUIT => sub { 2192 CFPlus::SDL_QUIT => sub {
2159 exit; 2193 Event::unloop_all;
2160 }, 2194 },
2161 CFPlus::SDL_VIDEORESIZE => sub { 2195 CFPlus::SDL_VIDEORESIZE => sub {
2162 }, 2196 },
2163 CFPlus::SDL_VIDEOEXPOSE => sub { 2197 CFPlus::SDL_VIDEOEXPOSE => sub {
2164 CFPlus::UI::full_refresh; 2198 CFPlus::UI::full_refresh;
… …
2297# } 2331# }
2298# my $t2 = Time::HiRes::time; 2332# my $t2 = Time::HiRes::time;
2299# warn $t2-$t1; 2333# warn $t2-$t1;
2300# } 2334# }
2301 2335
2302 $startup_done->();
2303
2304 video_init; 2336 video_init;
2305 audio_init; 2337 audio_init;
2306} 2338}
2307 2339
2308show_tip_of_the_day if $CFG->{show_tips}; 2340show_tip_of_the_day if $CFG->{show_tips};
2341
2342Event->idle (cb => sub {
2343 $_[0]->w->cancel;
2344 $startup_done->();
2345});
2309 2346
2310Event::loop; 2347Event::loop;
2311 2348
2312#video_shutdown; 2349#video_shutdown;
2313#audio_shutdown; 2350#audio_shutdown;

Diff Legend

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