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.194 by root, Sun Apr 30 09:21:48 2006 UTC vs.
Revision 1.222 by elmex, Wed May 17 10:33:03 2006 UTC

… …
37use CFClient; 37use CFClient;
38use CFClient::UI; 38use CFClient::UI;
39use CFClient::MapWidget; 39use CFClient::MapWidget;
40 40
41$Event::DIED = sub { 41$Event::DIED = sub {
42 # TODO: display dialog box or so
42 CFClient::error $_[1]; 43 CFClient::error $_[1];
43}; 44};
44 45
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 46#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46 47
… …
59our $NOW; 60our $NOW;
60 61
61our $CFG; 62our $CFG;
62our $CONN; 63our $CONN;
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 64our $FAST; # fast, low-quality mode, possibly useful for software-rendering
65
66our $WANT_REFRESH;
67our $CAN_REFRESH;
64 68
65our @SDL_MODES; 69our @SDL_MODES;
66our $WIDTH; 70our $WIDTH;
67our $HEIGHT; 71our $HEIGHT;
68our $FULLSCREEN; 72our $FULLSCREEN;
… …
76our $MAPWIDGET; 80our $MAPWIDGET;
77our $BUTTONBAR; 81our $BUTTONBAR;
78our $LOGVIEW; 82our $LOGVIEW;
79our $CONSOLE; 83our $CONSOLE;
80our $METASERVER; 84our $METASERVER;
85our $LOGIN_BUTTON;
81 86
82our $FLOORBOX; 87our $FLOORBOX;
83our $GAUGES; 88our $GAUGES;
84our $STATWIDS; 89our $STATWIDS;
85 90
… …
89our $SDL_MIXER; 94our $SDL_MIXER;
90our @SOUNDS; # event => file mapping 95our @SOUNDS; # event => file mapping
91our %AUDIO_CHUNKS; # audio files 96our %AUDIO_CHUNKS; # audio files
92 97
93our $ALT_ENTER_MESSAGE; 98our $ALT_ENTER_MESSAGE;
94our $STATUS_LINE; 99our $STATUSBOX;
95our $DEBUG_STATUS; 100our $DEBUG_STATUS;
96 101
97our $INVWIN; 102our $INVWIN;
98our $INV; 103our $INV;
104our $INVR;
105our $OPENCONT;
99 106
100sub status { 107sub status {
101 $STATUS_LINE->set_text ($_[0]); 108 $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} 109}
104 110
105sub debug { 111sub debug {
106 $DEBUG_STATUS->set_text ($_[0]); 112 $DEBUG_STATUS->set_text ($_[0]);
107 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 113 my ($w, $h) = $DEBUG_STATUS->size_request;
114 $DEBUG_STATUS->move ($WIDTH - $w, 0);
108} 115}
109 116
110sub start_game { 117sub start_game {
111 status "logging in..."; 118 status "logging in...";
112 119
113 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 120 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
114 121
115 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 122 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
116
117 $MAP = new CFClient::Map $mapsize, $mapsize; 123 $MAP = new CFClient::Map $mapsize, $mapsize;
118 124
119 my ($host, $port) = split /:/, $CFG->{host}; 125 my ($host, $port) = split /:/, $CFG->{host};
120 126
121 $CONN = eval { 127 $CONN = eval {
… …
128 maph => $mapsize, 134 maph => $mapsize,
129 ; 135 ;
130 }; 136 };
131 137
132 if ($CONN) { 138 if ($CONN) {
139 $LOGIN_BUTTON->set_text ("Logout");
140
133 status "login successful"; 141 status "login successful";
134 142
135 CFClient::lowdelay fileno $CONN->{fh}; 143 CFClient::lowdelay fileno $CONN->{fh};
136 } else { 144 } else {
137 status "unable to connect"; 145 status "unable to connect";
146 stop_game();
138 } 147 }
139} 148}
140 149
141sub stop_game { 150sub stop_game {
151 return unless $CONN;
152
153 status "connection closed";
154 $LOGIN_BUTTON->set_text ("Login");
155 $CONN->destroy;
156 $CONN = 0; # false, does not autovivify
157
158 undef $MAPCACHE;
142 undef $CONN; 159 undef $MAP;
143} 160}
144 161
145sub client_setup { 162sub client_setup {
146 my $dialog = new CFClient::UI::FancyFrame 163 my $dialog = new CFClient::UI::FancyFrame
147 title => "Client Setup", 164 title => "Client Setup",
… …
149 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 166 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
150 167
151 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 168 $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); 169 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
153 170
154 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 171 $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"); 172 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
156 173
157 $mode_slider->connect (changed => sub { 174 $mode_slider->connect (changed => sub {
158 my ($self, $value) = @_; 175 my ($self, $value) = @_;
159 176
… …
184 } 201 }
185 ); 202 );
186 203
187 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 204 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
188 $table->add (1, $row++, new CFClient::UI::Slider 205 $table->add (1, $row++, new CFClient::UI::Slider
189 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 206 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
190 tooltip => "Enlarge or shrink the displayed map", 207 tooltip => "Enlarge or shrink the displayed map",
191 connect_changed => sub { 208 connect_changed => sub {
192 my ($self, $value) = @_; 209 my ($self, $value) = @_;
193 $CFG->{map_scale} = 0.05 * int $value / 0.05; 210 $CFG->{map_scale} = $value;
194 } 211 }
195 ); 212 );
196 213
197 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 214 $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 215 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
225 } 242 }
226 ); 243 );
227 244
228 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 245 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
229 $table->add (1, $row++, new CFClient::UI::Slider 246 $table->add (1, $row++, new CFClient::UI::Slider
230 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 247 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
231 tooltip => "The font size used by most GUI elements", 248 tooltip => "The font size used by most GUI elements",
232 connect_changed => sub { 249 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 ); 250 );
237 251
238 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 252 $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 253 $table->add (1, $row++, new CFClient::UI::Slider
240 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 254 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
241 tooltip => "The font size used by the server log window only", 255 tooltip => "The font size used by the server log window only",
242 connect_changed => sub { 256 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
243 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
244 }
245 ); 257 );
246 258
247 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 259 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
248 260
249 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
250 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
251 tooltip => "The font size used by the statistics window only", 263 tooltip => "The font size used by the statistics window only",
252 connect_changed => sub { 264 connect_changed => sub {
253 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 265 $CFG->{stat_fontsize} = $_[1];
254 &set_stats_window_fontsize; 266 &set_stats_window_fontsize;
255 } 267 }
256 ); 268 );
257 269
258 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
259 $table->add (1, $row++, new CFClient::UI::Slider 271 $table->add (1, $row++, new CFClient::UI::Slider
260 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 272 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
261 tooltip => "Adjust the size of the stats gauges at the bottom right", 273 tooltip => "Adjust the size of the stats gauges at the bottom right",
262 connect_changed => sub { 274 connect_changed => sub {
263 $CFG->{gauge_size} = $_[1]; 275 $CFG->{gauge_size} = $_[1];
264 my $h = int $HEIGHT * $CFG->{gauge_size}; 276 $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 } 277 }
268 ); 278 );
269 279
270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
271 $table->add (1, $row++, new CFClient::UI::Slider 281 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 282 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
273 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 283 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
274 connect_changed => sub { 284 connect_changed => sub {
275 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 285 $CFG->{gauge_fontsize} = $_[1];
276 &set_gauge_window_fontsize; 286 &set_gauge_window_fontsize;
277 } 287 }
278 ); 288 );
279 289
280 $table->add (1, $row++, new CFClient::UI::Button 290 $table->add (1, $row++, new CFClient::UI::Button
… …
354# local $GAUGES->{win}{parent};#d# 364# local $GAUGES->{win}{parent};#d#
355# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 365# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
356} 366}
357 367
358sub make_gauge_window { 368sub make_gauge_window {
359 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 369 my $gh = int $HEIGHT * $CFG->{gauge_size};
360# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
361 370
362 my $win = new CFClient::UI::Frame ( 371 my $win = new CFClient::UI::Frame (
363 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 372 req_y => -1,
373 user_w => $WIDTH,
374 user_h => $gh,
364 ); 375 );
376
365 $win->add (my $hbox = new CFClient::UI::HBox 377 $win->add (my $hbox = new CFClient::UI::HBox
366 children => [ 378 children => [
367 (new CFClient::UI::HBox expand => 1), 379 (new CFClient::UI::HBox expand => 1),
368 ($FLOORBOX = new CFClient::UI::VBox), 380 (new CFClient::UI::VBox children => [
381 (new CFClient::UI::Empty expand => 1),
382 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
383 ]),
369 (my $vbox = new CFClient::UI::VBox), 384 (my $vbox = new CFClient::UI::VBox),
370 ], 385 ],
371 ); 386 );
372 387
373 $vbox->add (new CFClient::UI::HBox 388 $vbox->add (new CFClient::UI::HBox
… …
571 586
572} 587}
573 588
574sub metaserver_dialog { 589sub metaserver_dialog {
575 my $dialog = new CFClient::UI::FancyFrame 590 my $dialog = new CFClient::UI::FancyFrame
576 title => "Metaserver", 591 title => "Server List",
577 child => (my $vbox = new CFClient::UI::VBox); 592 child => (my $vbox = new CFClient::UI::VBox);
578 593
579 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 594 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
580 595
581 $dialog 596 $dialog
… …
683 698
684 $METASERVER = metaserver_dialog; 699 $METASERVER = metaserver_dialog;
685 700
686 $vbox->add (new CFClient::UI::Flopper 701 $vbox->add (new CFClient::UI::Flopper
687 expand => 1, 702 expand => 1,
688 text => "Metaserver", 703 text => "Server List",
689 other => $METASERVER, 704 other => $METASERVER,
690 tooltip => "Show a list of avaible crossfire servers", 705 tooltip => "Show a list of available crossfire servers",
691 connect_open => sub { 706 connect_open => sub {
692 update_metaserver $HOST; 707 update_metaserver $HOST;
693 } 708 }
694 ); 709 );
695 } 710 }
… …
716 ); 731 );
717 732
718 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 733 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
719 $table->add (1, 7, new CFClient::UI::Slider 734 $table->add (1, 7, new CFClient::UI::Slider
720 req_w => 100, 735 req_w => 100,
721 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 736 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. " 737 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.", 738 ."If you set this to a high value you will be able to see further for example.",
724 connect_changed => sub { 739 connect_changed => sub {
725 my ($self, $value) = @_; 740 my ($self, $value) = @_;
726 741
727 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 742 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
728 }, 743 },
729 ); 744 );
730 745
731 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 746 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
747 expand => 1,
748 align => 0,
749 text => "Login",
750 connect_activate => sub {
751 $CONN ? stop_game
732 start_game; 752 : start_game;
753 },
733 }); 754 );
734 755
735 $dialog 756 $dialog
736} 757}
737 758
738sub message_window { 759sub message_window {
… …
788 809
789 $window 810 $window
790} 811}
791 812
792sub make_inventory_window { 813sub make_inventory_window {
793 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 814 my $invwin = new CFClient::UI::FancyFrame
815 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
816
794 $invwin->add (my $hb = new CFClient::UI::HBox); 817 $invwin->add (my $hb = new CFClient::UI::HBox);
795 $hb->add ($INV = new CFClient::UI::Inventory expand => 1); 818 $hb->add ($INV = new CFClient::UI::Inventory expand => 1);
796 $hb->add (my $rng = new CFClient::UI::Slider vertical => 1); 819 $hb->add ($INVR = new CFClient::UI::Inventory expand => 1);
797 $INV->set_range ($rng); 820
798 $invwin 821 $invwin
799} 822}
800 823
801sub sdl_init { 824sub sdl_init {
802 CFClient::SDL_Init 825 CFClient::SDL_Init
… …
804} 827}
805 828
806sub video_init { 829sub video_init {
807 sdl_init; 830 sdl_init;
808 831
832 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
833
809 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 834 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
810 $FULLSCREEN = $CFG->{fullscreen}; 835 $FULLSCREEN = $CFG->{fullscreen};
811 $FAST = $CFG->{fast}; 836 $FAST = $CFG->{fast};
812 837
813 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 838 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
814 or die "SDL_SetVideoMode failed!\n"; 839 or die "SDL_SetVideoMode failed!\n";
815 840
816 $SDL_ACTIVE = 1; 841 $SDL_ACTIVE = 1;
817
818 $LAST_REFRESH = time - 0.01; 842 $LAST_REFRESH = time - 0.01;
819 843
820 CFClient::gl_init; 844 CFClient::gl_init;
821 845
822 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 846 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
823 847
848 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
849
824 ############################################################################# 850 #############################################################################
825 851
852 unless ($DEBUG_STATUS) {
853 # create the widgets
854
826 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 855 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
827 $DEBUG_STATUS->show; 856 $DEBUG_STATUS->show;
828 857
829 $STATUS_LINE = new CFClient::UI::Label 858 $STATUSBOX = new CFClient::UI::Statusbox;
830 padding => 0, 859 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
831 y => $HEIGHT - $FONTSIZE * 1.8;
832 $STATUS_LINE->show;
833 860
834 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 861 (new CFClient::UI::Frame
835 padding => 0, 862 bg => [0, 0, 0, 0.4],
836 fontsize => 0.8, 863 req_y => -1,
837 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 864 child => $STATUSBOX,
838 $ALT_ENTER_MESSAGE->show; 865 )->show;
839 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
840 866
841 CFClient::UI::FancyFrame->new ( 867 CFClient::UI::FancyFrame->new (
842 border_bg => [1, 1, 1, 192/255], 868 border_bg => [1, 1, 1, 192/255],
843 bg => [1, 1, 1, 0], 869 bg => [1, 1, 1, 0],
844 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 870 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
845 )->show; 871 )->show;
846 872
847 $MAPWIDGET = new CFClient::MapWidget; 873 $MAPWIDGET = new CFClient::MapWidget;
848 $MAPWIDGET->connect (activate_console => sub { 874 $MAPWIDGET->connect (activate_console => sub {
849 my ($mapwidget, $preset) = @_; 875 my ($mapwidget, $preset) = @_;
850 876
851 if ($CONSOLE) { 877 if ($CONSOLE) {
852 $CONSOLE->{input}->{auto_activated} = 1; 878 $CONSOLE->{input}->{auto_activated} = 1;
853 $CONSOLE->{input}->focus_in; 879 $CONSOLE->{input}->focus_in;
854 880
855 if ($preset && $CONSOLE->{input}->get_text eq '') { 881 if ($preset && $CONSOLE->{input}->get_text eq '') {
856 $CONSOLE->{input}->set_text ($preset); 882 $CONSOLE->{input}->set_text ($preset);
883 }
857 } 884 }
858 } 885 });
859 });
860 $MAPWIDGET->show; 886 $MAPWIDGET->show;
861 $MAPWIDGET->focus_in; 887 $MAPWIDGET->focus_in;
862 888
863 $BUTTONBAR = new CFClient::UI::HBox; 889 $BUTTONBAR = new CFClient::UI::HBox;
864 890
865 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 891 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
866 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 892 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
867 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 893 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
868 894
869 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 895 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
870 896
871 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 897 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
872 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 898 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
873 899
874 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 900 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
875 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 901 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
876 status "Configuration Saved"; 902 status "Configuration Saved";
877 }); 903 });
878 904
879 $BUTTONBAR->show; 905 $BUTTONBAR->show;
880 906
907 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
908
909 # delay till geometry is constant
910 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
881 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 911 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
912 my $widget = $GAUGES->{win};
913 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
914 });
915 force_refresh ();
916 }
882} 917}
883 918
884sub video_shutdown { 919sub video_shutdown {
885 $CFClient::UI::ROOT->{children} = [];
886 undef $CFClient::UI::GRAB;
887 undef $CFClient::UI::HOVER;
888 undef $SDL_ACTIVE; 920 undef $SDL_ACTIVE;
889} 921}
890 922
891my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 923my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
892my $bgmusic;#TODO#hack#d# 924my $bgmusic;#TODO#hack#d#
925
926sub audio_channel_finished {
927 my ($channel) = @_;
928
929 warn "channel $channel finished\n";#d#
930}
893 931
894sub audio_music_finished { 932sub audio_music_finished {
895 return unless $CFG->{bgm_enable}; 933 return unless $CFG->{bgm_enable};
896 934
897 # TODO: hack, do play loop and mood music 935 # TODO: hack, do play loop and mood music
… …
901 push @bgmusic, shift @bgmusic; 939 push @bgmusic, shift @bgmusic;
902} 940}
903 941
904sub audio_init { 942sub audio_init {
905 if ($CFG->{audio_enable}) { 943 if ($CFG->{audio_enable}) {
906 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 944 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
907 $SDL_MIXER = !CFClient::Mix_OpenAudio; 945 $SDL_MIXER = !CFClient::Mix_OpenAudio;
908 CFClient::Mix_AllocateChannels 8; 946 CFClient::Mix_AllocateChannels 8;
909 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 947 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
910 948
911 audio_music_finished; 949 audio_music_finished;
… …
938} 976}
939 977
940my %animate_object; 978my %animate_object;
941my $animate_timer; 979my $animate_timer;
942 980
943my $want_refresh;
944my $can_refresh;
945
946my $fps = 9; 981my $fps = 9;
947 982
948sub force_refresh { 983sub force_refresh {
949 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 984 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
950 debug sprintf "%3.2f", $fps; 985 debug sprintf "%3.2f", $fps;
951 986
952 $want_refresh = 0;
953 $can_refresh = 0;
954
955 $CFClient::UI::ROOT->draw; 987 $CFClient::UI::ROOT->draw;
956
957 CFClient::SDL_GL_SwapBuffers; 988 CFClient::SDL_GL_SwapBuffers;
958 989
990 $WANT_REFRESH = 0;
991 $CAN_REFRESH = 0;
959 $LAST_REFRESH = $NOW; 992 $LAST_REFRESH = $NOW;
960} 993}
961 994
962my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 995my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
963 $NOW = time; 996 $NOW = time;
… …
965 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 998 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
966 for CFClient::SDL_PollEvent; 999 for CFClient::SDL_PollEvent;
967 1000
968 if (%animate_object) { 1001 if (%animate_object) {
969 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1002 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
970 $want_refresh++; 1003 $WANT_REFRESH++;
971 } 1004 }
972 1005
973 if ($want_refresh) { 1006 if ($WANT_REFRESH) {
974 force_refresh; 1007 force_refresh;
975 } else { 1008 } else {
976 $can_refresh = 1; 1009 $CAN_REFRESH = 1;
977 } 1010 }
978}); 1011});
979
980sub refresh {
981 $want_refresh++;
982}
983 1012
984sub animation_start { 1013sub animation_start {
985 my ($widget) = @_; 1014 my ($widget) = @_;
986 $animate_object{$widget} = $widget; 1015 $animate_object{$widget} = $widget;
987} 1016}
… …
1299 [0.55, 0.41, 0.13], 1328 [0.55, 0.41, 0.13],
1300 [0.99, 0.77, 0.26], 1329 [0.99, 0.77, 0.26],
1301 [0.74, 0.65, 0.41], 1330 [0.74, 0.65, 0.41],
1302 ); 1331 );
1303 1332
1333 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1334
1335 $text = CFClient::UI::Label::escape $text;
1336 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1337 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1338
1304 $LOGVIEW->add_paragraph ($color[$color], $text); 1339 $LOGVIEW->add_paragraph ($color[$color],
1340 join "\n", map "$time $_", split /\n/, $text);
1341
1342 $STATUSBOX->add ($text,
1343 group => $text,
1344 fg => $color[$color],
1345 timeout => 60,
1346 tooltip_font => $::FONT_FIXED,
1347 );
1348}
1349
1350sub conn::drawextinfo {
1351 my ($self, $color, $type, $subtype, $message) = @_;
1352
1353 $self->drawinfo ($color, $message);
1305} 1354}
1306 1355
1307sub conn::spell_add { 1356sub conn::spell_add {
1308 my ($self, $spell) = @_; 1357 my ($self, $spell) = @_;
1309 1358
… …
1318} 1367}
1319 1368
1320sub conn::addme_success { 1369sub conn::addme_success {
1321 my ($self) = @_; 1370 my ($self) = @_;
1322 1371
1372 $MAPWIDGET->clr_commands;
1373
1323 for my $skill (values %{$self->{skill_info}}) { 1374 for my $skill (values %{$self->{skill_info}}) {
1324 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1375 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1325 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1376 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1326 } 1377 }
1378
1379 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
1380 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
1381 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1382 $MAPWIDGET->add_command ("killpets", "Kill your pets");
1383 $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
1384 $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
1385 $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
1386
1387 # TODO: add documentation on these
1388 for (qw(
1389 afk
1390 apply
1391 body
1392 bowmode
1393 brace
1394 build
1395 disarm
1396 dm
1397 dmhide
1398 drop
1399 dropall
1400 examine
1401 get
1402 gsay
1403 help
1404 hiscore
1405 inventory
1406 invoke
1407 killpets
1408 listen
1409 logs
1410 mapinfo
1411 maps
1412 mark
1413 motd
1414 output-count
1415 output-sync
1416 party
1417 peaceful
1418 petmode
1419 pickup
1420 players
1421 prepare
1422 quests
1423 rename
1424 resistances
1425 rotateshoottype
1426 save
1427 say
1428 search
1429 search-items
1430 showpets
1431 skills
1432 sound
1433 take
1434 throw
1435 time
1436 title
1437 usekeys
1438 version
1439 weather
1440 whereabouts
1441 whereami
1442 who
1443 wimpy
1444 )) {
1445 $MAPWIDGET->add_command ($_, "$_: no help available (yet)");
1446 }
1447
1448 #TODO: add " and ' "aliases" etc.
1449}
1450
1451sub conn::eof {
1452 $MAPWIDGET->clr_commands;
1453
1454 stop_game;
1327} 1455}
1328 1456
1329sub update_floorbox { 1457sub update_floorbox {
1330 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1458 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1459 return unless $CONN;
1460
1331 $FLOORBOX->clear; 1461 $FLOORBOX->clear;
1332 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1462 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1333 1463
1334 # we basically have to use the same sorting as everybody else 1464 my $count = 4;
1335 for my $item (@{ $CONN->{container}{0} }) { 1465 for (@{ $CONN->{container}{0} }) {
1336 my $desc = $item->{nrof} < 2 1466 if (--$count) {
1337 ? $item->{name} 1467 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1338 : "$item->{nrof} $item->{name_pl}"; 1468 } else {
1339 # todo: animation widget, face widget, weight(?) etc. 1469 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1340 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1341 tooltip => (CFClient::UI::Label->escape ($desc)
1342 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1343 can_hover => 1,
1344 can_events => 1,
1345 connect_button_down => sub {
1346 my ($self, $ev, $x, $y) = @_;
1347
1348 # todo: maybe put examine on 1? but should just be a tooltip :(
1349 if ($ev->{button} == 1) {
1350 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1351 } elsif ($ev->{button} == 2) {
1352 $CONN->send ("apply $item->{tag}");
1353 } elsif ($ev->{button} == 3) {
1354 CFClient::UI::Menu->new (
1355 items => [
1356 ["examine", sub { $CONN->send ("examine $item->{tag}") }],
1357 [
1358 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
1359 sub { $CONN->send ("lock $item->{tag}") },
1360 ],
1361 ["mark", sub { $CONN->send ("mark $item->{tag}") }],
1362 ["apply", sub { $CONN->send ("apply $item->{tag}") }],
1363 ],
1364 )->popup ($ev);
1365 }
1366
1367 1
1368 }, 1470 last;
1369 );
1370
1371 $hbox->add (new CFClient::UI::Face
1372 can_events => 0,
1373 face => $item->{face},
1374 anim => $item->{anim},
1375 animspeed => $item->{animspeed},
1376 );
1377 1471 }
1378 $hbox->add (new CFClient::UI::Label
1379 can_events => 0,
1380 text => $desc,
1381 );
1382 } 1472 }
1383 }); 1473 });
1384 refresh; 1474
1475 $WANT_REFRESH++;
1385} 1476}
1386 1477
1387sub conn::container_add { 1478sub conn::container_add {
1388 my ($self, $id, $items) = @_; 1479 my ($self, $tag, $items) = @_;
1389 1480
1390 update_floorbox if $id == 0; 1481 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1482
1483 if ($tag == 0) {
1484 update_floorbox;
1485 $OPENCONT = 0;
1486 $INVR->set_items ($self->{container}{0});
1391 if ($self->{player}{tag} == $id) { 1487 } elsif ($tag == $self->{player}{tag}) {
1392 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1488 $INV->set_items ($self->{container}{$self->{player}{tag}})
1489 } else {
1490 $OPENCONT = $tag;
1491 $INVR->set_items ($self->{container}{$tag});
1393 } 1492 }
1493
1394 # $self-<{player}{tag} => player inv 1494 # $self-<{player}{tag} => player inv
1395 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1495 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1396} 1496}
1397 1497
1398sub conn::container_clear { 1498sub conn::container_clear {
1399 my ($self, $id) = @_; 1499 my ($self, $tag) = @_;
1400 1500
1401 update_floorbox if $id == 0; 1501 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1402 if ($self->{player}{tag} == $id) { 1502
1503 if ($tag == 0) {
1504 update_floorbox;
1505 $OPENCONT = 0;
1403 $INV->set_items ($self->{container}{$id}); 1506 $INVR->set_items ($self->{container}{0});
1507 } elsif ($tag == $self->{player}{tag}) {
1508 $INV->set_items ($self->{container}{$tag})
1509 } else {
1510 $OPENCONT = $tag;
1511 $INVR->set_items ($self->{container}{$tag});
1404 } 1512 }
1405 1513
1406# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1514# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1407} 1515}
1408 1516
1409sub conn::item_delete { 1517sub conn::item_delete {
1410 my ($self, @items) = @_; 1518 my ($self, @items) = @_;
1411 1519
1412 for (@items) { 1520 for (@items) {
1413 update_floorbox if $_->{container} == 0; 1521 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1414 if ($self->{player}{tag} == $_->{container}) { 1522
1523 if ($_->{container} == 0) {
1524 update_floorbox;
1525 $OPENCONT = 0;
1526 $INVR->set_items ($self->{container}{0});
1527 } elsif ($_->{container} == $self->{player}{tag}) {
1528 $INV->set_items ($self->{container}{$self->{player}{tag}})
1529 } else {
1530 $OPENCONT = $_->{container};
1415 $INV->set_items ($self->{container}{$_->{container}}); 1531 $INVR->set_items ($self->{container}{$_->{container}});
1416 } 1532 }
1417 } 1533 }
1418} 1534}
1419 1535
1420sub conn::item_update { 1536sub conn::item_update {
1421 my ($self, $item) = @_; 1537 my ($self, $item) = @_;
1422 1538
1423 update_floorbox if $item->{container} == 0; 1539 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1424 if ($self->{player}{tag} == $item->{container}) { 1540
1541 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1542 $OPENCONT = 0;
1543 $INVR->set_items ($self->{container}{0});
1544 } else {
1545 if ($item->{container} == 0) {
1546 update_floorbox;
1547 $OPENCONT = 0;
1548 $INVR->set_items ($self->{container}{0});
1549 } elsif ($item->{container} == $self->{player}{tag}) {
1425 $INV->set_items ($self->{container}{$item->{container}}); 1550 $INV->set_items ($self->{container}{$item->{container}})
1551 }
1426 } 1552 }
1427} 1553}
1428 1554
1429%SDL_CB = ( 1555%SDL_CB = (
1430 CFClient::SDL_QUIT => sub { 1556 CFClient::SDL_QUIT => sub {
1431 Event::unloop -1; 1557 Event::unloop -1;
1432 }, 1558 },
1433 CFClient::SDL_VIDEORESIZE => sub { 1559 CFClient::SDL_VIDEORESIZE => sub {
1434 }, 1560 },
1435 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1561 CFClient::SDL_VIDEOEXPOSE => sub {
1562 $WANT_REFRESH++;
1563 },
1436 CFClient::SDL_ACTIVEEVENT => sub { 1564 CFClient::SDL_ACTIVEEVENT => sub {
1437# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1565# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1438 }, 1566 },
1439 CFClient::SDL_KEYDOWN => sub { 1567 CFClient::SDL_KEYDOWN => sub {
1440 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1568 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1444 video_init; 1572 video_init;
1445 } else { 1573 } else {
1446 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1574 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1447 } 1575 }
1448 }, 1576 },
1449 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1577 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1450 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1578 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1451 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1579 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1452 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1580 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1453 CFClient::SDL_USEREVENT => \&audio_music_finished, 1581 CFClient::SDL_USEREVENT => sub {
1582 if ($_[0]{code} == 1) {
1583 audio_channel_finished $_[0]{data1};
1584 } elsif ($_[0]{code} == 0) {
1585 audio_music_finished;
1586 }
1587 },
1454); 1588);
1455 1589
1456############################################################################# 1590#############################################################################
1457 1591
1458$SIG{INT} = $SIG{TERM} = sub { exit }; 1592$SIG{INT} = $SIG{TERM} = sub { exit };
1459 1593
1460CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1461
1462$TILECACHE = CFClient::db_table "tilecache";
1463$FACEMAP = CFClient::db_table "facemap";
1464
1465my %DEF_CFG = (
1466 sdl_mode => 0,
1467 width => 640,
1468 height => 480,
1469 fullscreen => 0,
1470 fast => 0,
1471 map_scale => 0.5,
1472 fow_enable => 1,
1473 fow_intensity => 0.45,
1474 fow_smooth => 0,
1475 gui_fontsize => 1,
1476 log_fontsize => 1,
1477 gauge_fontsize => 1,
1478 gauge_size => 0.35,
1479 stat_fontsize => 1,
1480 mapsize => 100,
1481 host => "crossfire.schmorp.de",
1482 say_command => 'say',
1483 audio_enable => 1,
1484 bgm_enable => 1,
1485 bgm_volume => 0.25,
1486);
1487
1488while (my ($k, $v) = each %DEF_CFG) {
1489 $CFG->{$k} = $v unless exists $CFG->{$k};
1490}
1491
1492sdl_init;
1493
1494@SDL_MODES = reverse
1495 grep $_->[0] >= 640 && $_->[1] >= 480,
1496 CFClient::SDL_ListModes;
1497
1498@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1499
1500$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1501
1502{ 1594{
1595 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1596
1597 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1598
1599 $TILECACHE = CFClient::db_table "tilecache";
1600 $FACEMAP = CFClient::db_table "facemap";
1601
1602 my %DEF_CFG = (
1603 sdl_mode => 0,
1604 width => 640,
1605 height => 480,
1606 fullscreen => 0,
1607 fast => 0,
1608 map_scale => 0.5,
1609 fow_enable => 1,
1610 fow_intensity => 0.45,
1611 fow_smooth => 0,
1612 gui_fontsize => 1,
1613 log_fontsize => 1,
1614 gauge_fontsize=> 1,
1615 gauge_size => 0.35,
1616 stat_fontsize => 1,
1617 mapsize => 100,
1618 host => "crossfire.schmorp.de",
1619 say_command => 'say',
1620 audio_enable => 1,
1621 bgm_enable => 1,
1622 bgm_volume => 0.25,
1623 );
1624
1625 while (my ($k, $v) = each %DEF_CFG) {
1626 $CFG->{$k} = $v unless exists $CFG->{$k};
1627 }
1628
1629 sdl_init;
1630
1631 @SDL_MODES = reverse
1632 grep $_->[0] >= 640 && $_->[1] >= 480,
1633 CFClient::SDL_ListModes;
1634
1635 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1636
1637 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1638
1639 {
1503 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1640 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1504 DejaVuSans.ttf 1641 DejaVuSans.ttf
1505 DejaVuSansMono.ttf 1642 DejaVuSansMono.ttf
1506 DejaVuSans-Bold.ttf 1643 DejaVuSans-Bold.ttf
1507 DejaVuSansMono-Bold.ttf 1644 DejaVuSansMono-Bold.ttf
1508 DejaVuSans-Oblique.ttf 1645 DejaVuSans-Oblique.ttf
1509 DejaVuSansMono-Oblique.ttf 1646 DejaVuSansMono-Oblique.ttf
1510 DejaVuSans-BoldOblique.ttf 1647 DejaVuSans-BoldOblique.ttf
1511 DejaVuSansMono-BoldOblique.ttf 1648 DejaVuSansMono-BoldOblique.ttf
1512 ); 1649 );
1513 1650
1514 CFClient::add_font $_ for @fonts; 1651 CFClient::add_font $_ for @fonts;
1515 1652
1653 CFClient::pango_init;
1654
1516 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1655 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1517 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1656 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1518 1657
1519 $FONT_PROP->make_default; 1658 $FONT_PROP->make_default;
1520} 1659 }
1521 1660
1661# compare mono (ft) vs. rgba (cairo)
1662# ft - 1.8s, cairo 3s, even in alpha-only mode
1663# for my $rgba (0..1) {
1664# my $t1 = Time::HiRes::time;
1665# for (1..1000) {
1666# my $layout = CFClient::Layout->new ($rgba);
1667# $layout->set_text ("hallo" x 100);
1668# $layout->render;
1669# }
1670# my $t2 = Time::HiRes::time;
1671# warn $t2-$t1;
1672# }
1673
1522video_init; 1674 video_init;
1523audio_init; 1675 audio_init;
1676}
1524 1677
1525Event::loop; 1678Event::loop;
1526 1679
1527END { CFClient::SDL_Quit } 1680END { CFClient::SDL_Quit }
1528 1681

Diff Legend

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