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.205 by root, Thu Aug 9 03:40:02 2007 UTC vs.
Revision 1.224 by root, Thu Aug 30 07:57:59 2007 UTC

… …
113our $CONN; 113our $CONN;
114our $PROFILE; # current profile 114our $PROFILE; # current profile
115our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
116 116
117our $WANT_REFRESH; 117our $WANT_REFRESH;
118our $CAN_REFRESH;
119 118
120our @SDL_MODES; 119our @SDL_MODES;
121our $WIDTH; 120our $WIDTH;
122our $HEIGHT; 121our $HEIGHT;
123our $FULLSCREEN; 122our $FULLSCREEN;
… …
127our $FONT_FIXED; 126our $FONT_FIXED;
128 127
129our $MAP; 128our $MAP;
130our $MAPMAP; 129our $MAPMAP;
131our $MAPWIDGET; 130our $MAPWIDGET;
131our $COMPLETER;
132our $BUTTONBAR; 132our $BUTTONBAR;
133our $METASERVER; 133our $METASERVER;
134our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
135our $QUIT_DIALOG; 135our $QUIT_DIALOG;
136our $HOST_ENTRY; 136our $HOST_ENTRY;
… …
147our $PL_WINDOW; 147our $PL_WINDOW;
148 148
149our $MUSIC_PLAYING_WIDGET; 149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET; 150our $LICENSE_WIDGET;
151 151
152our $PICKUP_PAGE;
152our $INVENTORY_PAGE; 153our $INVENTORY_PAGE;
153our $STATS_PAGE; 154our $STATS_PAGE;
154our $SKILL_PAGE; 155our $SKILL_PAGE;
155our $SPELL_PAGE; 156our $SPELL_PAGE;
156our $SPELL_LIST; 157our $SPELL_LIST;
… …
168our $STATUSBOX; 169our $STATUSBOX;
169our $DEBUG_STATUS; 170our $DEBUG_STATUS;
170 171
171our $INV; 172our $INV;
172our $INVR; 173our $INVR;
173our $INV_RIGHT_HB; 174our $INVR_HB;
174
175our $PICKUP_CFG;
176 175
177############################################################################# 176#############################################################################
178 177
179sub status { 178sub status {
180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 179 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
217 my ($face) = @_; 216 my ($face) = @_;
218 217
219 $CFG->{effects_enable} 218 $CFG->{effects_enable}
220 or return; 219 or return;
221 220
221 $AUDIO_PLAY{$face}
222 or return;
223
222 if (my $chunk = $AUDIO_CHUNK{$face}) { 224 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 225 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_; 226 my (undef, $dx, $dy, $vol) = @$_;
225 227
226 my $channel = CFPlus::Channel::find; 228 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255); 229 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $dx = $dx / 10 * 255;
229 $channel->set_panning (255 - $dx, 255 + $dx);
230
231# my $angle = $dx ? : $dx < 0 ?
232# my $distance = -$vol;
233# $channel->set_position ($angle, $distance); 230 $channel->set_position_r ($dx, $dy, 20);
234
235 $chunk->play ($channel); 231 $chunk->play ($channel);
236 } 232 }
237 } else { 233 } else {
238 # sound_meta not set means data is in flight either way 234 # sound_meta not set means data is in flight either way
239 my $meta = $CONN->{sound_meta}{$face} 235 my $meta = $CONN->{face}[$face]
240 or return; 236 or return;
241 237
238 $meta->{data}
239 or return;
240
242 # if its a jingle, play it as ambient music 241 # if its a jingle, play it as ambient music
243 if ($meta->{meta}{jingle}) { 242 if ($meta->{data}{jingle}) {
244 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 243 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
245 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 244 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
246 &audio_music_push ($face); 245 &audio_music_push ($face);
247 } 246 }
248 } else { 247 } else {
249 # fetch from database 248 # fetch from database
250 CFPlus::DB::get res_data => $meta->{name}, sub { 249 CFPlus::DB::get res_data => $meta->{name}, sub {
251 my $rwops = new CFPlus::RW $_[0]; 250 my $rwops = new CFPlus::RW $_[0];
252 my $chunk = new CFPlus::MixChunk $rwops 251 my $chunk = new CFPlus::MixChunk $rwops
253 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError; 252 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
254 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 253 $chunk->volume (($meta->{data}{volume} || 1) * 128);
255 $AUDIO_CHUNK{$face} = $chunk; 254 $AUDIO_CHUNK{$face} = $chunk;
256 255
257 audio_sound_push ($face); 256 audio_sound_push ($face);
258 }; 257 };
259 } 258 }
… …
267 or return; 266 or return;
268 $CFG->{effects_enable} 267 $CFG->{effects_enable}
269 or return; 268 or return;
270 269
271 my $queue = $AUDIO_PLAY{$face} ||= []; 270 my $queue = $AUDIO_PLAY{$face} ||= [];
272 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 271 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
273 audio_sound_push $face 272 audio_sound_push $face
274 unless @$queue > 1; 273 unless @$queue > 1;
275} 274}
276 275
277sub audio_music_set_meta { 276sub audio_music_set_meta {
278 my ($meta) = @_; 277 my ($meta) = @_;
279 278
280 $MUSIC_PLAYING_META = $meta; 279 $MUSIC_PLAYING_META = $meta;
281 $MUSIC_PLAYING_WIDGET->set_markup ( 280 $MUSIC_PLAYING_WIDGET->set_markup (
282 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n" 281 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
283 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n" 282 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
284 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n" 283 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
285 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license}) 284 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
286 ); 285 );
287} 286}
288 287
289sub audio_music_update_volume { 288sub audio_music_update_volume {
290 return unless $MUSIC_PLAYING_META; 289 return unless $MUSIC_PLAYING_META;
291 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 290 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
292 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume}; 291 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
293 CFPlus::MixMusic::volume $base * $volume * 128; 292 CFPlus::MixMusic::volume $base * $volume * 128;
294} 293}
295 294
296sub audio_music_start { 295sub audio_music_start {
297 my $meta = $MUSIC_PLAYING_META; 296 my $meta = $MUSIC_PLAYING_META;
… …
316 315
317 my $NOW = time; 316 my $NOW = time;
318 317
319 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 318 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
320 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 319 my $pos = $MUSIC_PLAYING_META->{stop_pos};
321 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos); 320 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
322 $MUSIC_START = time - $pos; 321 $MUSIC_START = time - $pos;
323 } else { 322 } else {
324 $MUSIC_PLAYER->play (0); 323 $MUSIC_PLAYER->play (0);
325 $MUSIC_START = time; 324 $MUSIC_START = time;
326 } 325 }
… …
340 $fade_out = 333; 339 $fade_out = 333;
341 } else { 340 } else {
342 return unless $CFG->{bgm_enable}; 341 return unless $CFG->{bgm_enable};
343 342
344 my @have = 343 my @have =
345 grep $_, 344 grep $_ && $_->{data},
346 map $CONN->{music_meta}{$_}, 345 map $CONN->{face}[$_],
347 @$MUSIC_WANT; 346 @$MUSIC_WANT;
347
348 # randomize music a bit so that the order is not always the same
349 $_->{stop_time} ||= rand for @have;
348 350
349 @MUSIC_HAVE = @have 351 @MUSIC_HAVE = @have
350 if @have; 352 if @have;
351 353
352 # default MUSIC_HAVE == MUSIC_DEFAULT 354 # default MUSIC_HAVE == MUSIC_DEFAULT
353 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 355 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
354 $fade_out = 1000; 356 $fade_out = 700;
355 } 357 }
356 358
357 # if the currently playing song is acceptable, let it continue 359 # if the currently playing song is acceptable, let it continue
358 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 360 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
359 361
… …
368 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 370 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
369 371
370 # if the most recently-played piece played very recently, 372 # if the most recently-played piece played very recently,
371 # resume it, else choose the oldest piece for rotation. 373 # resume it, else choose the oldest piece for rotation.
372 audio_music_set_meta 374 audio_music_set_meta
373 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 375 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
374 ? $MUSIC_HAVE[-1] 376 ? $MUSIC_HAVE[-1]
375 : $MUSIC_HAVE[0]; 377 : $MUSIC_HAVE[0];
376 378
377 audio_music_start; 379 audio_music_start;
378 } 380 }
… …
384 $MUSIC_WANT = $songs; 386 $MUSIC_WANT = $songs;
385 audio_music_push; 387 audio_music_push;
386} 388}
387 389
388sub audio_music_finished { 390sub audio_music_finished {
391 if ($MUSIC_PLAYING_META) {
392 $MUSIC_PLAYING_META->{stop_time} = time;
393 }
394
389 # we compress multiple jingles of the same type 395 # we compress multiple jingles of the same type
390 shift @MUSIC_JINGLE 396 shift @MUSIC_JINGLE
391 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 397 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
392 398
393 $MUSIC_PLAYING_WIDGET->clear; 399 $MUSIC_PLAYING_WIDGET->clear;
… …
773 state => $CFG->{fullscreen}, 779 state => $CFG->{fullscreen},
774 tooltip => "Bring the client into fullscreen mode.", 780 tooltip => "Bring the client into fullscreen mode.",
775 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 781 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
776 ); 782 );
777 783
784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
786 state => $CFG->{force_opengl11},
787 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
788 . "higher memory usage and slower performance. It will, however, help tremendously on "
789 . "cards that claim to support a feature but fall back to software rendering. "
790 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
791 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
792 . "experience extremely low framerates and your card should do better, try this option.</b>",
793 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
794 );
795
796 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
797 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
798 state => $CFG->{texture_compression},
799 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
800 . "will save a lot of memory and increase performance. The compression algorithm "
801 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
802 . "forced OpenGL 1.1 mode.",
803 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
804 );
805
778 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 806 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
779 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 807 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
780 state => $CFG->{fast}, 808 state => $CFG->{fast},
781 tooltip => "Lower the visual quality considerably to speed up rendering.", 809 tooltip => "Lower the visual quality considerably to speed up rendering.",
782 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 810 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
808 836
809 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 837 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
810 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
811 state => $CFG->{map_smoothing}, 839 state => $CFG->{map_smoothing},
812 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 840 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
813 . "This increases load on the graphics subsystem and works only with 2.x servers. " 841 . "This increases load on the graphics subsystem and works only with TRT servers. "
814 . "Changes take effect at next connection only.", 842 . "Changes take effect at next login only.",
815 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 843 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
816 ); 844 );
817 845
818 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 846 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
819 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 847 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
830 ); 858 );
831 859
832 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 860 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
833 $table->add_at (1, $row++, new CFPlus::UI::Slider 861 $table->add_at (1, $row++, new CFPlus::UI::Slider
834 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 862 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
835 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 863 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
864 . "but you still need to press apply to correctly re-layout the widget.",
836 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 865 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
837 ); 866 );
838 867
839 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 868 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
840 $table->add_at (1, $row++, new CFPlus::UI::Slider 869 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
901 expand => 1, state => $CFG->{bgm_enable}, 930 expand => 1, state => $CFG->{bgm_enable},
902 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 931 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
903 on_changed => sub { 932 on_changed => sub {
904 $CFG->{bgm_enable} = $_[1]; 933 $CFG->{bgm_enable} = $_[1];
905 $CONN->update_fx_want if $CONN; 934 $CONN->update_fx_want if $CONN;
935 audio_music_push;
906 0 936 0
907 } 937 }
908 ); 938 );
909 $table->add_at (2, $row++, new CFPlus::UI::Slider 939 $table->add_at (2, $row++, new CFPlus::UI::Slider
910 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 940 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
… …
963 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 993 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
964 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 994 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
965 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 995 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
966 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 996 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
967 997
968 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 998 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
999 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1000 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
969 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1001 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
970 1002
971 $GAUGES = { 1003 $GAUGES = {
1004 exp => $exp, prg => $prg, sklprg => $sklprg,
972 exp => $exp, win => $win, range => $rng, 1005 win => $win, range => $rng,
973 food => $fg, mana => $mg, hp => $hg, grace => $gg 1006 hp => $hg, mana => $mg, grace => $gg, food => $fg,
974 }; 1007 };
975 1008
976 &set_gauge_window_fontsize; 1009 &set_gauge_window_fontsize;
977 1010
978 $win 1011 $win
… …
1179 $r 1212 $r
1180} 1213}
1181 1214
1182sub skill_window { 1215sub skill_window {
1183 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1216 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1217
1184 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1218 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1219
1185 $sw 1220 $sw
1186} 1221}
1187 1222
1188sub formsep($) { 1223sub formsep($) {
1189 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1224 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1601 $sw1->add ($INV = new CFPlus::UI::Inventory); 1636 $sw1->add ($INV = new CFPlus::UI::Inventory);
1602 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1637 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1603 1638
1604 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1639 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1605 1640
1606 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1641 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1607 1642
1608 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1643 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1609 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1644 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1610 1645
1611 # XXX: Call after $INVR = ... because set_opencont sets the items 1646 # XXX: Call after $INVR = ... because set_opencont sets the items
… …
1634} 1669}
1635 1670
1636sub add_license { 1671sub add_license {
1637 my ($meta) = @_; 1672 my ($meta) = @_;
1638 1673
1639 $meta = $meta->{meta} 1674 $meta = $meta->{data}
1640 or return; 1675 or return;
1641 1676
1642 $meta->{license} || $meta->{author} || $meta->{source} 1677 $meta->{license} || $meta->{author} || $meta->{source}
1643 or return; 1678 or return;
1644 1679
… …
1698 $ntb->add_tab ( 1733 $ntb->add_tab (
1699 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1734 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1700 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1735 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1701 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1736 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1702 ); 1737 );
1703 $ntb->add_tab (Pickup => autopickup_setup, 1738 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1704 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1739 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1705 1740
1706 $ntb->add_tab (Media => media_window, 1741 $ntb->add_tab (Media => media_window,
1707 "License, Author and Source info for media sent by the server."); 1742 "License, Author and Source info for media sent by the server.");
1708 1743
… …
1866 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1901 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1867 ); 1902 );
1868 $hb->add (new CFPlus::UI::Button 1903 $hb->add (new CFPlus::UI::Button
1869 text => "Quit anyway", 1904 text => "Quit anyway",
1870 expand => 1, 1905 expand => 1,
1871 on_activate => sub { exit }, 1906 on_activate => sub { Event::unloop_all },
1872 ); 1907 );
1873 } 1908 }
1874 1909
1875 $QUIT_DIALOG->show; 1910 $QUIT_DIALOG->show;
1876 $QUIT_DIALOG->grab_focus; 1911 $QUIT_DIALOG->grab_focus;
… …
1949 1984
1950 $SDL_ACTIVE = 1; 1985 $SDL_ACTIVE = 1;
1951 $LAST_REFRESH = time - 0.01; 1986 $LAST_REFRESH = time - 0.01;
1952 1987
1953 CFPlus::OpenGL::init; 1988 CFPlus::OpenGL::init;
1989 CFPlus::Macro::init;
1954 1990
1955 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1991 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1956 1992
1957 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1993 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1958 1994
1959 ############################################################################# 1995 #############################################################################
1960 1996
1961 if ($DEBUG_STATUS) { 1997 if ($DEBUG_STATUS) {
1962 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1998 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1963 } else { 1999 } else {
1964 # create the widgets 2000 # create/configure the widgets
2001
2002 $CFPlus::UI::ROOT->connect (key_down => sub {
2003 my (undef, $ev) = @_;
2004
2005 if (my @macros = CFPlus::Macro::find $ev) {
2006 CFPlus::Macro::execute $_ for @macros;
2007
2008 return 1;
2009 }
2010
2011 0
2012 });
1965 2013
1966 $DEBUG_STATUS = new CFPlus::UI::Label 2014 $DEBUG_STATUS = new CFPlus::UI::Label
1967 padding => 0, 2015 padding => 0,
1968 z => 100, 2016 z => 100,
1969 force_x => "max", 2017 force_x => "max",
… …
1999 $MESSAGE_WINDOW->activate_console ($preset) 2047 $MESSAGE_WINDOW->activate_console ($preset)
2000 if $MESSAGE_WINDOW; 2048 if $MESSAGE_WINDOW;
2001 }); 2049 });
2002 $MAPWIDGET->show; 2050 $MAPWIDGET->show;
2003 $MAPWIDGET->grab_focus; 2051 $MAPWIDGET->grab_focus;
2052
2053 $COMPLETER = new CFPlus::MapWidget::Command::
2054 command => { },
2055 tooltip => "#completer_help",
2056 ;
2004 2057
2005 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2058 $SETUP_DIALOG = new CFPlus::UI::Toplevel
2006 title => "Setup", 2059 title => "Setup",
2007 name => "setup_dialog", 2060 name => "setup_dialog",
2008 x => 'center', 2061 x => 'center',
… …
2070 tooltip => "Terminates the program", 2123 tooltip => "Terminates the program",
2071 on_activate => sub { 2124 on_activate => sub {
2072 if ($CONN) { 2125 if ($CONN) {
2073 open_quit_dialog; 2126 open_quit_dialog;
2074 } else { 2127 } else {
2075 exit; 2128 Event::unloop_all;
2076 } 2129 }
2077 0 2130 0
2078 }, 2131 },
2079 ); 2132 );
2080 2133
2081 $BUTTONBAR->show; 2134 $BUTTONBAR->show;
2082 $SETUP_DIALOG->show; 2135 $SETUP_DIALOG->show;
2136 $MESSAGE_WINDOW->show;
2083 } 2137 }
2084 2138
2085 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2139 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2086} 2140}
2087 2141
… …
2095my $animate_timer; 2149my $animate_timer;
2096 2150
2097my $fps = 9; 2151my $fps = 9;
2098 2152
2099sub force_refresh { 2153sub force_refresh {
2154 if ($ENV{CFPLUS_DEBUG} & 4) {
2100 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2155 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2101 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2156 debug sprintf "%3.2f", $fps;
2157 }
2102 2158
2103 $CFPlus::UI::ROOT->draw; 2159 $CFPlus::UI::ROOT->draw;
2104 2160 CFPlus::SDL_GL_SwapBuffers;
2105 $WANT_REFRESH = 0;
2106 $CAN_REFRESH = 0;
2107 $LAST_REFRESH = $NOW; 2161 $LAST_REFRESH = $NOW;
2108 2162 $WANT_REFRESH->stop;
2109 CFPlus::SDL_GL_SwapBuffers;
2110} 2163}
2111 2164
2165$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2166
2112my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2167my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2113 $NOW = time; 2168 $NOW = time;
2114 2169
2115 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2170 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2116 for CFPlus::poll_events; 2171 for CFPlus::poll_events;
2117 2172
2118 if (%animate_object) { 2173 if (%animate_object) {
2119 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2174 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2120 ++$WANT_REFRESH; 2175 $WANT_REFRESH->start;
2121 }
2122
2123 if ($WANT_REFRESH) {
2124 force_refresh;
2125 } else {
2126 $CAN_REFRESH = 1;
2127 } 2176 }
2128}); 2177});
2129 2178
2130sub animation_start { 2179sub animation_start {
2131 my ($widget) = @_; 2180 my ($widget) = @_;
… …
2137 delete $animate_object{$widget}; 2186 delete $animate_object{$widget};
2138} 2187}
2139 2188
2140%SDL_CB = ( 2189%SDL_CB = (
2141 CFPlus::SDL_QUIT => sub { 2190 CFPlus::SDL_QUIT => sub {
2142 exit; 2191 Event::unloop_all;
2143 }, 2192 },
2144 CFPlus::SDL_VIDEORESIZE => sub { 2193 CFPlus::SDL_VIDEORESIZE => sub {
2145 }, 2194 },
2146 CFPlus::SDL_VIDEOEXPOSE => sub { 2195 CFPlus::SDL_VIDEOEXPOSE => sub {
2147 CFPlus::UI::full_refresh; 2196 CFPlus::UI::full_refresh;
… …
2186 CFPlus::DB::Server::run; 2235 CFPlus::DB::Server::run;
2187 2236
2188 CFPlus::UI::set_layout ($::CFG->{layout}); 2237 CFPlus::UI::set_layout ($::CFG->{layout});
2189 2238
2190 my %DEF_CFG = ( 2239 my %DEF_CFG = (
2191 sdl_mode => 0, 2240 sdl_mode => 0,
2192 fullscreen => 0, 2241 fullscreen => 0,
2193 fast => 0, 2242 fast => 0,
2243 force_opengl11 => undef,
2244 texture_compression => 1,
2194 map_scale => 1, 2245 map_scale => 1,
2195 fow_enable => 1, 2246 fow_enable => 1,
2196 fow_intensity => 0, 2247 fow_intensity => 0,
2197 map_smoothing => 1, 2248 map_smoothing => 1,
2198 gui_fontsize => 1, 2249 gui_fontsize => 1,
2199 log_fontsize => 0.7, 2250 log_fontsize => 0.7,
2200 gauge_fontsize => 1, 2251 gauge_fontsize => 1,
2201 gauge_size => 0.35, 2252 gauge_size => 0.35,
2202 stat_fontsize => 0.7, 2253 stat_fontsize => 0.7,
2203 mapsize => 100, 2254 mapsize => 100,
2204 audio_enable => 1, 2255 audio_enable => 1,
2205 effects_enable => 1, 2256 effects_enable => 1,
2206 effects_volume => 1, 2257 effects_volume => 1,
2207 bgm_enable => 1, 2258 bgm_enable => 1,
2208 bgm_volume => 0.5, 2259 bgm_volume => 0.5,
2209 output_sync => 1, 2260 output_sync => 1,
2210 output_count => 1, 2261 output_count => 1,
2211 output_rate => "", 2262 output_rate => "",
2212 pickup => 0, 2263 pickup => 0,
2213 inv_sort => "mtime", 2264 inv_sort => "mtime",
2214 default => "profile", # default profile 2265 default => "profile", # default profile
2215 show_tips => 1, 2266 show_tips => 1,
2216 logview_max_par => 1000, 2267 logview_max_par => 1000,
2217 ); 2268 );
2218 2269
2219 while (my ($k, $v) = each %DEF_CFG) { 2270 while (my ($k, $v) = each %DEF_CFG) {
2220 $CFG->{$k} = $v unless exists $CFG->{$k}; 2271 $CFG->{$k} = $v unless exists $CFG->{$k};
2221 } 2272 }
… …
2278# } 2329# }
2279# my $t2 = Time::HiRes::time; 2330# my $t2 = Time::HiRes::time;
2280# warn $t2-$t1; 2331# warn $t2-$t1;
2281# } 2332# }
2282 2333
2283 $startup_done->();
2284
2285 video_init; 2334 video_init;
2286 audio_init; 2335 audio_init;
2287} 2336}
2288 2337
2289show_tip_of_the_day if $CFG->{show_tips}; 2338show_tip_of_the_day if $CFG->{show_tips};
2290 2339
2340Event->idle (cb => sub {
2341 $_[0]->w->cancel;
2342 $startup_done->();
2343});
2344
2291Event::loop; 2345Event::loop;
2346
2347#video_shutdown;
2348#audio_shutdown;
2292#CFPlus::SDL_Quit; 2349CFPlus::SDL_Quit;
2293#CFPlus::_exit 0;
2294
2295END {
2296 video_shutdown;
2297 audio_shutdown;
2298 CFPlus::SDL_Quit;
2299 CFPlus::DB::Server::stop; 2350CFPlus::DB::Server::stop;
2300}
2301 2351
2302=head1 NAME 2352=head1 NAME
2303 2353
2304cfplus - A Crossfire TRT and Crossfire game client 2354cfplus - A Crossfire TRT and Crossfire game client
2305 2355

Diff Legend

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