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.187 by root, Tue Apr 25 12:56:34 2006 UTC vs.
Revision 1.220 by root, Wed May 17 00:28:46 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
102our $INVWIN;
103our $INV;
104our $INVR;
105our $OPENCONT;
106
97sub status { 107sub status {
98 $STATUS_LINE->set_text ($_[0]); 108 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
99 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
100} 109}
101 110
102sub debug { 111sub debug {
103 $DEBUG_STATUS->set_text ($_[0]); 112 $DEBUG_STATUS->set_text ($_[0]);
104 $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);
105} 115}
106 116
107sub start_game { 117sub start_game {
108 status "logging in..."; 118 status "logging in...";
109 119
110 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;
111 121
112 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 122 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
113
114 $MAP = new CFClient::Map $mapsize, $mapsize; 123 $MAP = new CFClient::Map $mapsize, $mapsize;
115 124
116 my ($host, $port) = split /:/, $CFG->{host}; 125 my ($host, $port) = split /:/, $CFG->{host};
117 126
118 $CONN = new conn 127 $CONN = eval {
128 new conn
119 host => $host, 129 host => $host,
120 port => $port || 13327, 130 port => $port || 13327,
121 user => $CFG->{user}, 131 user => $CFG->{user},
122 pass => $CFG->{password}, 132 pass => $CFG->{password},
123 mapw => $mapsize, 133 mapw => $mapsize,
124 maph => $mapsize, 134 maph => $mapsize,
135 ;
125 ; 136 };
126 137
138 if ($CONN) {
139 $LOGIN_BUTTON->set_text ("Logout");
140
127 status "login successful"; 141 status "login successful";
128 142
129 CFClient::lowdelay fileno $CONN->{fh}; 143 CFClient::lowdelay fileno $CONN->{fh};
144 } else {
145 status "unable to connect";
146 stop_game();
147 }
130} 148}
131 149
132sub 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;
133 undef $CONN; 159 undef $MAP;
134} 160}
135 161
136sub client_setup { 162sub client_setup {
137 my $dialog = new CFClient::UI::FancyFrame 163 my $dialog = new CFClient::UI::FancyFrame
138 title => "Client Setup", 164 title => "Client Setup",
… …
140 $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]);
141 167
142 $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");
143 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 169 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
144 170
145 $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]);
146 $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");
147 173
148 $mode_slider->connect (changed => sub { 174 $mode_slider->connect (changed => sub {
149 my ($self, $value) = @_; 175 my ($self, $value) = @_;
150 176
… …
175 } 201 }
176 ); 202 );
177 203
178 $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");
179 $table->add (1, $row++, new CFClient::UI::Slider 205 $table->add (1, $row++, new CFClient::UI::Slider
180 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 206 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
181 tooltip => "Enlarge or shrink the displayed map", 207 tooltip => "Enlarge or shrink the displayed map",
182 connect_changed => sub { 208 connect_changed => sub {
183 my ($self, $value) = @_; 209 my ($self, $value) = @_;
184 $CFG->{map_scale} = 0.05 * int $value / 0.05; 210 $CFG->{map_scale} = $value;
185 } 211 }
186 ); 212 );
187 213
188 $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");
189 $table->add (1, $row++, new CFClient::UI::CheckBox 215 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
216 } 242 }
217 ); 243 );
218 244
219 $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");
220 $table->add (1, $row++, new CFClient::UI::Slider 246 $table->add (1, $row++, new CFClient::UI::Slider
221 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 247 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
222 tooltip => "The font size used by most GUI elements", 248 tooltip => "The font size used by most GUI elements",
223 connect_changed => sub { 249 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
224 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
225# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
226 }
227 ); 250 );
228 251
229 $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");
230 $table->add (1, $row++, new CFClient::UI::Slider 253 $table->add (1, $row++, new CFClient::UI::Slider
231 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 254 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
232 tooltip => "The font size used by the server log window only", 255 tooltip => "The font size used by the server log window only",
233 connect_changed => sub { 256 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
234 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
235 }
236 ); 257 );
237 258
238 $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");
239 260
240 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
241 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
242 tooltip => "The font size used by the statistics window only", 263 tooltip => "The font size used by the statistics window only",
243 connect_changed => sub { 264 connect_changed => sub {
244 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 265 $CFG->{stat_fontsize} = $_[1];
245 &set_stats_window_fontsize; 266 &set_stats_window_fontsize;
246 } 267 }
247 ); 268 );
248 269
249 $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");
250 $table->add (1, $row++, new CFClient::UI::Slider 271 $table->add (1, $row++, new CFClient::UI::Slider
251 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 272 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
252 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",
253 connect_changed => sub { 274 connect_changed => sub {
254 $CFG->{gauge_size} = $_[1]; 275 $CFG->{gauge_size} = $_[1];
255 my $h = int $HEIGHT * $CFG->{gauge_size}; 276 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
256 $GAUGES->{win}->set_size ($WIDTH, $h);
257 $GAUGES->{win}->move (0, $HEIGHT - $h);
258 } 277 }
259 ); 278 );
260 279
261 $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");
262 $table->add (1, $row++, new CFClient::UI::Slider 281 $table->add (1, $row++, new CFClient::UI::Slider
263 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 282 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
264 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 283 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
265 connect_changed => sub { 284 connect_changed => sub {
266 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 285 $CFG->{gauge_fontsize} = $_[1];
267 &set_gauge_window_fontsize; 286 &set_gauge_window_fontsize;
268 } 287 }
269 ); 288 );
270 289
271 $table->add (1, $row++, new CFClient::UI::Button 290 $table->add (1, $row++, new CFClient::UI::Button
… …
314 audio_shutdown (); 333 audio_shutdown ();
315 audio_init (); 334 audio_init ();
316 } 335 }
317 ); 336 );
318 337
338 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
339 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
340 text => $CFG->{say_command},
341 tooltip => "This is the command that will be used if you write a line in the message window entry. "
342 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
343 ."But you could also set it to 'tell <playername>' to only chat with that user.",
344 connect_changed => sub {
345 my ($self, $value) = @_;
346 $CFG->{say_command} = $value;
347 }
348 );
349
319 $dialog 350 $dialog
320} 351}
321 352
322sub set_stats_window_fontsize { 353sub set_stats_window_fontsize {
323 for (values %{$STATWIDS}) { 354 for (values %{$STATWIDS}) {
… …
333# local $GAUGES->{win}{parent};#d# 364# local $GAUGES->{win}{parent};#d#
334# 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;
335} 366}
336 367
337sub make_gauge_window { 368sub make_gauge_window {
338 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 369 my $gh = int $HEIGHT * $CFG->{gauge_size};
339# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
340 370
341 my $win = new CFClient::UI::Frame ( 371 my $win = new CFClient::UI::Frame (
342 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 372 req_y => -1,
373 user_w => $WIDTH,
374 user_h => $gh,
343 ); 375 );
376
344 $win->add (my $hbox = new CFClient::UI::HBox 377 $win->add (my $hbox = new CFClient::UI::HBox
345 children => [ 378 children => [
346 (new CFClient::UI::HBox expand => 1), 379 (new CFClient::UI::HBox expand => 1),
347 ($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 ]),
348 (my $vbox = new CFClient::UI::VBox), 384 (my $vbox = new CFClient::UI::VBox),
349 ], 385 ],
350 ); 386 );
351 387
352 $vbox->add (new CFClient::UI::HBox 388 $vbox->add (new CFClient::UI::HBox
… …
422 458
423 my $row = 0; 459 my $row = 0;
424 my $col = 0; 460 my $col = 0;
425 461
426 my %resist_names = ( 462 my %resist_names = (
427 slow => "Slow", 463 slow => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
428 holyw => "Holy Word", 464 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
429 conf => "Confusion", 465 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
430 fire => "Fire", 466 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
431 depl => "Depletion (some monsters and other effects can cause stats depletion)", 467 depl => "Depletion (some monsters and other effects can cause stats depletion)",
432 magic => "Magic", 468 magic => "Magic (resistance to magic spells like magic missile or similar)",
433 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 469 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
434 acid => "Acid", 470 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
435 pois => "Poison", 471 pois => "Poison (resistance to getting poisoned)",
436 para => "Paralysation", 472 para => "Paralysation (this resistance affects the chance you get paralysed)",
437 deat => "Death (resistance against death spells)", 473 deat => "Death (resistance against death spells)",
438 phys => "Physical", 474 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
439 blind => "Blind", 475 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
440 fear => "Fear", 476 fear => "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
441 tund => "Turn undead", 477 tund => "Turn undead",
442 elec => "Electricity", 478 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
443 cold => "Cold", 479 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
444 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 480 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
445 ); 481 );
446 for (qw/slow holyw conf fire depl magic 482 for (qw/slow holyw conf fire depl magic
447 drain acid pois para deat phys 483 drain acid pois para deat phys
448 blind fear tund elec cold ghit/) 484 blind fear tund elec cold ghit/)
… …
550 586
551} 587}
552 588
553sub metaserver_dialog { 589sub metaserver_dialog {
554 my $dialog = new CFClient::UI::FancyFrame 590 my $dialog = new CFClient::UI::FancyFrame
555 title => "Metaserver", 591 title => "Server List",
556 child => (my $vbox = new CFClient::UI::VBox); 592 child => (my $vbox = new CFClient::UI::VBox);
557 593
558 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 594 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
559 595
560 $dialog 596 $dialog
… …
662 698
663 $METASERVER = metaserver_dialog; 699 $METASERVER = metaserver_dialog;
664 700
665 $vbox->add (new CFClient::UI::Flopper 701 $vbox->add (new CFClient::UI::Flopper
666 expand => 1, 702 expand => 1,
667 text => "Metaserver", 703 text => "Server List",
668 other => $METASERVER, 704 other => $METASERVER,
669 tooltip => "Show a list of avaible crossfire servers", 705 tooltip => "Show a list of available crossfire servers",
670 connect_open => sub { 706 connect_open => sub {
671 update_metaserver $HOST; 707 update_metaserver $HOST;
672 } 708 }
673 ); 709 );
674 } 710 }
… …
692 my ($self, $value) = @_; 728 my ($self, $value) = @_;
693 $CFG->{password} = $value; 729 $CFG->{password} = $value;
694 } 730 }
695 ); 731 );
696 732
697 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
698 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
699 text => $CFG->{say_command},
700 tooltip => "This is the command that will be used if you write a line in the message window entry. "
701 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
702 ."But you could also set it to 'tell <playername>' to only chat with that user.",
703 connect_changed => sub {
704 my ($self, $value) = @_;
705 $CFG->{say_command} = $value;
706 }
707 );
708
709 $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");
710 $table->add (1, 7, new CFClient::UI::Slider 734 $table->add (1, 7, new CFClient::UI::Slider
711 req_w => 100, 735 req_w => 100,
712 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 736 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
713 tooltip => "This is the size of the portion of the map update the server sends you. " 737 tooltip => "This is the size of the portion of the map update the server sends you. "
714 ."If you set this to a high value you will be able to see further for example.", 738 ."If you set this to a high value you will be able to see further for example.",
715 connect_changed => sub { 739 connect_changed => sub {
716 my ($self, $value) = @_; 740 my ($self, $value) = @_;
717 741
718 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 742 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
719 }, 743 },
720 ); 744 );
721 745
722 $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
723 start_game; 752 : start_game;
753 },
724 }); 754 );
725 755
726 $dialog 756 $dialog
727} 757}
728 758
729sub message_window { 759sub message_window {
… …
778 }; 808 };
779 809
780 $window 810 $window
781} 811}
782 812
813sub make_inventory_window {
814 my $invwin = new CFClient::UI::FancyFrame
815 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
816
817 $invwin->add (my $hb = new CFClient::UI::HBox);
818 $hb->add ($INV = new CFClient::UI::Inventory expand => 1);
819 $hb->add ($INVR = new CFClient::UI::Inventory expand => 1);
820
821 $invwin
822}
823
783sub sdl_init { 824sub sdl_init {
784 CFClient::SDL_Init 825 CFClient::SDL_Init
785 and die "SDL::Init failed!\n"; 826 and die "SDL::Init failed!\n";
786} 827}
787 828
788sub video_init { 829sub video_init {
789 sdl_init; 830 sdl_init;
790 831
832 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
833
791 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 834 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
792 $FULLSCREEN = $CFG->{fullscreen}; 835 $FULLSCREEN = $CFG->{fullscreen};
793 $FAST = $CFG->{fast}; 836 $FAST = $CFG->{fast};
794 837
795 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 838 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
796 or die "SDL_SetVideoMode failed!\n"; 839 or die "SDL_SetVideoMode failed!\n";
797 840
798 $SDL_ACTIVE = 1; 841 $SDL_ACTIVE = 1;
799
800 $LAST_REFRESH = time - 0.01; 842 $LAST_REFRESH = time - 0.01;
801 843
802 CFClient::gl_init; 844 CFClient::gl_init;
803 845
804 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 846 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
805 847
848 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
849
806 ############################################################################# 850 #############################################################################
807 851
852 unless ($DEBUG_STATUS) {
853 # create the widgets
854
808 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 855 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
809 $DEBUG_STATUS->show; 856 $DEBUG_STATUS->show;
810 857
811 $STATUS_LINE = new CFClient::UI::Label 858 $STATUSBOX = new CFClient::UI::Statusbox;
812 padding => 0, 859 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
813 y => $HEIGHT - $FONTSIZE * 1.8;
814 $STATUS_LINE->show;
815 860
816 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 861 (new CFClient::UI::Frame
817 padding => 0, 862 bg => [0, 0, 0, 0.4],
818 fontsize => 0.8, 863 req_y => -1,
819 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 864 child => $STATUSBOX,
820 $ALT_ENTER_MESSAGE->show; 865 )->show;
821 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
822 866
823 CFClient::UI::FancyFrame->new ( 867 CFClient::UI::FancyFrame->new (
824 border_bg => [1, 1, 1, 192/255], 868 border_bg => [1, 1, 1, 192/255],
825 bg => [1, 1, 1, 0], 869 bg => [1, 1, 1, 0],
826 child => $MAPMAP = new CFClient::MapWidget::MapMap 870 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
827 )->show; 871 )->show;
828 872
829 $MAPWIDGET = new CFClient::MapWidget; 873 $MAPWIDGET = new CFClient::MapWidget;
830 $MAPWIDGET->connect (activate_console => sub { 874 $MAPWIDGET->connect (activate_console => sub {
831 my ($mapwidget, $preset) = @_; 875 my ($mapwidget, $preset) = @_;
832 876
833 if ($CONSOLE) { 877 if ($CONSOLE) {
834 $CONSOLE->{input}->{auto_activated} = 1; 878 $CONSOLE->{input}->{auto_activated} = 1;
835 $CONSOLE->{input}->focus_in; 879 $CONSOLE->{input}->focus_in;
836 880
837 if ($preset && $CONSOLE->{input}->get_text eq '') { 881 if ($preset && $CONSOLE->{input}->get_text eq '') {
838 $CONSOLE->{input}->set_text ($preset); 882 $CONSOLE->{input}->set_text ($preset);
883 }
839 } 884 }
840 } 885 });
841 });
842 $MAPWIDGET->show; 886 $MAPWIDGET->show;
843 $MAPWIDGET->focus_in; 887 $MAPWIDGET->focus_in;
844 888
845 $BUTTONBAR = new CFClient::UI::HBox; 889 $BUTTONBAR = new CFClient::UI::HBox;
846 890
847 $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);
848 $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);
849 $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);
850 894
851 $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 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
896
852 $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);
898 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
853 899
854 $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 {
855 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 901 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
856 status "Configuration Saved"; 902 status "Configuration Saved";
857 }); 903 });
858 904
859 $BUTTONBAR->show; 905 $BUTTONBAR->show;
860 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 {
861 $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 }
862} 917}
863 918
864sub video_shutdown { 919sub video_shutdown {
865 $CFClient::UI::ROOT->{children} = [];
866 undef $CFClient::UI::GRAB;
867 undef $CFClient::UI::HOVER;
868 undef $SDL_ACTIVE; 920 undef $SDL_ACTIVE;
869} 921}
870 922
871my @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#
872my $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}
873 931
874sub audio_music_finished { 932sub audio_music_finished {
875 return unless $CFG->{bgm_enable}; 933 return unless $CFG->{bgm_enable};
876 934
877 # TODO: hack, do play loop and mood music 935 # TODO: hack, do play loop and mood music
… …
881 push @bgmusic, shift @bgmusic; 939 push @bgmusic, shift @bgmusic;
882} 940}
883 941
884sub audio_init { 942sub audio_init {
885 if ($CFG->{audio_enable}) { 943 if ($CFG->{audio_enable}) {
886 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 944 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
887 $SDL_MIXER = !CFClient::Mix_OpenAudio; 945 $SDL_MIXER = !CFClient::Mix_OpenAudio;
888 CFClient::Mix_AllocateChannels 8; 946 CFClient::Mix_AllocateChannels 8;
889 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 947 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
890 948
891 audio_music_finished; 949 audio_music_finished;
… …
918} 976}
919 977
920my %animate_object; 978my %animate_object;
921my $animate_timer; 979my $animate_timer;
922 980
923my $want_refresh;
924my $can_refresh;
925
926my $fps = 9; 981my $fps = 9;
927 982
928sub force_refresh { 983sub force_refresh {
929 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 984 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
930 debug sprintf "%3.2f", $fps; 985 debug sprintf "%3.2f", $fps;
931 986
932 $want_refresh = 0;
933 $can_refresh = 0;
934
935 $CFClient::UI::ROOT->draw; 987 $CFClient::UI::ROOT->draw;
936
937 CFClient::SDL_GL_SwapBuffers; 988 CFClient::SDL_GL_SwapBuffers;
938 989
990 $WANT_REFRESH = 0;
991 $CAN_REFRESH = 0;
939 $LAST_REFRESH = $NOW; 992 $LAST_REFRESH = $NOW;
940} 993}
941 994
942my $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 {
943 $NOW = time; 996 $NOW = time;
… …
945 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 998 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
946 for CFClient::SDL_PollEvent; 999 for CFClient::SDL_PollEvent;
947 1000
948 if (%animate_object) { 1001 if (%animate_object) {
949 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1002 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
950 $want_refresh++; 1003 $WANT_REFRESH++;
951 } 1004 }
952 1005
953 if ($want_refresh) { 1006 if ($WANT_REFRESH) {
954 force_refresh; 1007 force_refresh;
955 } else { 1008 } else {
956 $can_refresh = 1; 1009 $CAN_REFRESH = 1;
957 } 1010 }
958}); 1011});
959
960sub refresh {
961 $want_refresh++;
962}
963 1012
964sub animation_start { 1013sub animation_start {
965 my ($widget) = @_; 1014 my ($widget) = @_;
966 $animate_object{$widget} = $widget; 1015 $animate_object{$widget} = $widget;
967} 1016}
… …
1279 [0.55, 0.41, 0.13], 1328 [0.55, 0.41, 0.13],
1280 [0.99, 0.77, 0.26], 1329 [0.99, 0.77, 0.26],
1281 [0.74, 0.65, 0.41], 1330 [0.74, 0.65, 0.41],
1282 ); 1331 );
1283 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
1284 $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);
1285} 1354}
1286 1355
1287sub conn::spell_add { 1356sub conn::spell_add {
1288 my ($self, $spell) = @_; 1357 my ($self, $spell) = @_;
1289 1358
… …
1298} 1367}
1299 1368
1300sub conn::addme_success { 1369sub conn::addme_success {
1301 my ($self) = @_; 1370 my ($self) = @_;
1302 1371
1372 $MAPWIDGET->clr_commands;
1373
1303 for my $skill (values %{$self->{skill_info}}) { 1374 for my $skill (values %{$self->{skill_info}}) {
1304 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1375 $MAPWIDGET->add_command ("ready_\\skill $skill", "Ready the skill '$skill'");
1305 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1376 $MAPWIDGET->add_command ("use_\\skill $skill", "Immediately use the skill '$skill'");
1306 } 1377 }
1378
1379 $MAPWIDGET->add_command ("pet\\mode defend", "Tell pets to stay close to you and defend you");
1380 $MAPWIDGET->add_command ("pet\\mode arena", "Same as petmode sad, but also attack other players");
1381 $MAPWIDGET->add_command ("pet\\mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1382 $MAPWIDGET->add_command ("kill\\pets", "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 applymode
1392 body
1393 bowmode
1394 brace
1395 build
1396 disarm
1397 dm
1398 dmhide
1399 drop
1400 dropall
1401 examine
1402 get
1403 gsay
1404 help
1405 hiscore
1406 inventory
1407 invoke
1408 killpets
1409 listen
1410 logs
1411 mapinfo
1412 maps
1413 mark
1414 motd
1415 output-count
1416 output-sync
1417 party
1418 peaceful
1419 petmode
1420 pickup
1421 players
1422 prepare
1423 quests
1424 rename
1425 resistances
1426 rotateshoottype
1427 save
1428 say
1429 search
1430 search-items
1431 showpets
1432 skills
1433 sound
1434 take
1435 throw
1436 time
1437 title
1438 usekeys
1439 version
1440 weather
1441 whereabouts
1442 whereami
1443 who
1444 wimpy
1445 )) {
1446 $MAPWIDGET->add_command ($_, "$_: no help available (yet)");
1447 }
1448
1449 #TODO: add " and ' "aliases" etc.
1450}
1451
1452sub conn::eof {
1453 $MAPWIDGET->clr_commands;
1454
1455 stop_game;
1307} 1456}
1308 1457
1309sub update_floorbox { 1458sub update_floorbox {
1310 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1459 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1460 return unless $CONN;
1461
1311 $FLOORBOX->clear; 1462 $FLOORBOX->clear;
1312 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1463 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1313 1464
1314 my @items = values %{ $CONN->{container}{0} }; 1465 my $count = 4;
1315 1466 for (@{ $CONN->{container}{0} }) {
1316 # we basically have to use the same sorting as everybody else 1467 if (--$count) {
1317 @items = sort { $a->{type} <=> $b->{type} } @items; 1468 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1318 1469 } else {
1319 for my $item (reverse @items) { 1470 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1320 my $desc = $item->{nrof} < 2
1321 ? $item->{name}
1322 : "$item->{nrof} $item->{name_pl}";
1323 # todo: animation widget, face widget, weight(?) etc.
1324 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1325 tooltip => (CFClient::UI::Label->escape ($desc)
1326 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1327 can_hover => 1,
1328 can_events => 1,
1329 connect_button_down => sub {
1330 my ($self, $ev, $x, $y) = @_;
1331
1332 # todo: maybe put examine on 1? but should just be a tooltip :(
1333 if ($ev->{button} == 1) {
1334 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1335 } elsif ($ev->{button} == 2) {
1336 $CONN->send ("apply $item->{tag}");
1337 } elsif ($ev->{button} == 3) {
1338 # examine, lock, mark, maybe other things
1339 warn "MENU not implemented yet\n";
1340 }
1341
1342 1
1343 }, 1471 last;
1344 );
1345
1346 $hbox->add (new CFClient::UI::Face
1347 can_events => 0,
1348 face => $item->{face},
1349 anim => $item->{anim},
1350 animspeed => $item->{animspeed},
1351 );
1352 1472 }
1353 $hbox->add (new CFClient::UI::Label
1354 can_events => 0,
1355 text => $desc,
1356 );
1357 } 1473 }
1358 }); 1474 });
1359 refresh; 1475
1476 $WANT_REFRESH++;
1360} 1477}
1361 1478
1362sub conn::container_add { 1479sub conn::container_add {
1363 my ($self, $id, $items) = @_; 1480 my ($self, $tag, $items) = @_;
1364 1481
1365 update_floorbox if $id == 0; 1482 if ($tag == 0) {
1483 update_floorbox;
1484 $INVR->set_items ($self->{container}{0});
1485 $OPENCONT = 0;
1486 } elsif ($tag == $self->{player}{tag}) {
1487 $INV->set_items ($self->{container}{$self->{player}{tag}})
1488 } else {
1489 $OPENCONT = $tag;
1490 $INVR->set_items ($self->{container}{$tag});
1491 }
1492
1366 # $self-<{player}{tag} => player inv 1493 # $self-<{player}{tag} => player inv
1367 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1494 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1368} 1495}
1369 1496
1370sub conn::container_clear { 1497sub conn::container_clear {
1371 my ($self, $id) = @_; 1498 my ($self, $tag) = @_;
1372 1499
1373 update_floorbox if $id == 0; 1500 if ($tag == 0) {
1501 update_floorbox;
1502 $INVR->set_items ($self->{container}{0});
1503 $OPENCONT = 0;
1504 } elsif ($tag == $self->{player}{tag}) {
1505 $INV->set_items ($self->{container}{$tag})
1506 } else {
1507 $INVR->set_items ($self->{container}{$tag});
1508 $OPENCONT = $tag;
1509 }
1510
1374# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1511# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1375} 1512}
1376 1513
1377sub conn::item_delete { 1514sub conn::item_delete {
1378 my ($self, @items) = @_; 1515 my ($self, @items) = @_;
1379 1516
1380 for (@items) { 1517 for (@items) {
1381 update_floorbox if $_->{container} == 0; 1518 if ($_->{container} == 0) {
1519 update_floorbox;
1520 $INVR->set_items ($self->{container}{0});
1521 } elsif ($_->{container} == $self->{player}{tag}) {
1522 $INV->set_items ($self->{container}{$self->{player}{tag}})
1523 } else {
1524 $INVR->set_items ($self->{container}{0});
1525 }
1382 } 1526 }
1383} 1527}
1384 1528
1385sub conn::item_update { 1529sub conn::item_update {
1386 my ($self, $item) = @_; 1530 my ($self, $item) = @_;
1387 1531
1388 update_floorbox if $item->{container} == 0; 1532 if ($item->{container} == 0) {
1533 update_floorbox;
1534 $INVR->set_items ($self->{container}{0});
1535 } elsif ($item->{container} == $self->{player}{tag}) {
1536 $INV->set_items ($self->{container}{$item->{container}})
1537 }
1389} 1538}
1390 1539
1391%SDL_CB = ( 1540%SDL_CB = (
1392 CFClient::SDL_QUIT => sub { 1541 CFClient::SDL_QUIT => sub {
1393 Event::unloop -1; 1542 Event::unloop -1;
1394 }, 1543 },
1395 CFClient::SDL_VIDEORESIZE => sub { 1544 CFClient::SDL_VIDEORESIZE => sub {
1396 }, 1545 },
1397 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1546 CFClient::SDL_VIDEOEXPOSE => sub {
1547 $WANT_REFRESH++;
1548 },
1398 CFClient::SDL_ACTIVEEVENT => sub { 1549 CFClient::SDL_ACTIVEEVENT => sub {
1399# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1550# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1400 }, 1551 },
1401 CFClient::SDL_KEYDOWN => sub { 1552 CFClient::SDL_KEYDOWN => sub {
1402 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1553 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1406 video_init; 1557 video_init;
1407 } else { 1558 } else {
1408 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1559 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1409 } 1560 }
1410 }, 1561 },
1411 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1562 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1412 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1563 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1413 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1564 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1414 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1565 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1415 CFClient::SDL_USEREVENT => \&audio_music_finished, 1566 CFClient::SDL_USEREVENT => sub {
1567 if ($_[0]{code} == 1) {
1568 audio_channel_finished $_[0]{data1};
1569 } elsif ($_[0]{code} == 0) {
1570 audio_music_finished;
1571 }
1572 },
1416); 1573);
1417 1574
1418############################################################################# 1575#############################################################################
1419 1576
1420$SIG{INT} = $SIG{TERM} = sub { exit }; 1577$SIG{INT} = $SIG{TERM} = sub { exit };
1421 1578
1422$TILECACHE = CFClient::db_table "tilecache";
1423$FACEMAP = CFClient::db_table "facemap";
1424
1425CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1426
1427my %DEF_CFG = (
1428 sdl_mode => 0,
1429 width => 640,
1430 height => 480,
1431 fullscreen => 0,
1432 fast => 0,
1433 map_scale => 0.5,
1434 fow_enable => 1,
1435 fow_intensity => 0.45,
1436 fow_smooth => 0,
1437 gui_fontsize => 1,
1438 log_fontsize => 1,
1439 gauge_fontsize => 1,
1440 gauge_size => 0.35,
1441 stat_fontsize => 1,
1442 mapsize => 100,
1443 host => "crossfire.schmorp.de",
1444 say_command => 'say',
1445 audio_enable => 1,
1446 bgm_enable => 1,
1447 bgm_volume => 0.25,
1448);
1449
1450while (my ($k, $v) = each %DEF_CFG) {
1451 $CFG->{$k} = $v unless exists $CFG->{$k};
1452}
1453
1454sdl_init;
1455
1456@SDL_MODES = reverse
1457 grep $_->[0] >= 640 && $_->[1] >= 480,
1458 CFClient::SDL_ListModes;
1459
1460@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1461
1462$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1463
1464{ 1579{
1580 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1581
1582 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1583
1584 $TILECACHE = CFClient::db_table "tilecache";
1585 $FACEMAP = CFClient::db_table "facemap";
1586
1587 my %DEF_CFG = (
1588 sdl_mode => 0,
1589 width => 640,
1590 height => 480,
1591 fullscreen => 0,
1592 fast => 0,
1593 map_scale => 0.5,
1594 fow_enable => 1,
1595 fow_intensity => 0.45,
1596 fow_smooth => 0,
1597 gui_fontsize => 1,
1598 log_fontsize => 1,
1599 gauge_fontsize=> 1,
1600 gauge_size => 0.35,
1601 stat_fontsize => 1,
1602 mapsize => 100,
1603 host => "crossfire.schmorp.de",
1604 say_command => 'say',
1605 audio_enable => 1,
1606 bgm_enable => 1,
1607 bgm_volume => 0.25,
1608 );
1609
1610 while (my ($k, $v) = each %DEF_CFG) {
1611 $CFG->{$k} = $v unless exists $CFG->{$k};
1612 }
1613
1614 sdl_init;
1615
1616 @SDL_MODES = reverse
1617 grep $_->[0] >= 640 && $_->[1] >= 480,
1618 CFClient::SDL_ListModes;
1619
1620 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1621
1622 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1623
1624 {
1465 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1625 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1466 DejaVuSans.ttf 1626 DejaVuSans.ttf
1467 DejaVuSansMono.ttf 1627 DejaVuSansMono.ttf
1468 DejaVuSans-Bold.ttf 1628 DejaVuSans-Bold.ttf
1469 DejaVuSansMono-Bold.ttf 1629 DejaVuSansMono-Bold.ttf
1470 DejaVuSans-Oblique.ttf 1630 DejaVuSans-Oblique.ttf
1471 DejaVuSansMono-Oblique.ttf 1631 DejaVuSansMono-Oblique.ttf
1472 DejaVuSans-BoldOblique.ttf 1632 DejaVuSans-BoldOblique.ttf
1473 DejaVuSansMono-BoldOblique.ttf 1633 DejaVuSansMono-BoldOblique.ttf
1474 ); 1634 );
1475 1635
1476 CFClient::add_font $_ for @fonts; 1636 CFClient::add_font $_ for @fonts;
1477 1637
1638 CFClient::pango_init;
1639
1478 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1640 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1479 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1641 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1480 1642
1481 $FONT_PROP->make_default; 1643 $FONT_PROP->make_default;
1482} 1644 }
1483 1645
1646# compare mono (ft) vs. rgba (cairo)
1647# ft - 1.8s, cairo 3s, even in alpha-only mode
1648# for my $rgba (0..1) {
1649# my $t1 = Time::HiRes::time;
1650# for (1..1000) {
1651# my $layout = CFClient::Layout->new ($rgba);
1652# $layout->set_text ("hallo" x 100);
1653# $layout->render;
1654# }
1655# my $t2 = Time::HiRes::time;
1656# warn $t2-$t1;
1657# }
1658
1484video_init; 1659 video_init;
1485audio_init; 1660 audio_init;
1661}
1486 1662
1487Event::loop; 1663Event::loop;
1488 1664
1489END { CFClient::SDL_Quit } 1665END { CFClient::SDL_Quit }
1490 1666

Diff Legend

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