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.184 by root, Tue Apr 25 11:25:20 2006 UTC vs.
Revision 1.217 by elmex, Mon May 15 18:23:33 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;
… …
70 74
71our $FONT_PROP; 75our $FONT_PROP;
72our $FONT_FIXED; 76our $FONT_FIXED;
73 77
74our $MAP; 78our $MAP;
79our $MAPMAP;
75our $MAPWIDGET; 80our $MAPWIDGET;
76our $BUTTONBAR; 81our $BUTTONBAR;
77our $LOGVIEW; 82our $LOGVIEW;
78our $CONSOLE; 83our $CONSOLE;
79our $METASERVER; 84our $METASERVER;
85our $LOGIN_BUTTON;
80 86
81our $FLOORBOX; 87our $FLOORBOX;
82our $GAUGES; 88our $GAUGES;
83our $STATWIDS; 89our $STATWIDS;
84 90
… …
88our $SDL_MIXER; 94our $SDL_MIXER;
89our @SOUNDS; # event => file mapping 95our @SOUNDS; # event => file mapping
90our %AUDIO_CHUNKS; # audio files 96our %AUDIO_CHUNKS; # audio files
91 97
92our $ALT_ENTER_MESSAGE; 98our $ALT_ENTER_MESSAGE;
93our $STATUS_LINE; 99our $STATUSBOX;
94our $DEBUG_STATUS; 100our $DEBUG_STATUS;
95 101
102our $INVWIN;
103our $INV;
104our $INVR;
105our $OPENCONT;
106
96sub status { 107sub status {
97 $STATUS_LINE->set_text ($_[0]); 108 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
98 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
99} 109}
100 110
101sub debug { 111sub debug {
102 $DEBUG_STATUS->set_text ($_[0]); 112 $DEBUG_STATUS->set_text ($_[0]);
103 $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);
104} 115}
105 116
106sub start_game { 117sub start_game {
107 status "logging in..."; 118 status "logging in...";
108 119
109 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;
110 121
111 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 122 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
112
113 $MAP = new CFClient::Map $mapsize, $mapsize; 123 $MAP = new CFClient::Map $mapsize, $mapsize;
114 124
115 my ($host, $port) = split /:/, $CFG->{host}; 125 my ($host, $port) = split /:/, $CFG->{host};
116 126
117 $CONN = new conn 127 $CONN = eval {
128 new conn
118 host => $host, 129 host => $host,
119 port => $port || 13327, 130 port => $port || 13327,
120 user => $CFG->{user}, 131 user => $CFG->{user},
121 pass => $CFG->{password}, 132 pass => $CFG->{password},
122 mapw => $mapsize, 133 mapw => $mapsize,
123 maph => $mapsize, 134 maph => $mapsize,
135 ;
124 ; 136 };
125 137
138 if ($CONN) {
139 $LOGIN_BUTTON->set_text ("Logout");
140
126 status "login successful"; 141 status "login successful";
127 142
128 CFClient::lowdelay fileno $CONN->{fh}; 143 CFClient::lowdelay fileno $CONN->{fh};
144 } else {
145 status "unable to connect";
146 stop_game();
147 }
129} 148}
130 149
131sub 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;
132 undef $CONN; 159 undef $MAP;
133} 160}
134 161
135sub client_setup { 162sub client_setup {
136 my $dialog = new CFClient::UI::FancyFrame 163 my $dialog = new CFClient::UI::FancyFrame
137 title => "Client Setup", 164 title => "Client Setup",
… …
139 $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]);
140 167
141 $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");
142 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 169 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
143 170
144 $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]);
145 $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");
146 173
147 $mode_slider->connect (changed => sub { 174 $mode_slider->connect (changed => sub {
148 my ($self, $value) = @_; 175 my ($self, $value) = @_;
149 176
… …
174 } 201 }
175 ); 202 );
176 203
177 $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");
178 $table->add (1, $row++, new CFClient::UI::Slider 205 $table->add (1, $row++, new CFClient::UI::Slider
179 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 206 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
180 tooltip => "Enlarge or shrink the displayed map", 207 tooltip => "Enlarge or shrink the displayed map",
181 connect_changed => sub { 208 connect_changed => sub {
182 my ($self, $value) = @_; 209 my ($self, $value) = @_;
183 $CFG->{map_scale} = 0.05 * int $value / 0.05; 210 $CFG->{map_scale} = $value;
184 } 211 }
185 ); 212 );
186 213
187 $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");
188 $table->add (1, $row++, new CFClient::UI::CheckBox 215 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
215 } 242 }
216 ); 243 );
217 244
218 $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");
219 $table->add (1, $row++, new CFClient::UI::Slider 246 $table->add (1, $row++, new CFClient::UI::Slider
220 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 247 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
221 tooltip => "The font size used by most GUI elements", 248 tooltip => "The font size used by most GUI elements",
222 connect_changed => sub { 249 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
223 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
224# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
225 }
226 ); 250 );
227 251
228 $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");
229 $table->add (1, $row++, new CFClient::UI::Slider 253 $table->add (1, $row++, new CFClient::UI::Slider
230 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 254 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
231 tooltip => "The font size used by the server log window only", 255 tooltip => "The font size used by the server log window only",
232 connect_changed => sub { 256 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
233 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
234 }
235 ); 257 );
236 258
237 $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");
238 260
239 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
240 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
241 tooltip => "The font size used by the statistics window only", 263 tooltip => "The font size used by the statistics window only",
242 connect_changed => sub { 264 connect_changed => sub {
243 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 265 $CFG->{stat_fontsize} = $_[1];
244 &set_stats_window_fontsize; 266 &set_stats_window_fontsize;
245 } 267 }
246 ); 268 );
247 269
248 $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");
249 $table->add (1, $row++, new CFClient::UI::Slider 271 $table->add (1, $row++, new CFClient::UI::Slider
250 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 272 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
251 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",
252 connect_changed => sub { 274 connect_changed => sub {
253 $CFG->{gauge_size} = $_[1]; 275 $CFG->{gauge_size} = $_[1];
254 my $h = int $HEIGHT * $CFG->{gauge_size}; 276 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
255 $GAUGES->{win}->set_size ($WIDTH, $h);
256 $GAUGES->{win}->move (0, $HEIGHT - $h);
257 } 277 }
258 ); 278 );
259 279
260 $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");
261 $table->add (1, $row++, new CFClient::UI::Slider 281 $table->add (1, $row++, new CFClient::UI::Slider
262 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 282 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
263 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 283 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
264 connect_changed => sub { 284 connect_changed => sub {
265 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 285 $CFG->{gauge_fontsize} = $_[1];
266 &set_gauge_window_fontsize; 286 &set_gauge_window_fontsize;
267 } 287 }
268 ); 288 );
269 289
270 $table->add (1, $row++, new CFClient::UI::Button 290 $table->add (1, $row++, new CFClient::UI::Button
… …
313 audio_shutdown (); 333 audio_shutdown ();
314 audio_init (); 334 audio_init ();
315 } 335 }
316 ); 336 );
317 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
318 $dialog 350 $dialog
319} 351}
320 352
321sub set_stats_window_fontsize { 353sub set_stats_window_fontsize {
322 for (values %{$STATWIDS}) { 354 for (values %{$STATWIDS}) {
… …
332# local $GAUGES->{win}{parent};#d# 364# local $GAUGES->{win}{parent};#d#
333# 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;
334} 366}
335 367
336sub make_gauge_window { 368sub make_gauge_window {
337 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 369 my $gh = int $HEIGHT * $CFG->{gauge_size};
338# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
339 370
340 my $win = new CFClient::UI::Frame ( 371 my $win = new CFClient::UI::Frame (
341 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 372 req_y => -1,
373 user_w => $WIDTH,
374 user_h => $gh,
342 ); 375 );
376
343 $win->add (my $hbox = new CFClient::UI::HBox 377 $win->add (my $hbox = new CFClient::UI::HBox
344 children => [ 378 children => [
345 (new CFClient::UI::HBox expand => 1), 379 (new CFClient::UI::HBox expand => 1),
346 ($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 ]),
347 (my $vbox = new CFClient::UI::VBox), 384 (my $vbox = new CFClient::UI::VBox),
348 ], 385 ],
349 ); 386 );
350 387
351 $vbox->add (new CFClient::UI::HBox 388 $vbox->add (new CFClient::UI::HBox
… …
381} 418}
382 419
383sub make_stats_window { 420sub make_stats_window {
384 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 421 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
385 422
386 $tgw->add (my $vb = new CFClient::UI::VBox); 423 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
387 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 424 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
388 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 425 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
389 426
390 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 427 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
391 428
… …
421 458
422 my $row = 0; 459 my $row = 0;
423 my $col = 0; 460 my $col = 0;
424 461
425 my %resist_names = ( 462 my %resist_names = (
426 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.)",
427 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.)",
428 conf => "Confusion", 465 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
429 fire => "Fire", 466 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
430 depl => "Depletion (some monsters and other effects can cause stats depletion)", 467 depl => "Depletion (some monsters and other effects can cause stats depletion)",
431 magic => "Magic", 468 magic => "Magic (resistance to magic spells like magic missile or similar)",
432 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)",
433 acid => "Acid", 470 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
434 pois => "Poison", 471 pois => "Poison (resistance to getting poisoned)",
435 para => "Paralysation", 472 para => "Paralysation (this resistance affects the chance you get paralysed)",
436 deat => "Death (resistance against death spells)", 473 deat => "Death (resistance against death spells)",
437 phys => "Physical", 474 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
438 blind => "Blind", 475 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
439 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)",
440 tund => "Turn undead", 477 tund => "Turn undead",
441 elec => "Electricity", 478 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
442 cold => "Cold", 479 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
443 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)",
444 ); 481 );
445 for (qw/slow holyw conf fire depl magic 482 for (qw/slow holyw conf fire depl magic
446 drain acid pois para deat phys 483 drain acid pois para deat phys
447 blind fear tund elec cold ghit/) 484 blind fear tund elec cold ghit/)
… …
456 can_events => 1, 493 can_events => 1,
457 can_hover => 1, 494 can_hover => 1,
458 tooltip => $resist_names{$_}, 495 tooltip => $resist_names{$_},
459 ); 496 );
460 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 497 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
498 font => $FONT_FIXED,
461 can_hover => 1, 499 can_hover => 1,
462 can_events => 1, 500 can_events => 1,
463 image => "ui/resist/resist_$_.png", 501 image => "ui/resist/resist_$_.png",
464 tooltip => $resist_names{$_}, 502 tooltip => $resist_names{$_},
465 ); 503 );
… …
548 586
549} 587}
550 588
551sub metaserver_dialog { 589sub metaserver_dialog {
552 my $dialog = new CFClient::UI::FancyFrame 590 my $dialog = new CFClient::UI::FancyFrame
553 title => "Metaserver", 591 title => "Server List",
554 child => (my $vbox = new CFClient::UI::VBox); 592 child => (my $vbox = new CFClient::UI::VBox);
555 593
556 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 594 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
557 595
558 $dialog 596 $dialog
… …
660 698
661 $METASERVER = metaserver_dialog; 699 $METASERVER = metaserver_dialog;
662 700
663 $vbox->add (new CFClient::UI::Flopper 701 $vbox->add (new CFClient::UI::Flopper
664 expand => 1, 702 expand => 1,
665 text => "Metaserver", 703 text => "Server List",
666 other => $METASERVER, 704 other => $METASERVER,
667 tooltip => "Show a list of avaible crossfire servers", 705 tooltip => "Show a list of available crossfire servers",
668 connect_open => sub { 706 connect_open => sub {
669 update_metaserver $HOST; 707 update_metaserver $HOST;
670 } 708 }
671 ); 709 );
672 } 710 }
… …
690 my ($self, $value) = @_; 728 my ($self, $value) = @_;
691 $CFG->{password} = $value; 729 $CFG->{password} = $value;
692 } 730 }
693 ); 731 );
694 732
695 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
696 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
697 text => $CFG->{say_command},
698 tooltip => "This is the command that will be used if you write a line in the message window entry. "
699 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
700 ."But you could also set it to 'tell <playername>' to only chat with that user.",
701 connect_changed => sub {
702 my ($self, $value) = @_;
703 $CFG->{say_command} = $value;
704 }
705 );
706
707 $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");
708 $table->add (1, 7, new CFClient::UI::Slider 734 $table->add (1, 7, new CFClient::UI::Slider
709 req_w => 100, 735 req_w => 100,
710 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 736 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
711 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. "
712 ."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.",
713 connect_changed => sub { 739 connect_changed => sub {
714 my ($self, $value) = @_; 740 my ($self, $value) = @_;
715 741
716 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 742 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
717 }, 743 },
718 ); 744 );
719 745
720 $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
721 start_game; 752 : start_game;
753 },
722 }); 754 );
723 755
724 $dialog 756 $dialog
725} 757}
726 758
727sub message_window { 759sub message_window {
728 my $window = new CFClient::UI::FancyFrame 760 my $window = new CFClient::UI::FancyFrame
729 title => "Messages", 761 title => "Messages",
730 border_bg => [1, 1, 1, 0.5], 762 border_bg => [1, 1, 1, 1],
731 bg => [0.3, 0.3, 0.3, 0.8], 763 bg => [0, 0, 0, 0.5],
732 user_w => int $::WIDTH / 3, 764 user_w => int $::WIDTH / 3,
733 user_h => int $::HEIGHT / 5, 765 user_h => int $::HEIGHT / 5,
734 child => (my $vbox = new CFClient::UI::VBox); 766 child => (my $vbox = new CFClient::UI::VBox);
735 767
736 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 768 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
776 }; 808 };
777 809
778 $window 810 $window
779} 811}
780 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
781sub sdl_init { 824sub sdl_init {
782 CFClient::SDL_Init 825 CFClient::SDL_Init
783 and die "SDL::Init failed!\n"; 826 and die "SDL::Init failed!\n";
784} 827}
785 828
786sub video_init { 829sub video_init {
787 sdl_init; 830 sdl_init;
788 831
832 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
833
789 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 834 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
790 $FULLSCREEN = $CFG->{fullscreen}; 835 $FULLSCREEN = $CFG->{fullscreen};
791 $FAST = $CFG->{fast}; 836 $FAST = $CFG->{fast};
792 837
793 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 838 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
794 or die "SDL_SetVideoMode failed!\n"; 839 or die "SDL_SetVideoMode failed!\n";
795 840
796 $SDL_ACTIVE = 1; 841 $SDL_ACTIVE = 1;
797
798 $LAST_REFRESH = time - 0.01; 842 $LAST_REFRESH = time - 0.01;
799 843
800 CFClient::gl_init; 844 CFClient::gl_init;
801 845
802 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 846 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
803 847
848 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
849
804 ############################################################################# 850 #############################################################################
805 851
852 unless ($DEBUG_STATUS) {
853 # create the widgets
854
806 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 855 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
807 $DEBUG_STATUS->show; 856 $DEBUG_STATUS->show;
808 857
809 $STATUS_LINE = new CFClient::UI::Label 858 $STATUSBOX = new CFClient::UI::Statusbox;
810 padding => 0, 859 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
811 y => $HEIGHT - $FONTSIZE * 1.8;
812 $STATUS_LINE->show;
813 860
814 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 861 (new CFClient::UI::Frame
815 padding => 0, 862 bg => [0, 0, 0, 0.4],
816 fontsize => 0.8, 863 req_y => -1,
817 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 864 child => $STATUSBOX,
818 $ALT_ENTER_MESSAGE->show; 865 )->show;
819 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
820 866
821 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 867 CFClient::UI::FancyFrame->new (
822 $MAPWIDGET->focus_in; 868 border_bg => [1, 1, 1, 192/255],
869 bg => [1, 1, 1, 0],
870 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
871 )->show;
872
873 $MAPWIDGET = new CFClient::MapWidget;
823 $MAPWIDGET->connect (activate_console => sub { 874 $MAPWIDGET->connect (activate_console => sub {
824 my ($mapwidget, $preset) = @_; 875 my ($mapwidget, $preset) = @_;
825 876
826 if ($CONSOLE) { 877 if ($CONSOLE) {
827 $CONSOLE->{input}->{auto_activated} = 1; 878 $CONSOLE->{input}->{auto_activated} = 1;
828 $CONSOLE->{input}->focus_in; 879 $CONSOLE->{input}->focus_in;
829 880
830 if ($preset && $CONSOLE->{input}->get_text eq '') { 881 if ($preset && $CONSOLE->{input}->get_text eq '') {
831 $CONSOLE->{input}->set_text ($preset); 882 $CONSOLE->{input}->set_text ($preset);
883 }
832 } 884 }
833 } 885 });
834 }); 886 $MAPWIDGET->show;
887 $MAPWIDGET->focus_in;
835 888
836 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 889 $BUTTONBAR = new CFClient::UI::HBox;
837 890
838 $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);
839 $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);
840 $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);
841 894
842 $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
843 $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);
844 899
845 $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 {
846 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 901 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
847 status "Configuration Saved"; 902 status "Configuration Saved";
848 }); 903 });
849 904
905 $BUTTONBAR->show;
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 {
850 $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 }
851} 917}
852 918
853sub video_shutdown { 919sub video_shutdown {
854 $CFClient::UI::ROOT->{children} = [];
855 undef $CFClient::UI::GRAB;
856 undef $CFClient::UI::HOVER;
857 undef $SDL_ACTIVE; 920 undef $SDL_ACTIVE;
858} 921}
859 922
860my @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#
861my $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}
862 931
863sub audio_music_finished { 932sub audio_music_finished {
864 return unless $CFG->{bgm_enable}; 933 return unless $CFG->{bgm_enable};
865 934
866 # TODO: hack, do play loop and mood music 935 # TODO: hack, do play loop and mood music
… …
870 push @bgmusic, shift @bgmusic; 939 push @bgmusic, shift @bgmusic;
871} 940}
872 941
873sub audio_init { 942sub audio_init {
874 if ($CFG->{audio_enable}) { 943 if ($CFG->{audio_enable}) {
875 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 944 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
876 $SDL_MIXER = !CFClient::Mix_OpenAudio; 945 $SDL_MIXER = !CFClient::Mix_OpenAudio;
877 CFClient::Mix_AllocateChannels 8; 946 CFClient::Mix_AllocateChannels 8;
878 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 947 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
879 948
880 audio_music_finished; 949 audio_music_finished;
… …
907} 976}
908 977
909my %animate_object; 978my %animate_object;
910my $animate_timer; 979my $animate_timer;
911 980
912my $want_refresh;
913my $can_refresh;
914
915my $fps = 9; 981my $fps = 9;
916 982
917sub force_refresh { 983sub force_refresh {
918 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 984 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
919 debug sprintf "%3.2f", $fps; 985 debug sprintf "%3.2f", $fps;
920 986
921 $want_refresh = 0;
922 $can_refresh = 0;
923
924 $CFClient::UI::ROOT->draw; 987 $CFClient::UI::ROOT->draw;
925
926 CFClient::SDL_GL_SwapBuffers; 988 CFClient::SDL_GL_SwapBuffers;
927 989
990 $WANT_REFRESH = 0;
991 $CAN_REFRESH = 0;
928 $LAST_REFRESH = $NOW; 992 $LAST_REFRESH = $NOW;
929} 993}
930 994
931my $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 {
932 $NOW = time; 996 $NOW = time;
… …
934 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 998 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
935 for CFClient::SDL_PollEvent; 999 for CFClient::SDL_PollEvent;
936 1000
937 if (%animate_object) { 1001 if (%animate_object) {
938 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1002 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
939 $want_refresh++; 1003 $WANT_REFRESH++;
940 } 1004 }
941 1005
942 if ($want_refresh) { 1006 if ($WANT_REFRESH) {
943 force_refresh; 1007 force_refresh;
944 } else { 1008 } else {
945 $can_refresh = 1; 1009 $CAN_REFRESH = 1;
946 } 1010 }
947}); 1011});
948
949sub refresh {
950 $want_refresh++;
951}
952 1012
953sub animation_start { 1013sub animation_start {
954 my ($widget) = @_; 1014 my ($widget) = @_;
955 $animate_object{$widget} = $widget; 1015 $animate_object{$widget} = $widget;
956} 1016}
… …
1035# at worst. 1095# at worst.
1036sub conn::flood_fill { 1096sub conn::flood_fill {
1037 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1097 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1038 1098
1039 # the server does not allow map paths > 6 1099 # the server does not allow map paths > 6
1040 return if 6 <= length $path; 1100 return if 7 <= length $path;
1041 1101
1042 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1102 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1043 1103
1044 for ( 1104 for (
1045 [1, 0, -1], 1105 [1, 0, -1],
… …
1088 1148
1089 $self->flush_map; 1149 $self->flush_map;
1090 1150
1091 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1151 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1092 1152
1093 my $mapmapw = 250; 1153 my $mapmapw = $MAPMAP->{w};
1094 my $mapmaph = 250; 1154 my $mapmaph = $MAPMAP->{h};
1095 1155
1096 $self->{neigh_rect} = [ 1156 $self->{neigh_rect} = [
1097 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1157 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1098 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1158 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1099 ]; 1159 ];
… …
1268 [0.55, 0.41, 0.13], 1328 [0.55, 0.41, 0.13],
1269 [0.99, 0.77, 0.26], 1329 [0.99, 0.77, 0.26],
1270 [0.74, 0.65, 0.41], 1330 [0.74, 0.65, 0.41],
1271 ); 1331 );
1272 1332
1333 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1334
1335 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g;
1336 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1337 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1338
1273 $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);
1274} 1354}
1275 1355
1276sub conn::spell_add { 1356sub conn::spell_add {
1277 my ($self, $spell) = @_; 1357 my ($self, $spell) = @_;
1278 1358
… …
1291 1371
1292 for my $skill (values %{$self->{skill_info}}) { 1372 for my $skill (values %{$self->{skill_info}}) {
1293 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1373 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1294 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1374 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1295 } 1375 }
1376
1377 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1378 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1379 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1380 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1381}
1382
1383sub conn::eof {
1384 stop_game;
1296} 1385}
1297 1386
1298sub update_floorbox { 1387sub update_floorbox {
1299 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1388 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1389 return unless $CONN;
1390
1300 $FLOORBOX->clear; 1391 $FLOORBOX->clear;
1301 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1392 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1302 1393
1303 my @items = values %{ $CONN->{container}{0} }; 1394 my $count = 4;
1304 1395 for (@{ $CONN->{container}{0} }) {
1305 # we basically have to use the same sorting as everybody else 1396 if (--$count) {
1306 @items = sort { $a->{type} <=> $b->{type} } @items; 1397 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1307 1398 } else {
1308 for my $item (reverse @items) { 1399 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1309 my $desc = $item->{nrof} < 2
1310 ? $item->{name}
1311 : "$item->{nrof} $item->{name_pl}";
1312 # todo: animation widget, face widget, weight(?) etc.
1313 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1314 tooltip => (CFClient::UI::Label->escape ($desc)
1315 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1316 can_hover => 1,
1317 can_events => 1,
1318 connect_button_down => sub {
1319 my ($self, $ev, $x, $y) = @_;
1320
1321 # todo: maybe put examine on 1? but should just be a tooltip :(
1322 if ($ev->{button} == 1) {
1323 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1324 } elsif ($ev->{button} == 2) {
1325 $CONN->send ("apply $item->{tag}");
1326 } elsif ($ev->{button} == 3) {
1327 # examine, lock, mark, maybe other things
1328 warn "MENU not implemented yet\n";
1329 }
1330
1331 1
1332 }, 1400 last;
1333 );
1334
1335 $hbox->add (new CFClient::UI::Face
1336 can_events => 0,
1337 face => $item->{face},
1338 anim => $item->{anim},
1339 animspeed => $item->{animspeed},
1340 );
1341 1401 }
1342 $hbox->add (new CFClient::UI::Label
1343 can_events => 0,
1344 text => $desc,
1345 );
1346 } 1402 }
1347 }); 1403 });
1348 refresh; 1404
1405 $WANT_REFRESH++;
1349} 1406}
1350 1407
1351sub conn::container_add { 1408sub conn::container_add {
1352 my ($self, $id, $items) = @_; 1409 my ($self, $tag, $items) = @_;
1353 1410
1354 update_floorbox if $id == 0; 1411 print "container_add on conainer $tag (player: $self->{player}{tag})\n";
1412
1413 if ($tag == 0) {
1414 update_floorbox;
1415 $INVR->set_items ($self->{container}{0});
1416 $OPENCONT = 0;
1417 } elsif ($tag == $self->{player}{tag}) {
1418 $INV->set_items ($self->{container}{$self->{player}{tag}})
1419 } else {
1420 $OPENCONT = $tag;
1421 $INVR->set_items ($self->{container}{$tag});
1422 }
1423
1355 # $self-<{player}{tag} => player inv 1424 # $self-<{player}{tag} => player inv
1356 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1425 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1357} 1426}
1358 1427
1359sub conn::container_clear { 1428sub conn::container_clear {
1360 my ($self, $id) = @_; 1429 my ($self, $tag) = @_;
1361 1430
1362 update_floorbox if $id == 0; 1431 print "container_clear on conainer $tag (player: $self->{player}{tag})\n";
1432
1433 if ($tag == 0) {
1434 update_floorbox;
1435 $INVR->set_items ($self->{container}{0});
1436 $OPENCONT = 0;
1437 } elsif ($tag == $self->{player}{tag}) {
1438 $INV->set_items ($self->{container}{$tag})
1439 } else {
1440 $INVR->set_items ($self->{container}{$tag});
1441 $OPENCONT = $tag;
1442 }
1443
1363# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1444# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1364} 1445}
1365 1446
1366sub conn::item_delete { 1447sub conn::item_delete {
1367 my ($self, @items) = @_; 1448 my ($self, @items) = @_;
1368 1449
1369 for (@items) { 1450 for (@items) {
1370 update_floorbox if $_->{container} == 0; 1451 print "item_delete on container $_->{container} (player: $self->{player}{tag})\n";
1452 if ($_->{container} == 0) {
1453 update_floorbox;
1454 $INVR->set_items ($self->{container}{0});
1455 } elsif ($_->{container} == $self->{player}{tag}) {
1456 $INV->set_items ($self->{container}{$self->{player}{tag}})
1457 } else {
1458 $INVR->set_items ($self->{container}{0});
1459 }
1371 } 1460 }
1372} 1461}
1373 1462
1374sub conn::item_update { 1463sub conn::item_update {
1375 my ($self, $item) = @_; 1464 my ($self, $item) = @_;
1376 1465
1377 update_floorbox if $item->{container} == 0; 1466 print "item_update: container: $item->{container} (player: $self->{player}{tag})\n";
1467
1468 if ($item->{container} == 0) {
1469 update_floorbox;
1470 $INVR->set_items ($self->{container}{0});
1471 } elsif ($item->{container} == $self->{player}{tag}) {
1472 $INV->set_items ($self->{container}{$item->{container}})
1473 }
1378} 1474}
1379 1475
1380%SDL_CB = ( 1476%SDL_CB = (
1381 CFClient::SDL_QUIT => sub { 1477 CFClient::SDL_QUIT => sub {
1382 Event::unloop -1; 1478 Event::unloop -1;
1383 }, 1479 },
1384 CFClient::SDL_VIDEORESIZE => sub { 1480 CFClient::SDL_VIDEORESIZE => sub {
1385 }, 1481 },
1386 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1482 CFClient::SDL_VIDEOEXPOSE => sub {
1483 $WANT_REFRESH++;
1484 },
1387 CFClient::SDL_ACTIVEEVENT => sub { 1485 CFClient::SDL_ACTIVEEVENT => sub {
1388# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1486# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1389 }, 1487 },
1390 CFClient::SDL_KEYDOWN => sub { 1488 CFClient::SDL_KEYDOWN => sub {
1391 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1489 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1395 video_init; 1493 video_init;
1396 } else { 1494 } else {
1397 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1495 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1398 } 1496 }
1399 }, 1497 },
1400 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1498 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1401 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1499 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1402 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1500 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1403 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1501 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1404 CFClient::SDL_USEREVENT => \&audio_music_finished, 1502 CFClient::SDL_USEREVENT => sub {
1503 if ($_[0]{code} == 1) {
1504 audio_channel_finished $_[0]{data1};
1505 } elsif ($_[0]{code} == 0) {
1506 audio_music_finished;
1507 }
1508 },
1405); 1509);
1406 1510
1407############################################################################# 1511#############################################################################
1408 1512
1409$SIG{INT} = $SIG{TERM} = sub { exit }; 1513$SIG{INT} = $SIG{TERM} = sub { exit };
1410 1514
1411$TILECACHE = CFClient::db_table "tilecache";
1412$FACEMAP = CFClient::db_table "facemap";
1413
1414CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1415
1416my %DEF_CFG = (
1417 sdl_mode => 0,
1418 width => 640,
1419 height => 480,
1420 fullscreen => 0,
1421 fast => 0,
1422 map_scale => 0.5,
1423 fow_enable => 1,
1424 fow_intensity => 0.45,
1425 fow_smooth => 0,
1426 gui_fontsize => 1,
1427 log_fontsize => 1,
1428 gauge_fontsize => 1,
1429 gauge_size => 0.35,
1430 stat_fontsize => 1,
1431 mapsize => 100,
1432 host => "crossfire.schmorp.de",
1433 say_command => 'say',
1434 audio_enable => 1,
1435 bgm_enable => 1,
1436 bgm_volume => 0.25,
1437);
1438
1439while (my ($k, $v) = each %DEF_CFG) {
1440 $CFG->{$k} = $v unless exists $CFG->{$k};
1441}
1442
1443sdl_init;
1444
1445@SDL_MODES = reverse
1446 grep $_->[0] >= 640 && $_->[1] >= 480,
1447 CFClient::SDL_ListModes;
1448
1449@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1450
1451$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1452
1453{ 1515{
1516 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1517
1518 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1519
1520 $TILECACHE = CFClient::db_table "tilecache";
1521 $FACEMAP = CFClient::db_table "facemap";
1522
1523 my %DEF_CFG = (
1524 sdl_mode => 0,
1525 width => 640,
1526 height => 480,
1527 fullscreen => 0,
1528 fast => 0,
1529 map_scale => 0.5,
1530 fow_enable => 1,
1531 fow_intensity => 0.45,
1532 fow_smooth => 0,
1533 gui_fontsize => 1,
1534 log_fontsize => 1,
1535 gauge_fontsize=> 1,
1536 gauge_size => 0.35,
1537 stat_fontsize => 1,
1538 mapsize => 100,
1539 host => "crossfire.schmorp.de",
1540 say_command => 'say',
1541 audio_enable => 1,
1542 bgm_enable => 1,
1543 bgm_volume => 0.25,
1544 );
1545
1546 while (my ($k, $v) = each %DEF_CFG) {
1547 $CFG->{$k} = $v unless exists $CFG->{$k};
1548 }
1549
1550 sdl_init;
1551
1552 @SDL_MODES = reverse
1553 grep $_->[0] >= 640 && $_->[1] >= 480,
1554 CFClient::SDL_ListModes;
1555
1556 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1557
1558 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1559
1560 {
1454 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1561 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1455 DejaVuSans.ttf 1562 DejaVuSans.ttf
1456 DejaVuSansMono.ttf 1563 DejaVuSansMono.ttf
1457 DejaVuSans-Bold.ttf 1564 DejaVuSans-Bold.ttf
1458 DejaVuSansMono-Bold.ttf 1565 DejaVuSansMono-Bold.ttf
1459 DejaVuSans-Oblique.ttf 1566 DejaVuSans-Oblique.ttf
1460 DejaVuSansMono-Oblique.ttf 1567 DejaVuSansMono-Oblique.ttf
1461 DejaVuSans-BoldOblique.ttf 1568 DejaVuSans-BoldOblique.ttf
1462 DejaVuSansMono-BoldOblique.ttf 1569 DejaVuSansMono-BoldOblique.ttf
1463 ); 1570 );
1464 1571
1465 CFClient::add_font $_ for @fonts; 1572 CFClient::add_font $_ for @fonts;
1466 1573
1574 CFClient::pango_init;
1575
1467 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1576 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1468 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1577 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1469 1578
1470 $FONT_PROP->make_default; 1579 $FONT_PROP->make_default;
1471} 1580 }
1472 1581
1473video_init; 1582 video_init;
1474audio_init; 1583 audio_init;
1584}
1475 1585
1476Event::loop; 1586Event::loop;
1477 1587
1478END { CFClient::SDL_Quit } 1588END { CFClient::SDL_Quit }
1479 1589

Diff Legend

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