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.197 by root, Fri May 5 19:05:47 2006 UTC vs.
Revision 1.226 by root, Wed May 17 20:21:28 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
97our $INVWIN; 103our $INVWIN;
98our $INV; 104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
99 108
100sub status { 109sub status {
101 $STATUS_LINE->set_text ($_[0]); 110 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
102 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
103} 111}
104 112
105sub debug { 113sub debug {
106 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
107 $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);
108} 117}
109 118
110sub start_game { 119sub start_game {
111 status "logging in..."; 120 status "logging in...";
112 121
113 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;
114 123
115 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
116
117 $MAP = new CFClient::Map $mapsize, $mapsize; 125 $MAP = new CFClient::Map $mapsize, $mapsize;
118 126
119 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
120 128
121 $CONN = eval { 129 $CONN = eval {
… …
128 maph => $mapsize, 136 maph => $mapsize,
129 ; 137 ;
130 }; 138 };
131 139
132 if ($CONN) { 140 if ($CONN) {
141 CFClient::lowdelay fileno $CONN->{fh};
142
143 $LOGIN_BUTTON->set_text ("Logout");
133 status "login successful"; 144 status "login successful";
134 145
135 CFClient::lowdelay fileno $CONN->{fh}; 146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
136 } else { 149 } else {
137 status "unable to connect"; 150 status "unable to connect";
151 stop_game();
138 } 152 }
139} 153}
140 154
141sub stop_game { 155sub stop_game {
156 return unless $CONN;
157
158 status "connection closed";
159 $LOGIN_BUTTON->set_text ("Login");
160 $CONN->destroy;
161 $CONN = 0; # false, does not autovivify
162
163 $BUTTONBAR->{children}[1]->emit ("activate")
164 unless $BUTTONBAR->{children}[1]->{state};
165
166 undef $MAPCACHE;
142 undef $CONN; 167 undef $MAP;
143} 168}
144 169
145sub client_setup { 170sub client_setup {
146 my $dialog = new CFClient::UI::FancyFrame 171 my $dialog = new CFClient::UI::FancyFrame
147 title => "Client Setup", 172 title => "Client Setup",
… …
149 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 174 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
150 175
151 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 176 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
152 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
153 178
154 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 179 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
155 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 180 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
156 181
157 $mode_slider->connect (changed => sub { 182 $mode_slider->connect (changed => sub {
158 my ($self, $value) = @_; 183 my ($self, $value) = @_;
159 184
… …
184 } 209 }
185 ); 210 );
186 211
187 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
188 $table->add (1, $row++, new CFClient::UI::Slider 213 $table->add (1, $row++, new CFClient::UI::Slider
189 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 214 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
190 tooltip => "Enlarge or shrink the displayed map", 215 tooltip => "Enlarge or shrink the displayed map",
191 connect_changed => sub { 216 connect_changed => sub {
192 my ($self, $value) = @_; 217 my ($self, $value) = @_;
193 $CFG->{map_scale} = 0.05 * int $value / 0.05; 218 $CFG->{map_scale} = $value;
194 } 219 }
195 ); 220 );
196 221
197 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
198 $table->add (1, $row++, new CFClient::UI::CheckBox 223 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
225 } 250 }
226 ); 251 );
227 252
228 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
229 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
230 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
231 tooltip => "The font size used by most GUI elements", 256 tooltip => "The font size used by most GUI elements",
232 connect_changed => sub { 257 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
233 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
234# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
235 }
236 ); 258 );
237 259
238 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 260 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
239 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
240 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
241 tooltip => "The font size used by the server log window only", 263 tooltip => "The font size used by the server log window only",
242 connect_changed => sub { 264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
243 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
244 }
245 ); 265 );
246 266
247 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 267 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
248 268
249 $table->add (1, $row++, new CFClient::UI::Slider 269 $table->add (1, $row++, new CFClient::UI::Slider
250 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
251 tooltip => "The font size used by the statistics window only", 271 tooltip => "The font size used by the statistics window only",
252 connect_changed => sub { 272 connect_changed => sub {
253 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 273 $CFG->{stat_fontsize} = $_[1];
254 &set_stats_window_fontsize; 274 &set_stats_window_fontsize;
255 } 275 }
256 ); 276 );
257 277
258 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
259 $table->add (1, $row++, new CFClient::UI::Slider 279 $table->add (1, $row++, new CFClient::UI::Slider
260 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 280 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
261 tooltip => "Adjust the size of the stats gauges at the bottom right", 281 tooltip => "Adjust the size of the stats gauges at the bottom right",
262 connect_changed => sub { 282 connect_changed => sub {
263 $CFG->{gauge_size} = $_[1]; 283 $CFG->{gauge_size} = $_[1];
264 my $h = int $HEIGHT * $CFG->{gauge_size}; 284 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
265 $GAUGES->{win}->set_size ($WIDTH, $h);
266 $GAUGES->{win}->move (0, $HEIGHT - $h);
267 } 285 }
268 ); 286 );
269 287
270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
271 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 290 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
273 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 291 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
274 connect_changed => sub { 292 connect_changed => sub {
275 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 293 $CFG->{gauge_fontsize} = $_[1];
276 &set_gauge_window_fontsize; 294 &set_gauge_window_fontsize;
277 } 295 }
278 ); 296 );
279 297
280 $table->add (1, $row++, new CFClient::UI::Button 298 $table->add (1, $row++, new CFClient::UI::Button
… …
354# local $GAUGES->{win}{parent};#d# 372# local $GAUGES->{win}{parent};#d#
355# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 373# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
356} 374}
357 375
358sub make_gauge_window { 376sub make_gauge_window {
359 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 377 my $gh = int $HEIGHT * $CFG->{gauge_size};
360# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
361 378
362 my $win = new CFClient::UI::Frame ( 379 my $win = new CFClient::UI::Frame (
363 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 380 req_y => -1,
381 user_w => $WIDTH,
382 user_h => $gh,
364 ); 383 );
384
365 $win->add (my $hbox = new CFClient::UI::HBox 385 $win->add (my $hbox = new CFClient::UI::HBox
366 children => [ 386 children => [
367 (new CFClient::UI::HBox expand => 1), 387 (new CFClient::UI::HBox expand => 1),
368 ($FLOORBOX = new CFClient::UI::VBox), 388 (new CFClient::UI::VBox children => [
389 (new CFClient::UI::Empty expand => 1),
390 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
391 ]),
369 (my $vbox = new CFClient::UI::VBox), 392 (my $vbox = new CFClient::UI::VBox),
370 ], 393 ],
371 ); 394 );
372 395
373 $vbox->add (new CFClient::UI::HBox 396 $vbox->add (new CFClient::UI::HBox
… …
571 594
572} 595}
573 596
574sub metaserver_dialog { 597sub metaserver_dialog {
575 my $dialog = new CFClient::UI::FancyFrame 598 my $dialog = new CFClient::UI::FancyFrame
576 title => "Metaserver", 599 title => "Server List",
577 child => (my $vbox = new CFClient::UI::VBox); 600 child => (my $vbox = new CFClient::UI::VBox);
578 601
579 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 602 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
580 603
581 $dialog 604 $dialog
… …
650 $HOST->set_text ($CFG->{host} = $host); 673 $HOST->set_text ($CFG->{host} = $host);
651 }), 674 }),
652 (new CFClient::UI::Empty expand => 1), 675 (new CFClient::UI::Empty expand => 1),
653 ]); 676 ]);
654 677
655 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 678 $table->add ($_ + 1, $y, new CFClient::UI::Label
679 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
656 for 0 .. $#$m; 680 for 0 .. $#$m;
657 } 681 }
658 } 682 }
659 }); 683 });
660} 684}
… …
683 707
684 $METASERVER = metaserver_dialog; 708 $METASERVER = metaserver_dialog;
685 709
686 $vbox->add (new CFClient::UI::Flopper 710 $vbox->add (new CFClient::UI::Flopper
687 expand => 1, 711 expand => 1,
688 text => "Metaserver", 712 text => "Server List",
689 other => $METASERVER, 713 other => $METASERVER,
690 tooltip => "Show a list of avaible crossfire servers", 714 tooltip => "Show a list of available crossfire servers",
691 connect_open => sub { 715 connect_open => sub {
692 update_metaserver $HOST; 716 update_metaserver $HOST;
693 } 717 }
694 ); 718 );
695 } 719 }
… …
716 ); 740 );
717 741
718 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 742 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
719 $table->add (1, 7, new CFClient::UI::Slider 743 $table->add (1, 7, new CFClient::UI::Slider
720 req_w => 100, 744 req_w => 100,
721 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 745 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
722 tooltip => "This is the size of the portion of the map update the server sends you. " 746 tooltip => "This is the size of the portion of the map update the server sends you. "
723 ."If you set this to a high value you will be able to see further for example.", 747 ."If you set this to a high value you will be able to see further for example.",
724 connect_changed => sub { 748 connect_changed => sub {
725 my ($self, $value) = @_; 749 my ($self, $value) = @_;
726 750
727 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 751 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
728 }, 752 },
729 ); 753 );
730 754
731 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 755 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
732 start_game; 756 $table->add (1, 8, new CFClient::UI::Entry
757 text => $CFG->{output_count},
758 tooltip => "Should be set to 1 unless you know what you are doing",
759 connect_changed => sub { $CFG->{output_count} = $_[1] },
733 }); 760 );
761
762 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
763 $table->add (1, 9, new CFClient::UI::Entry
764 text => $CFG->{output_sync},
765 tooltip => "Should be set to 1 unless you know what you are doing",
766 connect_changed => sub { $CFG->{output_sync} = $_[1] },
767 );
768
769 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
770 expand => 1,
771 align => 0,
772 text => "Login",
773 connect_activate => sub {
774 $CONN ? stop_game
775 : start_game;
776 },
777 );
734 778
735 $dialog 779 $dialog
736} 780}
737 781
738sub message_window { 782sub message_window {
… …
788 832
789 $window 833 $window
790} 834}
791 835
792sub make_inventory_window { 836sub make_inventory_window {
793 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 837 my $invwin = new CFClient::UI::FancyFrame
838 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
839
840 $invwin->add (my $hb = new CFClient::UI::HBox);
841
842 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
843 $vb1->add (my $lbl = new CFClient::UI::Label);
844 $lbl->set_text ("Player");
794 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); 845 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
846
847 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
848 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
849 $INVR_LBL->set_text ("Floor");
850 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
851
795 $invwin 852 $invwin
796} 853}
797 854
798sub sdl_init { 855sub sdl_init {
799 CFClient::SDL_Init 856 CFClient::SDL_Init
… …
811 868
812 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 869 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
813 or die "SDL_SetVideoMode failed!\n"; 870 or die "SDL_SetVideoMode failed!\n";
814 871
815 $SDL_ACTIVE = 1; 872 $SDL_ACTIVE = 1;
816
817 $LAST_REFRESH = time - 0.01; 873 $LAST_REFRESH = time - 0.01;
818 874
819 CFClient::gl_init; 875 CFClient::gl_init;
820 876
821 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 877 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
822 878
879 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
880
823 ############################################################################# 881 #############################################################################
824 882
883 unless ($DEBUG_STATUS) {
884 # create the widgets
885
825 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 886 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
826 $DEBUG_STATUS->show; 887 $DEBUG_STATUS->show;
827 888
828 $STATUS_LINE = new CFClient::UI::Label 889 $STATUSBOX = new CFClient::UI::Statusbox;
829 padding => 0, 890 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
830 y => $HEIGHT - $FONTSIZE * 1.8;
831 $STATUS_LINE->show;
832 891
833 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 892 (new CFClient::UI::Frame
834 padding => 0, 893 bg => [0, 0, 0, 0.4],
835 fontsize => 0.8, 894 req_y => -1,
836 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 895 child => $STATUSBOX,
837 $ALT_ENTER_MESSAGE->show; 896 )->show;
838 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
839 897
840 CFClient::UI::FancyFrame->new ( 898 CFClient::UI::FancyFrame->new (
841 border_bg => [1, 1, 1, 192/255], 899 border_bg => [1, 1, 1, 192/255],
842 bg => [1, 1, 1, 0], 900 bg => [1, 1, 1, 0],
843 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 901 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
844 )->show; 902 )->show;
845 903
846 $MAPWIDGET = new CFClient::MapWidget; 904 $MAPWIDGET = new CFClient::MapWidget;
847 $MAPWIDGET->connect (activate_console => sub { 905 $MAPWIDGET->connect (activate_console => sub {
848 my ($mapwidget, $preset) = @_; 906 my ($mapwidget, $preset) = @_;
849 907
850 if ($CONSOLE) { 908 if ($CONSOLE) {
851 $CONSOLE->{input}->{auto_activated} = 1; 909 $CONSOLE->{input}->{auto_activated} = 1;
852 $CONSOLE->{input}->focus_in; 910 $CONSOLE->{input}->focus_in;
853 911
854 if ($preset && $CONSOLE->{input}->get_text eq '') { 912 if ($preset && $CONSOLE->{input}->get_text eq '') {
855 $CONSOLE->{input}->set_text ($preset); 913 $CONSOLE->{input}->set_text ($preset);
914 }
856 } 915 }
857 } 916 });
858 });
859 $MAPWIDGET->show; 917 $MAPWIDGET->show;
860 $MAPWIDGET->focus_in; 918 $MAPWIDGET->focus_in;
861 919
862 $BUTTONBAR = new CFClient::UI::HBox; 920 $BUTTONBAR = new CFClient::UI::HBox;
863 921
864 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 922 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
865 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 923 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
866 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 924 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
867 925
868 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 926 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
869 927
870 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 928 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
871 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 929 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
872 930
873 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 931 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
874 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 932 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
875 status "Configuration Saved"; 933 status "Configuration Saved";
876 }); 934 });
877 935
878 $BUTTONBAR->show; 936 $BUTTONBAR->show;
879 937
938 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
939
940 # delay till geometry is constant
941 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
880 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 942 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
943 my $widget = $GAUGES->{win};
944 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
945 });
946 force_refresh ();
947 }
881} 948}
882 949
883sub video_shutdown { 950sub video_shutdown {
884 $CFClient::UI::ROOT->{children} = [];
885 undef $CFClient::UI::GRAB;
886 undef $CFClient::UI::HOVER;
887 undef $SDL_ACTIVE; 951 undef $SDL_ACTIVE;
888} 952}
889 953
890my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 954my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
891my $bgmusic;#TODO#hack#d# 955my $bgmusic;#TODO#hack#d#
956
957sub audio_channel_finished {
958 my ($channel) = @_;
959
960 #warn "channel $channel finished\n";#d#
961}
892 962
893sub audio_music_finished { 963sub audio_music_finished {
894 return unless $CFG->{bgm_enable}; 964 return unless $CFG->{bgm_enable};
895 965
896 # TODO: hack, do play loop and mood music 966 # TODO: hack, do play loop and mood music
… …
937} 1007}
938 1008
939my %animate_object; 1009my %animate_object;
940my $animate_timer; 1010my $animate_timer;
941 1011
942my $want_refresh;
943my $can_refresh;
944
945my $fps = 9; 1012my $fps = 9;
946 1013
947sub force_refresh { 1014sub force_refresh {
948 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1015 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
949 debug sprintf "%3.2f", $fps; 1016 debug sprintf "%3.2f", $fps;
950 1017
951 $want_refresh = 0;
952 $can_refresh = 0;
953
954 $CFClient::UI::ROOT->draw; 1018 $CFClient::UI::ROOT->draw;
955
956 CFClient::SDL_GL_SwapBuffers; 1019 CFClient::SDL_GL_SwapBuffers;
957 1020
1021 $WANT_REFRESH = 0;
1022 $CAN_REFRESH = 0;
958 $LAST_REFRESH = $NOW; 1023 $LAST_REFRESH = $NOW;
959} 1024}
960 1025
961my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1026my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
962 $NOW = time; 1027 $NOW = time;
… …
964 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1029 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
965 for CFClient::SDL_PollEvent; 1030 for CFClient::SDL_PollEvent;
966 1031
967 if (%animate_object) { 1032 if (%animate_object) {
968 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1033 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
969 $want_refresh++; 1034 $WANT_REFRESH++;
970 } 1035 }
971 1036
972 if ($want_refresh) { 1037 if ($WANT_REFRESH) {
973 force_refresh; 1038 force_refresh;
974 } else { 1039 } else {
975 $can_refresh = 1; 1040 $CAN_REFRESH = 1;
976 } 1041 }
977}); 1042});
978
979sub refresh {
980 $want_refresh++;
981}
982 1043
983sub animation_start { 1044sub animation_start {
984 my ($widget) = @_; 1045 my ($widget) = @_;
985 $animate_object{$widget} = $widget; 1046 $animate_object{$widget} = $widget;
986} 1047}
… …
990 delete $animate_object{$widget}; 1051 delete $animate_object{$widget};
991} 1052}
992 1053
993@conn::ISA = Crossfire::Protocol::; 1054@conn::ISA = Crossfire::Protocol::;
994 1055
1056sub conn::new {
1057 my $class = shift;
1058
1059 my $self = $class->Crossfire::Protocol::new (@_);
1060
1061 $MAPWIDGET->clr_commands;
1062
1063 my $parser = new Pod::POM;
1064 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1065
1066 for my $head2 ($pod->head2) {
1067 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1068 or next;
1069
1070 my $cmd = $1;
1071 my @args = split /\|/, $2;
1072 @args = (".*") unless @args;
1073
1074 my $text = CFClient::pod_to_pango $head2->content;
1075
1076 for my $arg (@args) {
1077 $arg = $arg eq ".*" ? "" : " $arg";
1078
1079 $MAPWIDGET->add_command ("$cmd$arg", $text);
1080 }
1081 }
1082
1083 $self
1084}
1085
995sub conn::stats_update { 1086sub conn::stats_update {
996 my ($self, $stats) = @_; 1087 my ($self, $stats) = @_;
1088
1089 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1090 my $diff = $exp - $self->{prev_exp};
1091 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1092 if exists $self->{prev_exp} && $diff;
1093 $self->{prev_exp} = $exp;
1094 }
997 1095
998 update_stats_window ($stats); 1096 update_stats_window ($stats);
999} 1097}
1000 1098
1001sub conn::user_send { 1099sub conn::user_send {
… …
1298 [0.55, 0.41, 0.13], 1396 [0.55, 0.41, 0.13],
1299 [0.99, 0.77, 0.26], 1397 [0.99, 0.77, 0.26],
1300 [0.74, 0.65, 0.41], 1398 [0.74, 0.65, 0.41],
1301 ); 1399 );
1302 1400
1401 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1402
1403 $text = CFClient::UI::Label::escape $text;
1404 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1405 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1406
1303 $LOGVIEW->add_paragraph ($color[$color], $text); 1407 $LOGVIEW->add_paragraph ($color[$color],
1408 join "\n", map "$time $_", split /\n/, $text);
1409
1410 $STATUSBOX->add ($text,
1411 group => $text,
1412 fg => $color[$color],
1413 timeout => 60,
1414 tooltip_font => $::FONT_FIXED,
1415 );
1416}
1417
1418sub conn::drawextinfo {
1419 my ($self, $color, $type, $subtype, $message) = @_;
1420
1421 $self->drawinfo ($color, $message);
1304} 1422}
1305 1423
1306sub conn::spell_add { 1424sub conn::spell_add {
1307 my ($self, $spell) = @_; 1425 my ($self, $spell) = @_;
1308 1426
1309 # TODO 1427 # TODO
1310 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1428 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1311 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1429 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1312 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1430 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1313} 1431}
1314 1432
1315sub conn::spell_delete { 1433sub conn::spell_delete {
1316 my ($self, $spell) = @_; 1434 my ($self, $spell) = @_;
1317} 1435}
1318 1436
1319sub conn::addme_success { 1437sub conn::addme_success {
1320 my ($self) = @_; 1438 my ($self) = @_;
1321 1439
1440 $self->send ("command output-sync $CFG->{output_sync}");
1441 $self->send ("command output-count $CFG->{output_count}");
1442
1322 for my $skill (values %{$self->{skill_info}}) { 1443 for my $skill (values %{$self->{skill_info}}) {
1323 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1444 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'");
1324 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1445 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
1325 } 1446 }
1447}
1448
1449sub conn::eof {
1450 $MAPWIDGET->clr_commands;
1451
1452 stop_game;
1326} 1453}
1327 1454
1328sub update_floorbox { 1455sub update_floorbox {
1329 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1456 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1457 return unless $CONN;
1458
1330 $FLOORBOX->clear; 1459 $FLOORBOX->clear;
1331 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1460 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1332 1461
1333 # we basically have to use the same sorting as everybody else 1462 my $count = 4;
1334 for my $item (@{ $CONN->{container}{0} }) { 1463 for (@{ $CONN->{container}{0} }) {
1464 if (--$count) {
1335 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item); 1465 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1466 } else {
1467 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1468 last;
1469 }
1336 } 1470 }
1337 }); 1471 });
1338 refresh; 1472
1473 $WANT_REFRESH++;
1339} 1474}
1340 1475
1341sub conn::container_add { 1476sub conn::container_add {
1342 my ($self, $id, $items) = @_; 1477 my ($self, $tag, $items) = @_;
1343 1478
1344 update_floorbox if $id == 0; 1479 #d# print "container_add: 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});
1345 if ($self->{player}{tag} == $id) { 1486 } elsif ($tag == $self->{player}{tag}) {
1487 $INVR_LBL->set_text ("Player");
1346 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1488 $INV->set_items ($self->{container}{$self->{player}{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});
1347 } 1493 }
1494
1348 # $self-<{player}{tag} => player inv 1495 # $self-<{player}{tag} => player inv
1349 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1496 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1350} 1497}
1351 1498
1352sub conn::container_clear { 1499sub conn::container_clear {
1353 my ($self, $id) = @_; 1500 my ($self, $tag) = @_;
1354 1501
1355 update_floorbox if $id == 0; 1502 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1356 if ($self->{player}{tag} == $id) { 1503
1504 if ($tag == 0) {
1505 update_floorbox;
1506 $OPENCONT = 0;
1507 $INVR_LBL->set_text ("Floor");
1357 $INV->set_items ($self->{container}{$id}); 1508 $INVR->set_items ($self->{container}{0});
1509 } elsif ($tag == $self->{player}{tag}) {
1510 $INVR_LBL->set_text ("Player");
1511 $INV->set_items ($self->{container}{$tag})
1512 } else {
1513 $OPENCONT = $tag;
1514 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1515 $INVR->set_items ($self->{container}{$tag});
1358 } 1516 }
1359 1517
1360# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1518# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1361} 1519}
1362 1520
1363sub conn::item_delete { 1521sub conn::item_delete {
1364 my ($self, @items) = @_; 1522 my ($self, @items) = @_;
1365 1523
1366 for (@items) { 1524 for (@items) {
1367 update_floorbox if $_->{container} == 0; 1525 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1368 if ($self->{player}{tag} == $_->{container}) { 1526
1527 if ($_->{container} == 0) {
1528 update_floorbox;
1529 $OPENCONT = 0;
1530 $INVR_LBL->set_text ("Floor");
1531 $INVR->set_items ($self->{container}{0});
1532 } elsif ($_->{container} == $self->{player}{tag}) {
1533 $INVR_LBL->set_text ("Player");
1534 $INV->set_items ($self->{container}{$self->{player}{tag}})
1535 } else {
1536 $OPENCONT = $_->{container};
1537 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1369 $INV->set_items ($self->{container}{$_->{container}}); 1538 $INVR->set_items ($self->{container}{$_->{container}});
1370 } 1539 }
1371 } 1540 }
1372} 1541}
1373 1542
1374sub conn::item_update { 1543sub conn::item_update {
1375 my ($self, $item) = @_; 1544 my ($self, $item) = @_;
1376 1545
1377 update_floorbox if $item->{container} == 0; 1546 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1378 if ($self->{player}{tag} == $item->{container}) { 1547
1548 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1549 $OPENCONT = 0;
1550 $INVR_LBL->set_text ("Floor");
1551 $INVR->set_items ($self->{container}{0});
1552
1553 $item->{widget}->update_item
1554 if $item->{widget};
1555 } else {
1556 if ($item->{container} == 0) {
1557 update_floorbox;
1558 $OPENCONT = 0;
1559 $INVR_LBL->set_text ("Floor");
1560 $INVR->set_items ($self->{container}{0});
1561 } elsif ($item->{container} == $self->{player}{tag}) {
1379 $INV->set_items ($self->{container}{$item->{container}}); 1562 $INV->set_items ($self->{container}{$item->{container}})
1563 }
1380 } 1564 }
1381} 1565}
1382 1566
1383%SDL_CB = ( 1567%SDL_CB = (
1384 CFClient::SDL_QUIT => sub { 1568 CFClient::SDL_QUIT => sub {
1385 Event::unloop -1; 1569 Event::unloop -1;
1386 }, 1570 },
1387 CFClient::SDL_VIDEORESIZE => sub { 1571 CFClient::SDL_VIDEORESIZE => sub {
1388 }, 1572 },
1389 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1573 CFClient::SDL_VIDEOEXPOSE => sub {
1574 $WANT_REFRESH++;
1575 },
1390 CFClient::SDL_ACTIVEEVENT => sub { 1576 CFClient::SDL_ACTIVEEVENT => sub {
1391# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1577# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1392 }, 1578 },
1393 CFClient::SDL_KEYDOWN => sub { 1579 CFClient::SDL_KEYDOWN => sub {
1394 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1580 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1398 video_init; 1584 video_init;
1399 } else { 1585 } else {
1400 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1586 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1401 } 1587 }
1402 }, 1588 },
1403 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1589 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1404 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1590 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1405 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1591 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1406 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1592 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1407 CFClient::SDL_USEREVENT => \&audio_music_finished, 1593 CFClient::SDL_USEREVENT => sub {
1594 if ($_[0]{code} == 1) {
1595 audio_channel_finished $_[0]{data1};
1596 } elsif ($_[0]{code} == 0) {
1597 audio_music_finished;
1598 }
1599 },
1408); 1600);
1409 1601
1410############################################################################# 1602#############################################################################
1411 1603
1412$SIG{INT} = $SIG{TERM} = sub { exit }; 1604$SIG{INT} = $SIG{TERM} = sub { exit };
1413 1605
1414CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1415
1416$TILECACHE = CFClient::db_table "tilecache";
1417$FACEMAP = CFClient::db_table "facemap";
1418
1419my %DEF_CFG = (
1420 sdl_mode => 0,
1421 width => 640,
1422 height => 480,
1423 fullscreen => 0,
1424 fast => 0,
1425 map_scale => 0.5,
1426 fow_enable => 1,
1427 fow_intensity => 0.45,
1428 fow_smooth => 0,
1429 gui_fontsize => 1,
1430 log_fontsize => 1,
1431 gauge_fontsize => 1,
1432 gauge_size => 0.35,
1433 stat_fontsize => 1,
1434 mapsize => 100,
1435 host => "crossfire.schmorp.de",
1436 say_command => 'say',
1437 audio_enable => 1,
1438 bgm_enable => 1,
1439 bgm_volume => 0.25,
1440);
1441
1442while (my ($k, $v) = each %DEF_CFG) {
1443 $CFG->{$k} = $v unless exists $CFG->{$k};
1444}
1445
1446sdl_init;
1447
1448@SDL_MODES = reverse
1449 grep $_->[0] >= 640 && $_->[1] >= 480,
1450 CFClient::SDL_ListModes;
1451
1452@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1453
1454$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1455
1456{ 1606{
1607 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1608
1609 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1610
1611 $TILECACHE = CFClient::db_table "tilecache";
1612 $FACEMAP = CFClient::db_table "facemap";
1613
1614 my %DEF_CFG = (
1615 sdl_mode => 0,
1616 width => 640,
1617 height => 480,
1618 fullscreen => 0,
1619 fast => 0,
1620 map_scale => 0.5,
1621 fow_enable => 1,
1622 fow_intensity => 0.45,
1623 fow_smooth => 0,
1624 gui_fontsize => 1,
1625 log_fontsize => 1,
1626 gauge_fontsize=> 1,
1627 gauge_size => 0.35,
1628 stat_fontsize => 1,
1629 mapsize => 100,
1630 host => "crossfire.schmorp.de",
1631 say_command => 'say',
1632 audio_enable => 1,
1633 bgm_enable => 1,
1634 bgm_volume => 0.25,
1635 output_sync => 1,
1636 output_count => 1,
1637 );
1638
1639 while (my ($k, $v) = each %DEF_CFG) {
1640 $CFG->{$k} = $v unless exists $CFG->{$k};
1641 }
1642
1643 sdl_init;
1644
1645 @SDL_MODES = reverse
1646 grep $_->[0] >= 640 && $_->[1] >= 480,
1647 CFClient::SDL_ListModes;
1648
1649 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1650
1651 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1652
1653 {
1457 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1654 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1458 DejaVuSans.ttf 1655 DejaVuSans.ttf
1459 DejaVuSansMono.ttf 1656 DejaVuSansMono.ttf
1460 DejaVuSans-Bold.ttf 1657 DejaVuSans-Bold.ttf
1461 DejaVuSansMono-Bold.ttf 1658 DejaVuSansMono-Bold.ttf
1462 DejaVuSans-Oblique.ttf 1659 DejaVuSans-Oblique.ttf
1463 DejaVuSansMono-Oblique.ttf 1660 DejaVuSansMono-Oblique.ttf
1464 DejaVuSans-BoldOblique.ttf 1661 DejaVuSans-BoldOblique.ttf
1465 DejaVuSansMono-BoldOblique.ttf 1662 DejaVuSansMono-BoldOblique.ttf
1466 ); 1663 );
1467 1664
1468 CFClient::add_font $_ for @fonts; 1665 CFClient::add_font $_ for @fonts;
1469 1666
1667 CFClient::pango_init;
1668
1470 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1669 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1471 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1670 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1472 1671
1473 $FONT_PROP->make_default; 1672 $FONT_PROP->make_default;
1474} 1673 }
1475 1674
1675# compare mono (ft) vs. rgba (cairo)
1676# ft - 1.8s, cairo 3s, even in alpha-only mode
1677# for my $rgba (0..1) {
1678# my $t1 = Time::HiRes::time;
1679# for (1..1000) {
1680# my $layout = CFClient::Layout->new ($rgba);
1681# $layout->set_text ("hallo" x 100);
1682# $layout->render;
1683# }
1684# my $t2 = Time::HiRes::time;
1685# warn $t2-$t1;
1686# }
1687
1476video_init; 1688 video_init;
1477audio_init; 1689 audio_init;
1690}
1478 1691
1479Event::loop; 1692Event::loop;
1480 1693
1481END { CFClient::SDL_Quit } 1694END { CFClient::SDL_Quit }
1482 1695

Diff Legend

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