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.190 by elmex, Thu Apr 27 08:55:35 2006 UTC vs.
Revision 1.224 by root, Wed May 17 15:18:57 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6# do things only needed for single-binary version (par)
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache) { 8 if (%PAR::LibCache) {
8 @INC = grep ref, @INC; # weed out all paths except pars loader refs 9 @INC = grep ref, @INC; # weed out all paths except pars loader refs
9 10
10 while (my ($filename, $zip) = each %PAR::LibCache) { 11 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
13 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
14 unless -e "$ENV{PAR_TEMP}/$1"; 15 unless -e "$ENV{PAR_TEMP}/$1";
15 } 16 }
16 } 17 }
17 18
19 # TODO: pango-rc file, anybody?
20
18 unshift @INC, $ENV{PAR_TEMP}; 21 unshift @INC, $ENV{PAR_TEMP};
19
20 if ($^O eq "MSWin32") {
21 $ENV{GTK_RC_FILES} = "$ENV{PAR_TEMP}/share/themes/MS-Windows/gtk-2.0/gtkrc";
22 }
23 } 22 }
24} 23}
25 24
26# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
27unshift @INC, $ENV{PAR_TEMP}; 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
30use Event; 31use Event;
31 32
32use Crossfire; 33use Crossfire;
33use Crossfire::Protocol; 34use Crossfire::Protocol;
34 35
… …
37use CFClient; 38use CFClient;
38use CFClient::UI; 39use CFClient::UI;
39use CFClient::MapWidget; 40use CFClient::MapWidget;
40 41
41$Event::DIED = sub { 42$Event::DIED = sub {
43 # TODO: display dialog box or so
42 CFClient::error $_[1]; 44 CFClient::error $_[1];
43}; 45};
44 46
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 47#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46 48
… …
59our $NOW; 61our $NOW;
60 62
61our $CFG; 63our $CFG;
62our $CONN; 64our $CONN;
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 65our $FAST; # fast, low-quality mode, possibly useful for software-rendering
66
67our $WANT_REFRESH;
68our $CAN_REFRESH;
64 69
65our @SDL_MODES; 70our @SDL_MODES;
66our $WIDTH; 71our $WIDTH;
67our $HEIGHT; 72our $HEIGHT;
68our $FULLSCREEN; 73our $FULLSCREEN;
… …
76our $MAPWIDGET; 81our $MAPWIDGET;
77our $BUTTONBAR; 82our $BUTTONBAR;
78our $LOGVIEW; 83our $LOGVIEW;
79our $CONSOLE; 84our $CONSOLE;
80our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON;
81 87
82our $FLOORBOX; 88our $FLOORBOX;
83our $GAUGES; 89our $GAUGES;
84our $STATWIDS; 90our $STATWIDS;
85 91
… …
89our $SDL_MIXER; 95our $SDL_MIXER;
90our @SOUNDS; # event => file mapping 96our @SOUNDS; # event => file mapping
91our %AUDIO_CHUNKS; # audio files 97our %AUDIO_CHUNKS; # audio files
92 98
93our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
94our $STATUS_LINE; 100our $STATUSBOX;
95our $DEBUG_STATUS; 101our $DEBUG_STATUS;
96 102
103our $INVWIN;
104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
108
97sub status { 109sub status {
98 $STATUS_LINE->set_text ($_[0]); 110 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
99 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
100} 111}
101 112
102sub debug { 113sub debug {
103 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
104 $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);
105} 117}
106 118
107sub start_game { 119sub start_game {
108 status "logging in..."; 120 status "logging in...";
109 121
110 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;
111 123
112 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
113
114 $MAP = new CFClient::Map $mapsize, $mapsize; 125 $MAP = new CFClient::Map $mapsize, $mapsize;
115 126
116 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
117 128
118 $CONN = new conn 129 $CONN = eval {
130 new conn
119 host => $host, 131 host => $host,
120 port => $port || 13327, 132 port => $port || 13327,
121 user => $CFG->{user}, 133 user => $CFG->{user},
122 pass => $CFG->{password}, 134 pass => $CFG->{password},
123 mapw => $mapsize, 135 mapw => $mapsize,
124 maph => $mapsize, 136 maph => $mapsize,
137 ;
125 ; 138 };
126 139
140 if ($CONN) {
141 $LOGIN_BUTTON->set_text ("Logout");
142
127 status "login successful"; 143 status "login successful";
128 144
129 CFClient::lowdelay fileno $CONN->{fh}; 145 CFClient::lowdelay fileno $CONN->{fh};
146 } else {
147 status "unable to connect";
148 stop_game();
149 }
130} 150}
131 151
132sub 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;
133 undef $CONN; 161 undef $MAP;
134} 162}
135 163
136sub client_setup { 164sub client_setup {
137 my $dialog = new CFClient::UI::FancyFrame 165 my $dialog = new CFClient::UI::FancyFrame
138 title => "Client Setup", 166 title => "Client Setup",
… …
140 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 168 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
141 169
142 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 170 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
143 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 171 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
144 172
145 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 173 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
146 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 174 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
147 175
148 $mode_slider->connect (changed => sub { 176 $mode_slider->connect (changed => sub {
149 my ($self, $value) = @_; 177 my ($self, $value) = @_;
150 178
… …
175 } 203 }
176 ); 204 );
177 205
178 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 206 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
179 $table->add (1, $row++, new CFClient::UI::Slider 207 $table->add (1, $row++, new CFClient::UI::Slider
180 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 208 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
181 tooltip => "Enlarge or shrink the displayed map", 209 tooltip => "Enlarge or shrink the displayed map",
182 connect_changed => sub { 210 connect_changed => sub {
183 my ($self, $value) = @_; 211 my ($self, $value) = @_;
184 $CFG->{map_scale} = 0.05 * int $value / 0.05; 212 $CFG->{map_scale} = $value;
185 } 213 }
186 ); 214 );
187 215
188 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 216 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
189 $table->add (1, $row++, new CFClient::UI::CheckBox 217 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
216 } 244 }
217 ); 245 );
218 246
219 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 247 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
220 $table->add (1, $row++, new CFClient::UI::Slider 248 $table->add (1, $row++, new CFClient::UI::Slider
221 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 249 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
222 tooltip => "The font size used by most GUI elements", 250 tooltip => "The font size used by most GUI elements",
223 connect_changed => sub { 251 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
224 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
225# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
226 }
227 ); 252 );
228 253
229 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
230 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
231 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 256 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
232 tooltip => "The font size used by the server log window only", 257 tooltip => "The font size used by the server log window only",
233 connect_changed => sub { 258 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
234 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
235 }
236 ); 259 );
237 260
238 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
239 262
240 $table->add (1, $row++, new CFClient::UI::Slider 263 $table->add (1, $row++, new CFClient::UI::Slider
241 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 264 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
242 tooltip => "The font size used by the statistics window only", 265 tooltip => "The font size used by the statistics window only",
243 connect_changed => sub { 266 connect_changed => sub {
244 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 267 $CFG->{stat_fontsize} = $_[1];
245 &set_stats_window_fontsize; 268 &set_stats_window_fontsize;
246 } 269 }
247 ); 270 );
248 271
249 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 272 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
250 $table->add (1, $row++, new CFClient::UI::Slider 273 $table->add (1, $row++, new CFClient::UI::Slider
251 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 274 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
252 tooltip => "Adjust the size of the stats gauges at the bottom right", 275 tooltip => "Adjust the size of the stats gauges at the bottom right",
253 connect_changed => sub { 276 connect_changed => sub {
254 $CFG->{gauge_size} = $_[1]; 277 $CFG->{gauge_size} = $_[1];
255 my $h = int $HEIGHT * $CFG->{gauge_size}; 278 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
256 $GAUGES->{win}->set_size ($WIDTH, $h);
257 $GAUGES->{win}->move (0, $HEIGHT - $h);
258 } 279 }
259 ); 280 );
260 281
261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 282 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
262 $table->add (1, $row++, new CFClient::UI::Slider 283 $table->add (1, $row++, new CFClient::UI::Slider
263 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 284 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
264 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 285 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
265 connect_changed => sub { 286 connect_changed => sub {
266 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 287 $CFG->{gauge_fontsize} = $_[1];
267 &set_gauge_window_fontsize; 288 &set_gauge_window_fontsize;
268 } 289 }
269 ); 290 );
270 291
271 $table->add (1, $row++, new CFClient::UI::Button 292 $table->add (1, $row++, new CFClient::UI::Button
… …
345# local $GAUGES->{win}{parent};#d# 366# local $GAUGES->{win}{parent};#d#
346# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 367# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
347} 368}
348 369
349sub make_gauge_window { 370sub make_gauge_window {
350 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 371 my $gh = int $HEIGHT * $CFG->{gauge_size};
351# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
352 372
353 my $win = new CFClient::UI::Frame ( 373 my $win = new CFClient::UI::Frame (
354 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 374 req_y => -1,
375 user_w => $WIDTH,
376 user_h => $gh,
355 ); 377 );
378
356 $win->add (my $hbox = new CFClient::UI::HBox 379 $win->add (my $hbox = new CFClient::UI::HBox
357 children => [ 380 children => [
358 (new CFClient::UI::HBox expand => 1), 381 (new CFClient::UI::HBox expand => 1),
359 ($FLOORBOX = new CFClient::UI::VBox), 382 (new CFClient::UI::VBox children => [
383 (new CFClient::UI::Empty expand => 1),
384 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
385 ]),
360 (my $vbox = new CFClient::UI::VBox), 386 (my $vbox = new CFClient::UI::VBox),
361 ], 387 ],
362 ); 388 );
363 389
364 $vbox->add (new CFClient::UI::HBox 390 $vbox->add (new CFClient::UI::HBox
… …
562 588
563} 589}
564 590
565sub metaserver_dialog { 591sub metaserver_dialog {
566 my $dialog = new CFClient::UI::FancyFrame 592 my $dialog = new CFClient::UI::FancyFrame
567 title => "Metaserver", 593 title => "Server List",
568 child => (my $vbox = new CFClient::UI::VBox); 594 child => (my $vbox = new CFClient::UI::VBox);
569 595
570 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 596 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
571 597
572 $dialog 598 $dialog
… …
641 $HOST->set_text ($CFG->{host} = $host); 667 $HOST->set_text ($CFG->{host} = $host);
642 }), 668 }),
643 (new CFClient::UI::Empty expand => 1), 669 (new CFClient::UI::Empty expand => 1),
644 ]); 670 ]);
645 671
646 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 672 $table->add ($_ + 1, $y, new CFClient::UI::Label
673 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
647 for 0 .. $#$m; 674 for 0 .. $#$m;
648 } 675 }
649 } 676 }
650 }); 677 });
651} 678}
… …
674 701
675 $METASERVER = metaserver_dialog; 702 $METASERVER = metaserver_dialog;
676 703
677 $vbox->add (new CFClient::UI::Flopper 704 $vbox->add (new CFClient::UI::Flopper
678 expand => 1, 705 expand => 1,
679 text => "Metaserver", 706 text => "Server List",
680 other => $METASERVER, 707 other => $METASERVER,
681 tooltip => "Show a list of avaible crossfire servers", 708 tooltip => "Show a list of available crossfire servers",
682 connect_open => sub { 709 connect_open => sub {
683 update_metaserver $HOST; 710 update_metaserver $HOST;
684 } 711 }
685 ); 712 );
686 } 713 }
… …
707 ); 734 );
708 735
709 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 736 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
710 $table->add (1, 7, new CFClient::UI::Slider 737 $table->add (1, 7, new CFClient::UI::Slider
711 req_w => 100, 738 req_w => 100,
712 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 739 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
713 tooltip => "This is the size of the portion of the map update the server sends you. " 740 tooltip => "This is the size of the portion of the map update the server sends you. "
714 ."If you set this to a high value you will be able to see further for example.", 741 ."If you set this to a high value you will be able to see further for example.",
715 connect_changed => sub { 742 connect_changed => sub {
716 my ($self, $value) = @_; 743 my ($self, $value) = @_;
717 744
718 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 745 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
719 }, 746 },
720 ); 747 );
721 748
722 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 749 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
750 expand => 1,
751 align => 0,
752 text => "Login",
753 connect_activate => sub {
754 $CONN ? stop_game
723 start_game; 755 : start_game;
756 },
724 }); 757 );
725 758
726 $dialog 759 $dialog
727} 760}
728 761
729sub message_window { 762sub message_window {
… …
778 }; 811 };
779 812
780 $window 813 $window
781} 814}
782 815
816sub make_inventory_window {
817 my $invwin = new CFClient::UI::FancyFrame
818 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
819
820 $invwin->add (my $hb = new CFClient::UI::HBox);
821
822 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
823 $vb1->add (my $lbl = new CFClient::UI::Label);
824 $lbl->set_text ("Player");
825 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
826
827 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
828 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
829 $INVR_LBL->set_text ("Floor");
830 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
831
832 $invwin
833}
834
783sub sdl_init { 835sub sdl_init {
784 CFClient::SDL_Init 836 CFClient::SDL_Init
785 and die "SDL::Init failed!\n"; 837 and die "SDL::Init failed!\n";
786} 838}
787 839
788sub video_init { 840sub video_init {
789 sdl_init; 841 sdl_init;
790 842
843 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
844
791 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 845 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
792 $FULLSCREEN = $CFG->{fullscreen}; 846 $FULLSCREEN = $CFG->{fullscreen};
793 $FAST = $CFG->{fast}; 847 $FAST = $CFG->{fast};
794 848
795 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 849 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
796 or die "SDL_SetVideoMode failed!\n"; 850 or die "SDL_SetVideoMode failed!\n";
797 851
798 $SDL_ACTIVE = 1; 852 $SDL_ACTIVE = 1;
799
800 $LAST_REFRESH = time - 0.01; 853 $LAST_REFRESH = time - 0.01;
801 854
802 CFClient::gl_init; 855 CFClient::gl_init;
803 856
804 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 857 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
805 858
859 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
860
806 ############################################################################# 861 #############################################################################
807 862
863 unless ($DEBUG_STATUS) {
864 # create the widgets
865
808 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 866 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
809 $DEBUG_STATUS->show; 867 $DEBUG_STATUS->show;
810 868
811 $STATUS_LINE = new CFClient::UI::Label 869 $STATUSBOX = new CFClient::UI::Statusbox;
812 padding => 0, 870 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
813 y => $HEIGHT - $FONTSIZE * 1.8;
814 $STATUS_LINE->show;
815 871
816 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 872 (new CFClient::UI::Frame
817 padding => 0, 873 bg => [0, 0, 0, 0.4],
818 fontsize => 0.8, 874 req_y => -1,
819 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 875 child => $STATUSBOX,
820 $ALT_ENTER_MESSAGE->show; 876 )->show;
821 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
822 877
823 CFClient::UI::FancyFrame->new ( 878 CFClient::UI::FancyFrame->new (
824 border_bg => [1, 1, 1, 192/255], 879 border_bg => [1, 1, 1, 192/255],
825 bg => [1, 1, 1, 0], 880 bg => [1, 1, 1, 0],
826 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 881 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
827 )->show; 882 )->show;
828 883
829 $MAPWIDGET = new CFClient::MapWidget; 884 $MAPWIDGET = new CFClient::MapWidget;
830 $MAPWIDGET->connect (activate_console => sub { 885 $MAPWIDGET->connect (activate_console => sub {
831 my ($mapwidget, $preset) = @_; 886 my ($mapwidget, $preset) = @_;
832 887
833 if ($CONSOLE) { 888 if ($CONSOLE) {
834 $CONSOLE->{input}->{auto_activated} = 1; 889 $CONSOLE->{input}->{auto_activated} = 1;
835 $CONSOLE->{input}->focus_in; 890 $CONSOLE->{input}->focus_in;
836 891
837 if ($preset && $CONSOLE->{input}->get_text eq '') { 892 if ($preset && $CONSOLE->{input}->get_text eq '') {
838 $CONSOLE->{input}->set_text ($preset); 893 $CONSOLE->{input}->set_text ($preset);
894 }
839 } 895 }
840 } 896 });
841 });
842 $MAPWIDGET->show; 897 $MAPWIDGET->show;
843 $MAPWIDGET->focus_in; 898 $MAPWIDGET->focus_in;
844 899
845 $BUTTONBAR = new CFClient::UI::HBox; 900 $BUTTONBAR = new CFClient::UI::HBox;
846 901
847 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 902 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
848 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 903 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
849 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 904 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
850 905
851 $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 906 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
907
852 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 908 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
909 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
853 910
854 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 911 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
855 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 912 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
856 status "Configuration Saved"; 913 status "Configuration Saved";
857 }); 914 });
858 915
859 $BUTTONBAR->show; 916 $BUTTONBAR->show;
860 917
918 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
919
920 # delay till geometry is constant
921 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
861 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 922 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
923 my $widget = $GAUGES->{win};
924 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
925 });
926 force_refresh ();
927 }
862} 928}
863 929
864sub video_shutdown { 930sub video_shutdown {
865 $CFClient::UI::ROOT->{children} = [];
866 undef $CFClient::UI::GRAB;
867 undef $CFClient::UI::HOVER;
868 undef $SDL_ACTIVE; 931 undef $SDL_ACTIVE;
869} 932}
870 933
871my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 934my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
872my $bgmusic;#TODO#hack#d# 935my $bgmusic;#TODO#hack#d#
936
937sub audio_channel_finished {
938 my ($channel) = @_;
939
940 warn "channel $channel finished\n";#d#
941}
873 942
874sub audio_music_finished { 943sub audio_music_finished {
875 return unless $CFG->{bgm_enable}; 944 return unless $CFG->{bgm_enable};
876 945
877 # TODO: hack, do play loop and mood music 946 # TODO: hack, do play loop and mood music
… …
881 push @bgmusic, shift @bgmusic; 950 push @bgmusic, shift @bgmusic;
882} 951}
883 952
884sub audio_init { 953sub audio_init {
885 if ($CFG->{audio_enable}) { 954 if ($CFG->{audio_enable}) {
886 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 955 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
887 $SDL_MIXER = !CFClient::Mix_OpenAudio; 956 $SDL_MIXER = !CFClient::Mix_OpenAudio;
888 CFClient::Mix_AllocateChannels 8; 957 CFClient::Mix_AllocateChannels 8;
889 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 958 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
890 959
891 audio_music_finished; 960 audio_music_finished;
… …
918} 987}
919 988
920my %animate_object; 989my %animate_object;
921my $animate_timer; 990my $animate_timer;
922 991
923my $want_refresh;
924my $can_refresh;
925
926my $fps = 9; 992my $fps = 9;
927 993
928sub force_refresh { 994sub force_refresh {
929 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 995 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
930 debug sprintf "%3.2f", $fps; 996 debug sprintf "%3.2f", $fps;
931 997
932 $want_refresh = 0;
933 $can_refresh = 0;
934
935 $CFClient::UI::ROOT->draw; 998 $CFClient::UI::ROOT->draw;
936
937 CFClient::SDL_GL_SwapBuffers; 999 CFClient::SDL_GL_SwapBuffers;
938 1000
1001 $WANT_REFRESH = 0;
1002 $CAN_REFRESH = 0;
939 $LAST_REFRESH = $NOW; 1003 $LAST_REFRESH = $NOW;
940} 1004}
941 1005
942my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1006my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
943 $NOW = time; 1007 $NOW = time;
… …
945 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1009 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
946 for CFClient::SDL_PollEvent; 1010 for CFClient::SDL_PollEvent;
947 1011
948 if (%animate_object) { 1012 if (%animate_object) {
949 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1013 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
950 $want_refresh++; 1014 $WANT_REFRESH++;
951 } 1015 }
952 1016
953 if ($want_refresh) { 1017 if ($WANT_REFRESH) {
954 force_refresh; 1018 force_refresh;
955 } else { 1019 } else {
956 $can_refresh = 1; 1020 $CAN_REFRESH = 1;
957 } 1021 }
958}); 1022});
959
960sub refresh {
961 $want_refresh++;
962}
963 1023
964sub animation_start { 1024sub animation_start {
965 my ($widget) = @_; 1025 my ($widget) = @_;
966 $animate_object{$widget} = $widget; 1026 $animate_object{$widget} = $widget;
967} 1027}
… …
973 1033
974@conn::ISA = Crossfire::Protocol::; 1034@conn::ISA = Crossfire::Protocol::;
975 1035
976sub conn::stats_update { 1036sub conn::stats_update {
977 my ($self, $stats) = @_; 1037 my ($self, $stats) = @_;
1038
1039 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1040 my $diff = $exp - $self->{prev_exp};
1041 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1042 if exists $self->{prev_exp} && $diff;
1043 $self->{prev_exp} = $exp;
1044 }
978 1045
979 update_stats_window ($stats); 1046 update_stats_window ($stats);
980} 1047}
981 1048
982sub conn::user_send { 1049sub conn::user_send {
… …
1279 [0.55, 0.41, 0.13], 1346 [0.55, 0.41, 0.13],
1280 [0.99, 0.77, 0.26], 1347 [0.99, 0.77, 0.26],
1281 [0.74, 0.65, 0.41], 1348 [0.74, 0.65, 0.41],
1282 ); 1349 );
1283 1350
1351 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1352
1353 $text = CFClient::UI::Label::escape $text;
1354 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1355 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1356
1284 $LOGVIEW->add_paragraph ($color[$color], $text); 1357 $LOGVIEW->add_paragraph ($color[$color],
1358 join "\n", map "$time $_", split /\n/, $text);
1359
1360 $STATUSBOX->add ($text,
1361 group => $text,
1362 fg => $color[$color],
1363 timeout => 60,
1364 tooltip_font => $::FONT_FIXED,
1365 );
1366}
1367
1368sub conn::drawextinfo {
1369 my ($self, $color, $type, $subtype, $message) = @_;
1370
1371 $self->drawinfo ($color, $message);
1285} 1372}
1286 1373
1287sub conn::spell_add { 1374sub conn::spell_add {
1288 my ($self, $spell) = @_; 1375 my ($self, $spell) = @_;
1289 1376
1290 # TODO 1377 # TODO
1291 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1378 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1292 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1379 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1293 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1380 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1294} 1381}
1295 1382
1296sub conn::spell_delete { 1383sub conn::spell_delete {
1297 my ($self, $spell) = @_; 1384 my ($self, $spell) = @_;
1298} 1385}
1299 1386
1300sub conn::addme_success { 1387sub conn::addme_success {
1301 my ($self) = @_; 1388 my ($self) = @_;
1302 1389
1390 $MAPWIDGET->clr_commands;
1391
1303 for my $skill (values %{$self->{skill_info}}) { 1392 for my $skill (values %{$self->{skill_info}}) {
1304 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1393 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'");
1305 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1394 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
1306 } 1395 }
1396
1397 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
1398 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
1399 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1400 $MAPWIDGET->add_command ("killpets", "Kill your pets");
1401 $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
1402 $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
1403 $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
1404
1405 my $parser = new Pod::POM;
1406 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1407
1408 for my $head2 ($pod->head2) {
1409 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1410 or next;
1411
1412 my $cmd = $1;
1413 my @args = split /\|/, $2;
1414 @args = (".*") unless @args;
1415
1416 my $text = CFClient::pod_to_pango $head2;
1417
1418 for my $arg (@args) {
1419 $arg = $arg eq ".*" ? "" : " $arg";
1420
1421 $MAPWIDGET->add_command ("$cmd$arg", $text);
1422 }
1423 }
1424}
1425
1426sub conn::eof {
1427 $MAPWIDGET->clr_commands;
1428
1429 stop_game;
1307} 1430}
1308 1431
1309sub update_floorbox { 1432sub update_floorbox {
1310 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1433 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1434 return unless $CONN;
1435
1311 $FLOORBOX->clear; 1436 $FLOORBOX->clear;
1312 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1437 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1313 1438
1314 my @items = values %{ $CONN->{container}{0} }; 1439 my $count = 4;
1315 1440 for (@{ $CONN->{container}{0} }) {
1316 # we basically have to use the same sorting as everybody else 1441 if (--$count) {
1317 @items = sort { $a->{type} <=> $b->{type} } @items; 1442 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1318 1443 } else {
1319 for my $item (reverse @items) { 1444 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1320 my $desc = $item->{nrof} < 2
1321 ? $item->{name}
1322 : "$item->{nrof} $item->{name_pl}";
1323 # todo: animation widget, face widget, weight(?) etc.
1324 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1325 tooltip => (CFClient::UI::Label->escape ($desc)
1326 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1327 can_hover => 1,
1328 can_events => 1,
1329 connect_button_down => sub {
1330 my ($self, $ev, $x, $y) = @_;
1331
1332 # todo: maybe put examine on 1? but should just be a tooltip :(
1333 if ($ev->{button} == 1) {
1334 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1335 } elsif ($ev->{button} == 2) {
1336 $CONN->send ("apply $item->{tag}");
1337 } elsif ($ev->{button} == 3) {
1338 CFClient::UI::Menu->new (
1339 items => [
1340 ["examine", sub { $CONN->send ("examine $item->{tag}") }],
1341 [
1342 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
1343 sub { $CONN->send ("lock $item->{tag}") },
1344 ],
1345 ["mark", sub { $CONN->send ("mark $item->{tag}") }],
1346 ["apply", sub { $CONN->send ("apply $item->{tag}") }],
1347 ],
1348 )->popup ($ev);
1349 }
1350
1351 1
1352 }, 1445 last;
1353 );
1354
1355 $hbox->add (new CFClient::UI::Face
1356 can_events => 0,
1357 face => $item->{face},
1358 anim => $item->{anim},
1359 animspeed => $item->{animspeed},
1360 );
1361 1446 }
1362 $hbox->add (new CFClient::UI::Label
1363 can_events => 0,
1364 text => $desc,
1365 );
1366 } 1447 }
1367 }); 1448 });
1368 refresh; 1449
1450 $WANT_REFRESH++;
1369} 1451}
1370 1452
1371sub conn::container_add { 1453sub conn::container_add {
1372 my ($self, $id, $items) = @_; 1454 my ($self, $tag, $items) = @_;
1373 1455
1374 update_floorbox if $id == 0; 1456 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1457
1458 if ($tag == 0) {
1459 update_floorbox;
1460 $OPENCONT = 0;
1461 $INVR_LBL->set_text ("Floor");
1462 $INVR->set_items ($self->{container}{0});
1463 } elsif ($tag == $self->{player}{tag}) {
1464 $INVR_LBL->set_text ("Player");
1465 $INV->set_items ($self->{container}{$self->{player}{tag}})
1466 } else {
1467 $OPENCONT = $tag;
1468 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1469 $INVR->set_items ($self->{container}{$tag});
1470 }
1471
1375 # $self-<{player}{tag} => player inv 1472 # $self-<{player}{tag} => player inv
1376 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1473 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1377} 1474}
1378 1475
1379sub conn::container_clear { 1476sub conn::container_clear {
1380 my ($self, $id) = @_; 1477 my ($self, $tag) = @_;
1381 1478
1382 update_floorbox if $id == 0; 1479 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1480
1481 if ($tag == 0) {
1482 update_floorbox;
1483 $OPENCONT = 0;
1484 $INVR_LBL->set_text ("Floor");
1485 $INVR->set_items ($self->{container}{0});
1486 } elsif ($tag == $self->{player}{tag}) {
1487 $INVR_LBL->set_text ("Player");
1488 $INV->set_items ($self->{container}{$tag})
1489 } else {
1490 $OPENCONT = $tag;
1491 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1492 $INVR->set_items ($self->{container}{$tag});
1493 }
1494
1383# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1495# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1384} 1496}
1385 1497
1386sub conn::item_delete { 1498sub conn::item_delete {
1387 my ($self, @items) = @_; 1499 my ($self, @items) = @_;
1388 1500
1389 for (@items) { 1501 for (@items) {
1390 update_floorbox if $_->{container} == 0; 1502 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1503
1504 if ($_->{container} == 0) {
1505 update_floorbox;
1506 $OPENCONT = 0;
1507 $INVR_LBL->set_text ("Floor");
1508 $INVR->set_items ($self->{container}{0});
1509 } elsif ($_->{container} == $self->{player}{tag}) {
1510 $INVR_LBL->set_text ("Player");
1511 $INV->set_items ($self->{container}{$self->{player}{tag}})
1512 } else {
1513 $OPENCONT = $_->{container};
1514 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1515 $INVR->set_items ($self->{container}{$_->{container}});
1516 }
1391 } 1517 }
1392} 1518}
1393 1519
1394sub conn::item_update { 1520sub conn::item_update {
1395 my ($self, $item) = @_; 1521 my ($self, $item) = @_;
1396 1522
1397 update_floorbox if $item->{container} == 0; 1523 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1524
1525 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1526 $OPENCONT = 0;
1527 $INVR_LBL->set_text ("Floor");
1528 $INVR->set_items ($self->{container}{0});
1529
1530 $item->{widget}->update_item
1531 if $item->{widget};
1532 } else {
1533 if ($item->{container} == 0) {
1534 update_floorbox;
1535 $OPENCONT = 0;
1536 $INVR_LBL->set_text ("Floor");
1537 $INVR->set_items ($self->{container}{0});
1538 } elsif ($item->{container} == $self->{player}{tag}) {
1539 $INV->set_items ($self->{container}{$item->{container}})
1540 }
1541 }
1398} 1542}
1399 1543
1400%SDL_CB = ( 1544%SDL_CB = (
1401 CFClient::SDL_QUIT => sub { 1545 CFClient::SDL_QUIT => sub {
1402 Event::unloop -1; 1546 Event::unloop -1;
1403 }, 1547 },
1404 CFClient::SDL_VIDEORESIZE => sub { 1548 CFClient::SDL_VIDEORESIZE => sub {
1405 }, 1549 },
1406 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1550 CFClient::SDL_VIDEOEXPOSE => sub {
1551 $WANT_REFRESH++;
1552 },
1407 CFClient::SDL_ACTIVEEVENT => sub { 1553 CFClient::SDL_ACTIVEEVENT => sub {
1408# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1554# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1409 }, 1555 },
1410 CFClient::SDL_KEYDOWN => sub { 1556 CFClient::SDL_KEYDOWN => sub {
1411 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1557 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1415 video_init; 1561 video_init;
1416 } else { 1562 } else {
1417 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1563 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1418 } 1564 }
1419 }, 1565 },
1420 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1566 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1421 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1567 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1422 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1568 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1423 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1569 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1424 CFClient::SDL_USEREVENT => \&audio_music_finished, 1570 CFClient::SDL_USEREVENT => sub {
1571 if ($_[0]{code} == 1) {
1572 audio_channel_finished $_[0]{data1};
1573 } elsif ($_[0]{code} == 0) {
1574 audio_music_finished;
1575 }
1576 },
1425); 1577);
1426 1578
1427############################################################################# 1579#############################################################################
1428 1580
1429$SIG{INT} = $SIG{TERM} = sub { exit }; 1581$SIG{INT} = $SIG{TERM} = sub { exit };
1430 1582
1431$TILECACHE = CFClient::db_table "tilecache";
1432$FACEMAP = CFClient::db_table "facemap";
1433
1434CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1435
1436my %DEF_CFG = (
1437 sdl_mode => 0,
1438 width => 640,
1439 height => 480,
1440 fullscreen => 0,
1441 fast => 0,
1442 map_scale => 0.5,
1443 fow_enable => 1,
1444 fow_intensity => 0.45,
1445 fow_smooth => 0,
1446 gui_fontsize => 1,
1447 log_fontsize => 1,
1448 gauge_fontsize => 1,
1449 gauge_size => 0.35,
1450 stat_fontsize => 1,
1451 mapsize => 100,
1452 host => "crossfire.schmorp.de",
1453 say_command => 'say',
1454 audio_enable => 1,
1455 bgm_enable => 1,
1456 bgm_volume => 0.25,
1457);
1458
1459while (my ($k, $v) = each %DEF_CFG) {
1460 $CFG->{$k} = $v unless exists $CFG->{$k};
1461}
1462
1463sdl_init;
1464
1465@SDL_MODES = reverse
1466 grep $_->[0] >= 640 && $_->[1] >= 480,
1467 CFClient::SDL_ListModes;
1468
1469@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1470
1471$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1472
1473{ 1583{
1584 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1585
1586 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1587
1588 $TILECACHE = CFClient::db_table "tilecache";
1589 $FACEMAP = CFClient::db_table "facemap";
1590
1591 my %DEF_CFG = (
1592 sdl_mode => 0,
1593 width => 640,
1594 height => 480,
1595 fullscreen => 0,
1596 fast => 0,
1597 map_scale => 0.5,
1598 fow_enable => 1,
1599 fow_intensity => 0.45,
1600 fow_smooth => 0,
1601 gui_fontsize => 1,
1602 log_fontsize => 1,
1603 gauge_fontsize=> 1,
1604 gauge_size => 0.35,
1605 stat_fontsize => 1,
1606 mapsize => 100,
1607 host => "crossfire.schmorp.de",
1608 say_command => 'say',
1609 audio_enable => 1,
1610 bgm_enable => 1,
1611 bgm_volume => 0.25,
1612 );
1613
1614 while (my ($k, $v) = each %DEF_CFG) {
1615 $CFG->{$k} = $v unless exists $CFG->{$k};
1616 }
1617
1618 sdl_init;
1619
1620 @SDL_MODES = reverse
1621 grep $_->[0] >= 640 && $_->[1] >= 480,
1622 CFClient::SDL_ListModes;
1623
1624 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1625
1626 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1627
1628 {
1474 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1629 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1475 DejaVuSans.ttf 1630 DejaVuSans.ttf
1476 DejaVuSansMono.ttf 1631 DejaVuSansMono.ttf
1477 DejaVuSans-Bold.ttf 1632 DejaVuSans-Bold.ttf
1478 DejaVuSansMono-Bold.ttf 1633 DejaVuSansMono-Bold.ttf
1479 DejaVuSans-Oblique.ttf 1634 DejaVuSans-Oblique.ttf
1480 DejaVuSansMono-Oblique.ttf 1635 DejaVuSansMono-Oblique.ttf
1481 DejaVuSans-BoldOblique.ttf 1636 DejaVuSans-BoldOblique.ttf
1482 DejaVuSansMono-BoldOblique.ttf 1637 DejaVuSansMono-BoldOblique.ttf
1483 ); 1638 );
1484 1639
1485 CFClient::add_font $_ for @fonts; 1640 CFClient::add_font $_ for @fonts;
1486 1641
1642 CFClient::pango_init;
1643
1487 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1644 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1488 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1645 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1489 1646
1490 $FONT_PROP->make_default; 1647 $FONT_PROP->make_default;
1491} 1648 }
1492 1649
1650# compare mono (ft) vs. rgba (cairo)
1651# ft - 1.8s, cairo 3s, even in alpha-only mode
1652# for my $rgba (0..1) {
1653# my $t1 = Time::HiRes::time;
1654# for (1..1000) {
1655# my $layout = CFClient::Layout->new ($rgba);
1656# $layout->set_text ("hallo" x 100);
1657# $layout->render;
1658# }
1659# my $t2 = Time::HiRes::time;
1660# warn $t2-$t1;
1661# }
1662
1493video_init; 1663 video_init;
1494audio_init; 1664 audio_init;
1665}
1495 1666
1496Event::loop; 1667Event::loop;
1497 1668
1498END { CFClient::SDL_Quit } 1669END { CFClient::SDL_Quit }
1499 1670

Diff Legend

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