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.198 by root, Fri May 5 19:10:16 2006 UTC vs.
Revision 1.225 by root, Wed May 17 16:17:01 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 (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
756 expand => 1,
757 align => 0,
758 text => "Login",
759 connect_activate => sub {
760 $CONN ? stop_game
732 start_game; 761 : start_game;
762 },
733 }); 763 );
734 764
735 $dialog 765 $dialog
736} 766}
737 767
738sub message_window { 768sub message_window {
… …
788 818
789 $window 819 $window
790} 820}
791 821
792sub make_inventory_window { 822sub make_inventory_window {
793 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 823 my $invwin = new CFClient::UI::FancyFrame
824 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
825
826 $invwin->add (my $hb = new CFClient::UI::HBox);
827
828 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
829 $vb1->add (my $lbl = new CFClient::UI::Label);
830 $lbl->set_text ("Player");
794 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); 831 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
832
833 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
834 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
835 $INVR_LBL->set_text ("Floor");
836 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
837
795 $invwin 838 $invwin
796} 839}
797 840
798sub sdl_init { 841sub sdl_init {
799 CFClient::SDL_Init 842 CFClient::SDL_Init
… …
811 854
812 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 855 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
813 or die "SDL_SetVideoMode failed!\n"; 856 or die "SDL_SetVideoMode failed!\n";
814 857
815 $SDL_ACTIVE = 1; 858 $SDL_ACTIVE = 1;
816
817 $LAST_REFRESH = time - 0.01; 859 $LAST_REFRESH = time - 0.01;
818 860
819 CFClient::gl_init; 861 CFClient::gl_init;
820 862
821 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 863 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
822 864
865 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
866
823 ############################################################################# 867 #############################################################################
824 868
869 unless ($DEBUG_STATUS) {
870 # create the widgets
871
825 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 872 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
826 $DEBUG_STATUS->show; 873 $DEBUG_STATUS->show;
827 874
828 $STATUS_LINE = new CFClient::UI::Label 875 $STATUSBOX = new CFClient::UI::Statusbox;
829 padding => 0, 876 $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 877
833 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 878 (new CFClient::UI::Frame
834 padding => 0, 879 bg => [0, 0, 0, 0.4],
835 fontsize => 0.8, 880 req_y => -1,
836 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 881 child => $STATUSBOX,
837 $ALT_ENTER_MESSAGE->show; 882 )->show;
838 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
839 883
840 CFClient::UI::FancyFrame->new ( 884 CFClient::UI::FancyFrame->new (
841 border_bg => [1, 1, 1, 192/255], 885 border_bg => [1, 1, 1, 192/255],
842 bg => [1, 1, 1, 0], 886 bg => [1, 1, 1, 0],
843 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 887 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
844 )->show; 888 )->show;
845 889
846 $MAPWIDGET = new CFClient::MapWidget; 890 $MAPWIDGET = new CFClient::MapWidget;
847 $MAPWIDGET->connect (activate_console => sub { 891 $MAPWIDGET->connect (activate_console => sub {
848 my ($mapwidget, $preset) = @_; 892 my ($mapwidget, $preset) = @_;
849 893
850 if ($CONSOLE) { 894 if ($CONSOLE) {
851 $CONSOLE->{input}->{auto_activated} = 1; 895 $CONSOLE->{input}->{auto_activated} = 1;
852 $CONSOLE->{input}->focus_in; 896 $CONSOLE->{input}->focus_in;
853 897
854 if ($preset && $CONSOLE->{input}->get_text eq '') { 898 if ($preset && $CONSOLE->{input}->get_text eq '') {
855 $CONSOLE->{input}->set_text ($preset); 899 $CONSOLE->{input}->set_text ($preset);
900 }
856 } 901 }
857 } 902 });
858 });
859 $MAPWIDGET->show; 903 $MAPWIDGET->show;
860 $MAPWIDGET->focus_in; 904 $MAPWIDGET->focus_in;
861 905
862 $BUTTONBAR = new CFClient::UI::HBox; 906 $BUTTONBAR = new CFClient::UI::HBox;
863 907
864 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 908 $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); 909 $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); 910 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
867 911
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 912 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 913
870 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 914 $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); 915 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
872 916
873 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 917 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
874 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 918 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
875 status "Configuration Saved"; 919 status "Configuration Saved";
876 }); 920 });
877 921
878 $BUTTONBAR->show; 922 $BUTTONBAR->show;
879 923
924 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
925
926 # delay till geometry is constant
927 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
880 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 928 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
929 my $widget = $GAUGES->{win};
930 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
931 });
932 force_refresh ();
933 }
881} 934}
882 935
883sub video_shutdown { 936sub video_shutdown {
884 $CFClient::UI::ROOT->{children} = [];
885 undef $CFClient::UI::GRAB;
886 undef $CFClient::UI::HOVER;
887 undef $SDL_ACTIVE; 937 undef $SDL_ACTIVE;
888} 938}
889 939
890my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 940my @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# 941my $bgmusic;#TODO#hack#d#
… …
943} 993}
944 994
945my %animate_object; 995my %animate_object;
946my $animate_timer; 996my $animate_timer;
947 997
948my $want_refresh;
949my $can_refresh;
950
951my $fps = 9; 998my $fps = 9;
952 999
953sub force_refresh { 1000sub force_refresh {
954 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1001 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
955 debug sprintf "%3.2f", $fps; 1002 debug sprintf "%3.2f", $fps;
956 1003
957 $want_refresh = 0;
958 $can_refresh = 0;
959
960 $CFClient::UI::ROOT->draw; 1004 $CFClient::UI::ROOT->draw;
961
962 CFClient::SDL_GL_SwapBuffers; 1005 CFClient::SDL_GL_SwapBuffers;
963 1006
1007 $WANT_REFRESH = 0;
1008 $CAN_REFRESH = 0;
964 $LAST_REFRESH = $NOW; 1009 $LAST_REFRESH = $NOW;
965} 1010}
966 1011
967my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1012my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
968 $NOW = time; 1013 $NOW = time;
… …
970 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1015 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
971 for CFClient::SDL_PollEvent; 1016 for CFClient::SDL_PollEvent;
972 1017
973 if (%animate_object) { 1018 if (%animate_object) {
974 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1019 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
975 $want_refresh++; 1020 $WANT_REFRESH++;
976 } 1021 }
977 1022
978 if ($want_refresh) { 1023 if ($WANT_REFRESH) {
979 force_refresh; 1024 force_refresh;
980 } else { 1025 } else {
981 $can_refresh = 1; 1026 $CAN_REFRESH = 1;
982 } 1027 }
983}); 1028});
984
985sub refresh {
986 $want_refresh++;
987}
988 1029
989sub animation_start { 1030sub animation_start {
990 my ($widget) = @_; 1031 my ($widget) = @_;
991 $animate_object{$widget} = $widget; 1032 $animate_object{$widget} = $widget;
992} 1033}
… …
998 1039
999@conn::ISA = Crossfire::Protocol::; 1040@conn::ISA = Crossfire::Protocol::;
1000 1041
1001sub conn::stats_update { 1042sub conn::stats_update {
1002 my ($self, $stats) = @_; 1043 my ($self, $stats) = @_;
1044
1045 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1046 my $diff = $exp - $self->{prev_exp};
1047 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1048 if exists $self->{prev_exp} && $diff;
1049 $self->{prev_exp} = $exp;
1050 }
1003 1051
1004 update_stats_window ($stats); 1052 update_stats_window ($stats);
1005} 1053}
1006 1054
1007sub conn::user_send { 1055sub conn::user_send {
… …
1304 [0.55, 0.41, 0.13], 1352 [0.55, 0.41, 0.13],
1305 [0.99, 0.77, 0.26], 1353 [0.99, 0.77, 0.26],
1306 [0.74, 0.65, 0.41], 1354 [0.74, 0.65, 0.41],
1307 ); 1355 );
1308 1356
1357 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1358
1359 $text = CFClient::UI::Label::escape $text;
1360 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1361 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1362
1309 $LOGVIEW->add_paragraph ($color[$color], $text); 1363 $LOGVIEW->add_paragraph ($color[$color],
1364 join "\n", map "$time $_", split /\n/, $text);
1365
1366 $STATUSBOX->add ($text,
1367 group => $text,
1368 fg => $color[$color],
1369 timeout => 60,
1370 tooltip_font => $::FONT_FIXED,
1371 );
1372}
1373
1374sub conn::drawextinfo {
1375 my ($self, $color, $type, $subtype, $message) = @_;
1376
1377 $self->drawinfo ($color, $message);
1310} 1378}
1311 1379
1312sub conn::spell_add { 1380sub conn::spell_add {
1313 my ($self, $spell) = @_; 1381 my ($self, $spell) = @_;
1314 1382
1315 # TODO 1383 # TODO
1316 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1384 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1317 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1385 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1318 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1386 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1319} 1387}
1320 1388
1321sub conn::spell_delete { 1389sub conn::spell_delete {
1322 my ($self, $spell) = @_; 1390 my ($self, $spell) = @_;
1323} 1391}
1324 1392
1325sub conn::addme_success { 1393sub conn::addme_success {
1326 my ($self) = @_; 1394 my ($self) = @_;
1327 1395
1396 $MAPWIDGET->clr_commands;
1397
1328 for my $skill (values %{$self->{skill_info}}) { 1398 for my $skill (values %{$self->{skill_info}}) {
1329 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1399 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'");
1330 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1400 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
1331 } 1401 }
1402
1403 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
1404 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
1405 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1406 $MAPWIDGET->add_command ("killpets", "Kill your pets");
1407 $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
1408 $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
1409 $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
1410
1411 my $parser = new Pod::POM;
1412 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1413
1414 for my $head2 ($pod->head2) {
1415 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1416 or next;
1417
1418 my $cmd = $1;
1419 my @args = split /\|/, $2;
1420 @args = (".*") unless @args;
1421
1422 my $text = CFClient::pod_to_pango $head2->content;
1423
1424 for my $arg (@args) {
1425 $arg = $arg eq ".*" ? "" : " $arg";
1426
1427 $MAPWIDGET->add_command ("$cmd$arg", $text);
1428 }
1429 }
1430}
1431
1432sub conn::eof {
1433 $MAPWIDGET->clr_commands;
1434
1435 stop_game;
1332} 1436}
1333 1437
1334sub update_floorbox { 1438sub update_floorbox {
1335 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1439 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1440 return unless $CONN;
1441
1336 $FLOORBOX->clear; 1442 $FLOORBOX->clear;
1337 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1443 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1338 1444
1339 # we basically have to use the same sorting as everybody else 1445 my $count = 4;
1340 for my $item (@{ $CONN->{container}{0} }) { 1446 for (@{ $CONN->{container}{0} }) {
1447 if (--$count) {
1341 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item); 1448 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1449 } else {
1450 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1451 last;
1452 }
1342 } 1453 }
1343 }); 1454 });
1344 refresh; 1455
1456 $WANT_REFRESH++;
1345} 1457}
1346 1458
1347sub conn::container_add { 1459sub conn::container_add {
1348 my ($self, $id, $items) = @_; 1460 my ($self, $tag, $items) = @_;
1349 1461
1350 update_floorbox if $id == 0; 1462 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1463
1464 if ($tag == 0) {
1465 update_floorbox;
1466 $OPENCONT = 0;
1467 $INVR_LBL->set_text ("Floor");
1468 $INVR->set_items ($self->{container}{0});
1351 if ($self->{player}{tag} == $id) { 1469 } elsif ($tag == $self->{player}{tag}) {
1470 $INVR_LBL->set_text ("Player");
1352 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1471 $INV->set_items ($self->{container}{$self->{player}{tag}})
1472 } else {
1473 $OPENCONT = $tag;
1474 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1475 $INVR->set_items ($self->{container}{$tag});
1353 } 1476 }
1477
1354 # $self-<{player}{tag} => player inv 1478 # $self-<{player}{tag} => player inv
1355 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1479 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1356} 1480}
1357 1481
1358sub conn::container_clear { 1482sub conn::container_clear {
1359 my ($self, $id) = @_; 1483 my ($self, $tag) = @_;
1360 1484
1361 update_floorbox if $id == 0; 1485 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1362 if ($self->{player}{tag} == $id) { 1486
1487 if ($tag == 0) {
1488 update_floorbox;
1489 $OPENCONT = 0;
1490 $INVR_LBL->set_text ("Floor");
1363 $INV->set_items ($self->{container}{$id}); 1491 $INVR->set_items ($self->{container}{0});
1492 } elsif ($tag == $self->{player}{tag}) {
1493 $INVR_LBL->set_text ("Player");
1494 $INV->set_items ($self->{container}{$tag})
1495 } else {
1496 $OPENCONT = $tag;
1497 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1498 $INVR->set_items ($self->{container}{$tag});
1364 } 1499 }
1365 1500
1366# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1501# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1367} 1502}
1368 1503
1369sub conn::item_delete { 1504sub conn::item_delete {
1370 my ($self, @items) = @_; 1505 my ($self, @items) = @_;
1371 1506
1372 for (@items) { 1507 for (@items) {
1373 update_floorbox if $_->{container} == 0; 1508 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1374 if ($self->{player}{tag} == $_->{container}) { 1509
1510 if ($_->{container} == 0) {
1511 update_floorbox;
1512 $OPENCONT = 0;
1513 $INVR_LBL->set_text ("Floor");
1514 $INVR->set_items ($self->{container}{0});
1515 } elsif ($_->{container} == $self->{player}{tag}) {
1516 $INVR_LBL->set_text ("Player");
1517 $INV->set_items ($self->{container}{$self->{player}{tag}})
1518 } else {
1519 $OPENCONT = $_->{container};
1520 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1375 $INV->set_items ($self->{container}{$_->{container}}); 1521 $INVR->set_items ($self->{container}{$_->{container}});
1376 } 1522 }
1377 } 1523 }
1378} 1524}
1379 1525
1380sub conn::item_update { 1526sub conn::item_update {
1381 my ($self, $item) = @_; 1527 my ($self, $item) = @_;
1382 1528
1383 update_floorbox if $item->{container} == 0; 1529 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1384 if ($self->{player}{tag} == $item->{container}) { 1530
1531 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1532 $OPENCONT = 0;
1533 $INVR_LBL->set_text ("Floor");
1534 $INVR->set_items ($self->{container}{0});
1535
1536 $item->{widget}->update_item
1537 if $item->{widget};
1538 } else {
1539 if ($item->{container} == 0) {
1540 update_floorbox;
1541 $OPENCONT = 0;
1542 $INVR_LBL->set_text ("Floor");
1543 $INVR->set_items ($self->{container}{0});
1544 } elsif ($item->{container} == $self->{player}{tag}) {
1385 $INV->set_items ($self->{container}{$item->{container}}); 1545 $INV->set_items ($self->{container}{$item->{container}})
1546 }
1386 } 1547 }
1387} 1548}
1388 1549
1389%SDL_CB = ( 1550%SDL_CB = (
1390 CFClient::SDL_QUIT => sub { 1551 CFClient::SDL_QUIT => sub {
1391 Event::unloop -1; 1552 Event::unloop -1;
1392 }, 1553 },
1393 CFClient::SDL_VIDEORESIZE => sub { 1554 CFClient::SDL_VIDEORESIZE => sub {
1394 }, 1555 },
1395 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1556 CFClient::SDL_VIDEOEXPOSE => sub {
1557 $WANT_REFRESH++;
1558 },
1396 CFClient::SDL_ACTIVEEVENT => sub { 1559 CFClient::SDL_ACTIVEEVENT => sub {
1397# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1560# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1398 }, 1561 },
1399 CFClient::SDL_KEYDOWN => sub { 1562 CFClient::SDL_KEYDOWN => sub {
1400 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1563 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1421 1584
1422############################################################################# 1585#############################################################################
1423 1586
1424$SIG{INT} = $SIG{TERM} = sub { exit }; 1587$SIG{INT} = $SIG{TERM} = sub { exit };
1425 1588
1426CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1427
1428$TILECACHE = CFClient::db_table "tilecache";
1429$FACEMAP = CFClient::db_table "facemap";
1430
1431my %DEF_CFG = (
1432 sdl_mode => 0,
1433 width => 640,
1434 height => 480,
1435 fullscreen => 0,
1436 fast => 0,
1437 map_scale => 0.5,
1438 fow_enable => 1,
1439 fow_intensity => 0.45,
1440 fow_smooth => 0,
1441 gui_fontsize => 1,
1442 log_fontsize => 1,
1443 gauge_fontsize => 1,
1444 gauge_size => 0.35,
1445 stat_fontsize => 1,
1446 mapsize => 100,
1447 host => "crossfire.schmorp.de",
1448 say_command => 'say',
1449 audio_enable => 1,
1450 bgm_enable => 1,
1451 bgm_volume => 0.25,
1452);
1453
1454while (my ($k, $v) = each %DEF_CFG) {
1455 $CFG->{$k} = $v unless exists $CFG->{$k};
1456}
1457
1458sdl_init;
1459
1460@SDL_MODES = reverse
1461 grep $_->[0] >= 640 && $_->[1] >= 480,
1462 CFClient::SDL_ListModes;
1463
1464@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1465
1466$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1467
1468{ 1589{
1590 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1591
1592 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1593
1594 $TILECACHE = CFClient::db_table "tilecache";
1595 $FACEMAP = CFClient::db_table "facemap";
1596
1597 my %DEF_CFG = (
1598 sdl_mode => 0,
1599 width => 640,
1600 height => 480,
1601 fullscreen => 0,
1602 fast => 0,
1603 map_scale => 0.5,
1604 fow_enable => 1,
1605 fow_intensity => 0.45,
1606 fow_smooth => 0,
1607 gui_fontsize => 1,
1608 log_fontsize => 1,
1609 gauge_fontsize=> 1,
1610 gauge_size => 0.35,
1611 stat_fontsize => 1,
1612 mapsize => 100,
1613 host => "crossfire.schmorp.de",
1614 say_command => 'say',
1615 audio_enable => 1,
1616 bgm_enable => 1,
1617 bgm_volume => 0.25,
1618 );
1619
1620 while (my ($k, $v) = each %DEF_CFG) {
1621 $CFG->{$k} = $v unless exists $CFG->{$k};
1622 }
1623
1624 sdl_init;
1625
1626 @SDL_MODES = reverse
1627 grep $_->[0] >= 640 && $_->[1] >= 480,
1628 CFClient::SDL_ListModes;
1629
1630 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1631
1632 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1633
1634 {
1469 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1635 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1470 DejaVuSans.ttf 1636 DejaVuSans.ttf
1471 DejaVuSansMono.ttf 1637 DejaVuSansMono.ttf
1472 DejaVuSans-Bold.ttf 1638 DejaVuSans-Bold.ttf
1473 DejaVuSansMono-Bold.ttf 1639 DejaVuSansMono-Bold.ttf
1474 DejaVuSans-Oblique.ttf 1640 DejaVuSans-Oblique.ttf
1475 DejaVuSansMono-Oblique.ttf 1641 DejaVuSansMono-Oblique.ttf
1476 DejaVuSans-BoldOblique.ttf 1642 DejaVuSans-BoldOblique.ttf
1477 DejaVuSansMono-BoldOblique.ttf 1643 DejaVuSansMono-BoldOblique.ttf
1478 ); 1644 );
1479 1645
1480 CFClient::add_font $_ for @fonts; 1646 CFClient::add_font $_ for @fonts;
1481 1647
1648 CFClient::pango_init;
1649
1482 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1650 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1483 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1651 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1484 1652
1485 $FONT_PROP->make_default; 1653 $FONT_PROP->make_default;
1486} 1654 }
1487 1655
1656# compare mono (ft) vs. rgba (cairo)
1657# ft - 1.8s, cairo 3s, even in alpha-only mode
1658# for my $rgba (0..1) {
1659# my $t1 = Time::HiRes::time;
1660# for (1..1000) {
1661# my $layout = CFClient::Layout->new ($rgba);
1662# $layout->set_text ("hallo" x 100);
1663# $layout->render;
1664# }
1665# my $t2 = Time::HiRes::time;
1666# warn $t2-$t1;
1667# }
1668
1488video_init; 1669 video_init;
1489audio_init; 1670 audio_init;
1671}
1490 1672
1491Event::loop; 1673Event::loop;
1492 1674
1493END { CFClient::SDL_Quit } 1675END { CFClient::SDL_Quit }
1494 1676

Diff Legend

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