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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.182 by root, Tue Apr 25 10:40:49 2006 UTC vs.
Revision 1.212 by root, Fri May 12 15:45:42 2006 UTC

… …
37use CFClient; 37use CFClient;
38use CFClient::UI; 38use CFClient::UI;
39use CFClient::MapWidget; 39use CFClient::MapWidget;
40 40
41$Event::DIED = sub { 41$Event::DIED = sub {
42 # TODO: display dialog box or so
42 CFClient::error $_[1]; 43 CFClient::error $_[1];
43}; 44};
44 45
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 46#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46 47
… …
59our $NOW; 60our $NOW;
60 61
61our $CFG; 62our $CFG;
62our $CONN; 63our $CONN;
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 64our $FAST; # fast, low-quality mode, possibly useful for software-rendering
65
66our $WANT_REFRESH;
67our $CAN_REFRESH;
64 68
65our @SDL_MODES; 69our @SDL_MODES;
66our $WIDTH; 70our $WIDTH;
67our $HEIGHT; 71our $HEIGHT;
68our $FULLSCREEN; 72our $FULLSCREEN;
… …
70 74
71our $FONT_PROP; 75our $FONT_PROP;
72our $FONT_FIXED; 76our $FONT_FIXED;
73 77
74our $MAP; 78our $MAP;
79our $MAPMAP;
75our $MAPWIDGET; 80our $MAPWIDGET;
76our $BUTTONBAR; 81our $BUTTONBAR;
77our $LOGVIEW; 82our $LOGVIEW;
78our $CONSOLE; 83our $CONSOLE;
79our $METASERVER; 84our $METASERVER;
85our $LOGIN_BUTTON;
80 86
81our $FLOORBOX; 87our $FLOORBOX;
82our $GAUGES; 88our $GAUGES;
83our $STATWIDS; 89our $STATWIDS;
84 90
… …
88our $SDL_MIXER; 94our $SDL_MIXER;
89our @SOUNDS; # event => file mapping 95our @SOUNDS; # event => file mapping
90our %AUDIO_CHUNKS; # audio files 96our %AUDIO_CHUNKS; # audio files
91 97
92our $ALT_ENTER_MESSAGE; 98our $ALT_ENTER_MESSAGE;
93our $STATUS_LINE; 99our $STATUSBOX;
94our $DEBUG_STATUS; 100our $DEBUG_STATUS;
95 101
102our $INVWIN;
103our $INV;
104
96sub status { 105sub status {
97 $STATUS_LINE->set_text ($_[0]); 106 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, color => [1, 1, 0, 1]);
98 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h}); 107 $CFClient::UI::ROOT->on_post_alloc (status_line_positioner => sub {
108 my $widget = $STATUSBOX->{parent};
109 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
110 });
99} 111}
100 112
101sub debug { 113sub debug {
102 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
103 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 115 my ($w, $h) = $DEBUG_STATUS->size_request;
116 $DEBUG_STATUS->move ($WIDTH - $w, 0);
104} 117}
105 118
106sub start_game { 119sub start_game {
107 status "logging in..."; 120 status "logging in...";
108 121
109 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 122 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
110 123
111 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
112
113 $MAP = new CFClient::Map $mapsize, $mapsize; 125 $MAP = new CFClient::Map $mapsize, $mapsize;
114 126
115 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
116 128
117 $CONN = new conn 129 $CONN = eval {
130 new conn
118 host => $host, 131 host => $host,
119 port => $port || 13327, 132 port => $port || 13327,
120 user => $CFG->{user}, 133 user => $CFG->{user},
121 pass => $CFG->{password}, 134 pass => $CFG->{password},
122 mapw => $mapsize, 135 mapw => $mapsize,
123 maph => $mapsize, 136 maph => $mapsize,
137 ;
124 ; 138 };
125 139
140 if ($CONN) {
141 $LOGIN_BUTTON->set_text ("Logout");
142
126 status "login successful"; 143 status "login successful";
127 144
128 CFClient::lowdelay fileno $CONN->{fh}; 145 CFClient::lowdelay fileno $CONN->{fh};
146 } else {
147 status "unable to connect";
148 stop_game();
149 }
129} 150}
130 151
131sub stop_game { 152sub stop_game {
153 return unless $CONN;
154
155 status "connection closed";
156 $LOGIN_BUTTON->set_text ("Login");
157 $CONN->destroy;
158 $CONN = 0; # false, does not autovivify
159
160 undef $MAPCACHE;
132 undef $CONN; 161 undef $MAP;
133} 162}
134 163
135sub client_setup { 164sub client_setup {
136 my $dialog = new CFClient::UI::FancyFrame 165 my $dialog = new CFClient::UI::FancyFrame
137 title => "Client Setup", 166 title => "Client Setup",
… …
313 audio_shutdown (); 342 audio_shutdown ();
314 audio_init (); 343 audio_init ();
315 } 344 }
316 ); 345 );
317 346
347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
349 text => $CFG->{say_command},
350 tooltip => "This is the command that will be used if you write a line in the message window entry. "
351 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
352 ."But you could also set it to 'tell <playername>' to only chat with that user.",
353 connect_changed => sub {
354 my ($self, $value) = @_;
355 $CFG->{say_command} = $value;
356 }
357 );
358
318 $dialog 359 $dialog
319} 360}
320 361
321sub set_stats_window_fontsize { 362sub set_stats_window_fontsize {
322 for (values %{$STATWIDS}) { 363 for (values %{$STATWIDS}) {
… …
341 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 382 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
342 ); 383 );
343 $win->add (my $hbox = new CFClient::UI::HBox 384 $win->add (my $hbox = new CFClient::UI::HBox
344 children => [ 385 children => [
345 (new CFClient::UI::HBox expand => 1), 386 (new CFClient::UI::HBox expand => 1),
346 ($FLOORBOX = new CFClient::UI::VBox), 387 (new CFClient::UI::VBox children => [
388 (new CFClient::UI::Empty expand => 1),
389 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
390 ]),
347 (my $vbox = new CFClient::UI::VBox), 391 (my $vbox = new CFClient::UI::VBox),
348 ], 392 ],
349 ); 393 );
350 394
351 $vbox->add (new CFClient::UI::HBox 395 $vbox->add (new CFClient::UI::HBox
… …
379 423
380 $win 424 $win
381} 425}
382 426
383sub make_stats_window { 427sub make_stats_window {
384 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats"); 428 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
385 429
386 $tgw->add (my $vb = new CFClient::UI::VBox); 430 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
387 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 431 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
388 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 432 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
389 433
390 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 434 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
391 435
… …
410 [2, 5, st_wspd => "WSp", 10.54, "Weapon Speed, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 454 [2, 5, st_wspd => "WSp", 10.54, "Weapon Speed, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
411 ) { 455 ) {
412 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 456 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
413 457
414 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 458 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
415 can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 459 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
416 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 460 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
417 can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip); 461 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip);
418 } 462 }
419 463
420 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 464 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
421 465
422 my $row = 0; 466 my $row = 0;
423 my $col = 0; 467 my $col = 0;
424 468
425 my %resist_names = ( 469 my %resist_names = (
426 slow => "Slow", 470 slow => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
427 holyw => "Holy Word", 471 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
428 conf => "Confusion", 472 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
429 fire => "Fire", 473 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
430 depl => "Depletion (some monsters and other effects can cause stats depletion)", 474 depl => "Depletion (some monsters and other effects can cause stats depletion)",
431 magic => "Magic", 475 magic => "Magic (resistance to magic spells like magic missile or similar)",
432 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 476 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
433 acid => "Acid", 477 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
434 pois => "Poison", 478 pois => "Poison (resistance to getting poisoned)",
435 para => "Paralysation", 479 para => "Paralysation (this resistance affects the chance you get paralysed)",
436 deat => "Death (resistance against death spells)", 480 deat => "Death (resistance against death spells)",
437 phys => "Physical", 481 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
438 blind => "Blind", 482 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
439 fear => "Fear", 483 fear => "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
440 tund => "Turn undead", 484 tund => "Turn undead",
441 elec => "Electricity", 485 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
442 cold => "Cold", 486 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
443 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 487 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
444 ); 488 );
445 for (qw/slow holyw conf fire depl magic 489 for (qw/slow holyw conf fire depl magic
446 drain acid pois para deat phys 490 drain acid pois para deat phys
447 blind fear tund elec cold ghit/) 491 blind fear tund elec cold ghit/)
448 { 492 {
449 $tbl2->add ($col, $row, 493 $tbl2->add ($col, $row,
450 $STATWIDS->{"res_$_"} = 494 $STATWIDS->{"res_$_"} =
451 new CFClient::UI::Label 495 new CFClient::UI::Label
496 font => $FONT_FIXED,
452 template => "-100%", 497 template => "-100%",
453 align => +1, 498 align => +1,
454 valign => 0, 499 valign => 0,
455 can_events => 1, 500 can_events => 1,
456 can_hover => 1, 501 can_hover => 1,
457 tooltip => $resist_names{$_}, 502 tooltip => $resist_names{$_},
458 ); 503 );
459 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 504 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
505 font => $FONT_FIXED,
460 can_hover => 1, 506 can_hover => 1,
461 can_events => 1, 507 can_events => 1,
462 image => "ui/resist/resist_$_.png", 508 image => "ui/resist/resist_$_.png",
463 tooltip => $resist_names{$_}, 509 tooltip => $resist_names{$_},
464 ); 510 );
… …
547 593
548} 594}
549 595
550sub metaserver_dialog { 596sub metaserver_dialog {
551 my $dialog = new CFClient::UI::FancyFrame 597 my $dialog = new CFClient::UI::FancyFrame
552 title => "Metaserver", 598 title => "Server List",
553 child => (my $vbox = new CFClient::UI::VBox); 599 child => (my $vbox = new CFClient::UI::VBox);
554 600
555 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 601 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
556 602
557 $dialog 603 $dialog
… …
659 705
660 $METASERVER = metaserver_dialog; 706 $METASERVER = metaserver_dialog;
661 707
662 $vbox->add (new CFClient::UI::Flopper 708 $vbox->add (new CFClient::UI::Flopper
663 expand => 1, 709 expand => 1,
664 text => "Metaserver", 710 text => "Server List",
665 other => $METASERVER, 711 other => $METASERVER,
666 tooltip => "Show a list of avaible crossfire servers", 712 tooltip => "Show a list of available crossfire servers",
667 connect_open => sub { 713 connect_open => sub {
668 update_metaserver $HOST; 714 update_metaserver $HOST;
669 } 715 }
670 ); 716 );
671 } 717 }
… …
686 hidden => 1, 732 hidden => 1,
687 tooltip => "The password for your character", 733 tooltip => "The password for your character",
688 connect_changed => sub { 734 connect_changed => sub {
689 my ($self, $value) = @_; 735 my ($self, $value) = @_;
690 $CFG->{password} = $value; 736 $CFG->{password} = $value;
691 }
692 );
693
694 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
695 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
696 text => $CFG->{say_command},
697 tooltip => "This is the command that will be used if you write a line in the message window entry. "
698 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
699 ."But you could also set it to 'tell <playername>' to only chat with that user.",
700 connect_changed => sub {
701 my ($self, $value) = @_;
702 $CFG->{say_command} = $value;
703 } 737 }
704 ); 738 );
705 739
706 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 740 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
707 $table->add (1, 7, new CFClient::UI::Slider 741 $table->add (1, 7, new CFClient::UI::Slider
… …
714 748
715 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 749 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
716 }, 750 },
717 ); 751 );
718 752
719 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 753 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
754 expand => 1,
755 align => 0,
756 text => "Login",
757 connect_activate => sub {
758 $CONN ? stop_game
720 start_game; 759 : start_game;
760 },
721 }); 761 );
722 762
723 $dialog 763 $dialog
724} 764}
725 765
726sub message_window { 766sub message_window {
727 my $window = new CFClient::UI::FancyFrame 767 my $window = new CFClient::UI::FancyFrame
728 title => "Messages", 768 title => "Messages",
729 border_bg => [1, 1, 1, 0.5], 769 border_bg => [1, 1, 1, 1],
730 bg => [0.3, 0.3, 0.3, 0.8], 770 bg => [0, 0, 0, 0.5],
731 user_w => int $::WIDTH / 3, 771 user_w => int $::WIDTH / 3,
732 user_h => int $::HEIGHT / 5, 772 user_h => int $::HEIGHT / 5,
733 child => (my $vbox = new CFClient::UI::VBox); 773 child => (my $vbox = new CFClient::UI::VBox);
734 774
735 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 775 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
775 }; 815 };
776 816
777 $window 817 $window
778} 818}
779 819
820sub make_inventory_window {
821 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
822 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1);
823 $invwin
824}
825
780sub sdl_init { 826sub sdl_init {
781 CFClient::SDL_Init 827 CFClient::SDL_Init
782 and die "SDL::Init failed!\n"; 828 and die "SDL::Init failed!\n";
783} 829}
784 830
785sub video_init { 831sub video_init {
786 sdl_init; 832 sdl_init;
787 833
834 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
835
788 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 836 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
789 $FULLSCREEN = $CFG->{fullscreen}; 837 $FULLSCREEN = $CFG->{fullscreen};
790 $FAST = $CFG->{fast}; 838 $FAST = $CFG->{fast};
791 839
792 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 840 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
793 or die "SDL_SetVideoMode failed!\n"; 841 or die "SDL_SetVideoMode failed!\n";
794 842
795 $SDL_ACTIVE = 1; 843 $SDL_ACTIVE = 1;
796
797 $LAST_REFRESH = time - 0.01; 844 $LAST_REFRESH = time - 0.01;
798 845
799 CFClient::gl_init; 846 CFClient::gl_init;
800 847
801 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 848 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
802 849
850 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
851
803 ############################################################################# 852 #############################################################################
804 853
854 if ($DEBUG_STATUS) {
855 # reconfigure all widgets
856 $CFClient::UI::ROOT->reconfigure;
857
858 } else {
859 # create the widgets
860
805 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 861 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, text => "hulla", x => 100;#d#
806 $DEBUG_STATUS->show; 862 $DEBUG_STATUS->show;
807 863
808 $STATUS_LINE = new CFClient::UI::Label 864 $STATUSBOX = new CFClient::UI::Statusbox;
809 padding => 0, 865 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, size => 0.8, color => [1, 1, 1, 0.8]);
810 y => $HEIGHT - $FONTSIZE * 1.8;
811 $STATUS_LINE->show;
812 866
813 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 867 (new CFClient::UI::Frame
814 padding => 0, 868 bg => [0, 0, 0, 0.4],
815 fontsize => 0.8, 869 child => $STATUSBOX,
816 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 870 )->show;
817 $ALT_ENTER_MESSAGE->show;
818 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
819 871
820 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 872 CFClient::UI::FancyFrame->new (
821 $MAPWIDGET->focus_in; 873 border_bg => [1, 1, 1, 192/255],
874 bg => [1, 1, 1, 0],
875 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
876 )->show;
877
878 $MAPWIDGET = new CFClient::MapWidget;
822 $MAPWIDGET->connect (activate_console => sub { 879 $MAPWIDGET->connect (activate_console => sub {
823 my ($mapwidget, $preset) = @_; 880 my ($mapwidget, $preset) = @_;
824 881
825 if ($CONSOLE) { 882 if ($CONSOLE) {
826 $CONSOLE->{input}->{auto_activated} = 1; 883 $CONSOLE->{input}->{auto_activated} = 1;
827 $CONSOLE->{input}->focus_in; 884 $CONSOLE->{input}->focus_in;
828 885
829 if ($preset && $CONSOLE->{input}->get_text eq '') { 886 if ($preset && $CONSOLE->{input}->get_text eq '') {
830 $CONSOLE->{input}->set_text ($preset); 887 $CONSOLE->{input}->set_text ($preset);
888 }
831 } 889 }
832 } 890 });
833 }); 891 $MAPWIDGET->show;
892 $MAPWIDGET->focus_in;
834 893
835 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 894 $BUTTONBAR = new CFClient::UI::HBox;
836 895
837 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 896 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
838 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 897 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
839 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 898 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
840 899
841 $CFClient::UI::ROOT->add (make_gauge_window); # 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 900 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
901
842 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 902 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
903 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
843 904
844 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 905 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
845 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 906 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
846 status "Configuration Saved"; 907 status "Configuration Saved";
847 }); 908 });
848 909
910 $BUTTONBAR->show;
911
912 # delay till geometry is constant
913 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
849 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 914 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
915 });
916 force_refresh ();
917 }
850} 918}
851 919
852sub video_shutdown { 920sub video_shutdown {
853 $CFClient::UI::ROOT->{children} = [];
854 undef $CFClient::UI::GRAB;
855 undef $CFClient::UI::HOVER;
856 undef $SDL_ACTIVE; 921 undef $SDL_ACTIVE;
857} 922}
858 923
859my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 924my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
860my $bgmusic;#TODO#hack#d# 925my $bgmusic;#TODO#hack#d#
926
927sub audio_channel_finished {
928 my ($channel) = @_;
929
930 warn "channel $channel finished\n";#d#
931}
861 932
862sub audio_music_finished { 933sub audio_music_finished {
863 return unless $CFG->{bgm_enable}; 934 return unless $CFG->{bgm_enable};
864 935
865 # TODO: hack, do play loop and mood music 936 # TODO: hack, do play loop and mood music
… …
869 push @bgmusic, shift @bgmusic; 940 push @bgmusic, shift @bgmusic;
870} 941}
871 942
872sub audio_init { 943sub audio_init {
873 if ($CFG->{audio_enable}) { 944 if ($CFG->{audio_enable}) {
874 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 945 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
875 $SDL_MIXER = !CFClient::Mix_OpenAudio; 946 $SDL_MIXER = !CFClient::Mix_OpenAudio;
876 CFClient::Mix_AllocateChannels 8; 947 CFClient::Mix_AllocateChannels 8;
877 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 948 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
878 949
879 audio_music_finished; 950 audio_music_finished;
… …
906} 977}
907 978
908my %animate_object; 979my %animate_object;
909my $animate_timer; 980my $animate_timer;
910 981
911my $want_refresh;
912my $can_refresh;
913
914my $fps = 9; 982my $fps = 9;
915 983
916sub force_refresh { 984sub force_refresh {
917 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 985 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
918 debug sprintf "%3.2f", $fps; 986 debug sprintf "%3.2f", $fps;
919 987
920 $want_refresh = 0;
921 $can_refresh = 0;
922
923 $CFClient::UI::ROOT->draw; 988 $CFClient::UI::ROOT->draw;
924
925 CFClient::SDL_GL_SwapBuffers; 989 CFClient::SDL_GL_SwapBuffers;
926 990
991 $WANT_REFRESH = 0;
992 $CAN_REFRESH = 0;
927 $LAST_REFRESH = $NOW; 993 $LAST_REFRESH = $NOW;
928} 994}
929 995
930my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 996my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
931 $NOW = time; 997 $NOW = time;
… …
933 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 999 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
934 for CFClient::SDL_PollEvent; 1000 for CFClient::SDL_PollEvent;
935 1001
936 if (%animate_object) { 1002 if (%animate_object) {
937 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1003 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
938 $want_refresh++; 1004 $WANT_REFRESH++;
939 } 1005 }
940 1006
941 if ($want_refresh) { 1007 if ($WANT_REFRESH) {
942 force_refresh; 1008 force_refresh;
943 } else { 1009 } else {
944 $can_refresh = 1; 1010 $CAN_REFRESH = 1;
945 } 1011 }
946}); 1012});
947
948sub refresh {
949 $want_refresh++;
950}
951 1013
952sub animation_start { 1014sub animation_start {
953 my ($widget) = @_; 1015 my ($widget) = @_;
954 $animate_object{$widget} = $widget; 1016 $animate_object{$widget} = $widget;
955} 1017}
… …
1034# at worst. 1096# at worst.
1035sub conn::flood_fill { 1097sub conn::flood_fill {
1036 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1098 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1037 1099
1038 # the server does not allow map paths > 6 1100 # the server does not allow map paths > 6
1039 return if 6 <= length $path; 1101 return if 7 <= length $path;
1040 1102
1041 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1103 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1042 1104
1043 for ( 1105 for (
1044 [1, 0, -1], 1106 [1, 0, -1],
… …
1087 1149
1088 $self->flush_map; 1150 $self->flush_map;
1089 1151
1090 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1152 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1091 1153
1092 my $mapmapw = 250; 1154 my $mapmapw = $MAPMAP->{w};
1093 my $mapmaph = 250; 1155 my $mapmaph = $MAPMAP->{h};
1094 1156
1095 $self->{neigh_rect} = [ 1157 $self->{neigh_rect} = [
1096 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1158 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1097 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1159 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1098 ]; 1160 ];
… …
1267 [0.55, 0.41, 0.13], 1329 [0.55, 0.41, 0.13],
1268 [0.99, 0.77, 0.26], 1330 [0.99, 0.77, 0.26],
1269 [0.74, 0.65, 0.41], 1331 [0.74, 0.65, 0.41],
1270 ); 1332 );
1271 1333
1334 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1335
1336 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g;
1337 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1338 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1339
1272 $LOGVIEW->add_paragraph ($color[$color], $text); 1340 $LOGVIEW->add_paragraph ($color[$color],
1341 join "\n", map "$time $_", split /\n/, $text);
1342
1343 $STATUSBOX->add ($text,
1344 group => $text,
1345 color => $color[$color],
1346 timeout => 60,
1347 tooltip_font => $::FONT_FIXED,
1348 );
1349}
1350
1351sub conn::drawextinfo {
1352 my ($self, $color, $type, $subtype, $message) = @_;
1353
1354 $self->drawinfo ($color, $message);
1273} 1355}
1274 1356
1275sub conn::spell_add { 1357sub conn::spell_add {
1276 my ($self, $spell) = @_; 1358 my ($self, $spell) = @_;
1277 1359
… …
1290 1372
1291 for my $skill (values %{$self->{skill_info}}) { 1373 for my $skill (values %{$self->{skill_info}}) {
1292 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1374 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1293 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1375 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1294 } 1376 }
1377
1378 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1379 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1380 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1381 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1382}
1383
1384sub conn::eof {
1385 stop_game;
1295} 1386}
1296 1387
1297sub update_floorbox { 1388sub update_floorbox {
1298 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1389 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1390 return unless $CONN;
1391
1299 $FLOORBOX->clear; 1392 $FLOORBOX->clear;
1300 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1393 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1301 1394
1302 my @items = values %{ $CONN->{container}{0} }; 1395 my $count = 4;
1303 1396 for (@{ $CONN->{container}{0} }) {
1304 # we basically have to use the same sorting as everybody else 1397 if (--$count) {
1305 @items = sort { $a->{type} <=> $b->{type} } @items; 1398 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1306 1399 } else {
1307 for my $item (reverse @items) { 1400 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1308 my $desc = $item->{nrof} < 2
1309 ? $item->{name}
1310 : "$item->{nrof} $item->{name_pl}";
1311 # todo: animation widget, face widget, weight(?) etc.
1312 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1313 tooltip => (CFClient::UI::Label->escape ($desc)
1314 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1315 can_hover => 1,
1316 can_events => 1,
1317 connect_button_down => sub {
1318 my ($self, $ev, $x, $y) = @_;
1319
1320 # todo: maybe put examine on 1? but should just be a tooltip :(
1321 if ($ev->{button} == 1) {
1322 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1323 } elsif ($ev->{button} == 2) {
1324 $CONN->send ("apply $item->{tag}");
1325 } elsif ($ev->{button} == 3) {
1326 # examine, lock, mark, maybe other things
1327 warn "MENU not implemented yet\n";
1328 }
1329
1330 1
1331 }, 1401 last;
1332 );
1333
1334 $hbox->add (new CFClient::UI::Face
1335 can_events => 0,
1336 face => $item->{face},
1337 anim => $item->{anim},
1338 animspeed => $item->{animspeed},
1339 );
1340 1402 }
1341 $hbox->add (new CFClient::UI::Label
1342 can_events => 0,
1343 text => $desc,
1344 );
1345 } 1403 }
1346 }); 1404 });
1347 refresh; 1405
1406 $WANT_REFRESH++;
1348} 1407}
1349 1408
1350sub conn::container_add { 1409sub conn::container_add {
1351 my ($self, $id, $items) = @_; 1410 my ($self, $tag, $items) = @_;
1352 1411
1353 update_floorbox if $id == 0; 1412 update_floorbox if $tag == 0;
1413
1414 $INV->set_items ($self->{container}{$self->{player}{tag}})
1415 if $tag == $self->{player}{tag};
1416
1354 # $self-<{player}{tag} => player inv 1417 # $self-<{player}{tag} => player inv
1355 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1418 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1356} 1419}
1357 1420
1358sub conn::container_clear { 1421sub conn::container_clear {
1359 my ($self, $id) = @_; 1422 my ($self, $tag) = @_;
1360 1423
1361 update_floorbox if $id == 0; 1424 update_floorbox if $tag == 0;
1425
1426 $INV->set_items ($self->{container}{$tag})
1427 if $tag == $self->{player}{tag};
1428
1362# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1429# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1363} 1430}
1364 1431
1365sub conn::item_delete { 1432sub conn::item_delete {
1366 my ($self, @items) = @_; 1433 my ($self, @items) = @_;
1367 1434
1368 for (@items) { 1435 for (@items) {
1369 update_floorbox if $_->{container} == 0; 1436 update_floorbox if $_->{container} == 0;
1437
1438 $INV->set_items ($self->{container}{$_->{container}})
1439 if $_->{container} == $self->{player}{tag};
1370 } 1440 }
1371} 1441}
1372 1442
1373sub conn::item_update { 1443sub conn::item_update {
1374 my ($self, $item) = @_; 1444 my ($self, $item) = @_;
1375 1445
1376 update_floorbox if $item->{container} == 0; 1446 update_floorbox if $item->{container} == 0;
1447
1448 $INV->set_items ($self->{container}{$item->{container}})
1449 if $item->{container} == $self->{player}{tag};
1377} 1450}
1378 1451
1379%SDL_CB = ( 1452%SDL_CB = (
1380 CFClient::SDL_QUIT => sub { 1453 CFClient::SDL_QUIT => sub {
1381 Event::unloop -1; 1454 Event::unloop -1;
1382 }, 1455 },
1383 CFClient::SDL_VIDEORESIZE => sub { 1456 CFClient::SDL_VIDEORESIZE => sub {
1384 }, 1457 },
1385 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1458 CFClient::SDL_VIDEOEXPOSE => sub {
1459 $WANT_REFRESH++;
1460 },
1386 CFClient::SDL_ACTIVEEVENT => sub { 1461 CFClient::SDL_ACTIVEEVENT => sub {
1387# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1462# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1388 }, 1463 },
1389 CFClient::SDL_KEYDOWN => sub { 1464 CFClient::SDL_KEYDOWN => sub {
1390 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1465 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1394 video_init; 1469 video_init;
1395 } else { 1470 } else {
1396 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1471 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1397 } 1472 }
1398 }, 1473 },
1399 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1474 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1400 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1475 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1401 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1476 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1402 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1477 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1403 CFClient::SDL_USEREVENT => \&audio_music_finished, 1478 CFClient::SDL_USEREVENT => sub {
1479 if ($_[0]{code} == 1) {
1480 audio_channel_finished $_[0]{data1};
1481 } elsif ($_[0]{code} == 0) {
1482 audio_music_finished;
1483 }
1484 },
1404); 1485);
1405 1486
1406############################################################################# 1487#############################################################################
1407 1488
1408$SIG{INT} = $SIG{TERM} = sub { exit }; 1489$SIG{INT} = $SIG{TERM} = sub { exit };
1409 1490
1410$TILECACHE = CFClient::db_table "tilecache";
1411$FACEMAP = CFClient::db_table "facemap";
1412
1413CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1414
1415my %DEF_CFG = (
1416 sdl_mode => 0,
1417 width => 640,
1418 height => 480,
1419 fullscreen => 0,
1420 fast => 0,
1421 map_scale => 0.5,
1422 fow_enable => 1,
1423 fow_intensity => 0.45,
1424 fow_smooth => 0,
1425 gui_fontsize => 1,
1426 log_fontsize => 1,
1427 gauge_fontsize => 1,
1428 gauge_size => 0.35,
1429 stat_fontsize => 1,
1430 mapsize => 100,
1431 host => "crossfire.schmorp.de",
1432 say_command => 'say',
1433 audio_enable => 1,
1434 bgm_enable => 1,
1435 bgm_volume => 0.25,
1436);
1437
1438while (my ($k, $v) = each %DEF_CFG) {
1439 $CFG->{$k} = $v unless exists $CFG->{$k};
1440}
1441
1442sdl_init;
1443
1444@SDL_MODES = reverse
1445 grep $_->[0] >= 640 && $_->[1] >= 480,
1446 CFClient::SDL_ListModes;
1447
1448@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1449
1450$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1451
1452{ 1491{
1492 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1493
1494 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1495
1496 $TILECACHE = CFClient::db_table "tilecache";
1497 $FACEMAP = CFClient::db_table "facemap";
1498
1499 my %DEF_CFG = (
1500 sdl_mode => 0,
1501 width => 640,
1502 height => 480,
1503 fullscreen => 0,
1504 fast => 0,
1505 map_scale => 0.5,
1506 fow_enable => 1,
1507 fow_intensity => 0.45,
1508 fow_smooth => 0,
1509 gui_fontsize => 1,
1510 log_fontsize => 1,
1511 gauge_fontsize=> 1,
1512 gauge_size => 0.35,
1513 stat_fontsize => 1,
1514 mapsize => 100,
1515 host => "crossfire.schmorp.de",
1516 say_command => 'say',
1517 audio_enable => 1,
1518 bgm_enable => 1,
1519 bgm_volume => 0.25,
1520 );
1521
1522 while (my ($k, $v) = each %DEF_CFG) {
1523 $CFG->{$k} = $v unless exists $CFG->{$k};
1524 }
1525
1526 sdl_init;
1527
1528 @SDL_MODES = reverse
1529 grep $_->[0] >= 640 && $_->[1] >= 480,
1530 CFClient::SDL_ListModes;
1531
1532 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1533
1534 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1535
1536 {
1453 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1537 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1454 DejaVuSans.ttf 1538 DejaVuSans.ttf
1455 DejaVuSansMono.ttf 1539 DejaVuSansMono.ttf
1456 DejaVuSans-Bold.ttf 1540 DejaVuSans-Bold.ttf
1457 DejaVuSansMono-Bold.ttf 1541 DejaVuSansMono-Bold.ttf
1458 DejaVuSans-Oblique.ttf 1542 DejaVuSans-Oblique.ttf
1459 DejaVuSansMono-Oblique.ttf 1543 DejaVuSansMono-Oblique.ttf
1460 DejaVuSans-BoldOblique.ttf 1544 DejaVuSans-BoldOblique.ttf
1461 DejaVuSansMono-BoldOblique.ttf 1545 DejaVuSansMono-BoldOblique.ttf
1462 ); 1546 );
1463 1547
1464 CFClient::add_font $_ for @fonts; 1548 CFClient::add_font $_ for @fonts;
1465 1549
1466 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1550 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1467 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1551 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1468 1552
1469 $FONT_PROP->make_default; 1553 $FONT_PROP->make_default;
1470} 1554 }
1471 1555
1472video_init; 1556 video_init;
1473audio_init; 1557 audio_init;
1558}
1474 1559
1475Event::loop; 1560Event::loop;
1476 1561
1477END { CFClient::SDL_Quit } 1562END { CFClient::SDL_Quit }
1478 1563

Diff Legend

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