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.34 by elmex, Sat Apr 8 18:18:09 2006 UTC vs.
Revision 1.117 by root, Sun Apr 16 07:39:51 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use Glib; 6use Time::HiRes 'time';
7use Gtk2 -init; 7use Event;
8 8
9use SDL; 9use SDL;
10use SDL::App; 10use SDL::App;
11use SDL::Event; 11use SDL::Event;
12use SDL::Surface; 12use SDL::Surface;
13use SDL::OpenGL; 13use SDL::OpenGL;
14use SDL::OpenGL::Constants;
15 14
16use Crossfire; 15use Crossfire;
17use Crossfire::Client;
18use Crossfire::Protocol; 16use Crossfire::Protocol;
19 17
20use Crossfire::Client::Widget; 18use Compress::LZF;
21 19
22our $FACECACHE; 20use CFClient;
21use CFClient::UI;
23 22
24our $VERSION = '0.1'; 23our $VERSION = '0.1';
25 24
26our %GL_EXT; 25my $MAX_FPS = 60;
26my $MIN_FPS = 5; # unused as of yet
27
28our $META_SERVER = "crossfire.real-time.com:13326";
29
30our $FACEMAP;
31our $TILECACHE;
32our $MAPCACHE;
33
34our $LAST_REFRESH;
35our $NOW;
27 36
28our $CFG; 37our $CFG;
29our $CONN; 38our $CONN;
39our $FAST; # fast, low-quality mode, possibly useful for software-rendering
30 40
41our @SDL_MODES;
31our $WIDTH; 42our $WIDTH;
32our $HEIGHT; 43our $HEIGHT;
33our $FULLSCREEN; 44our $FULLSCREEN;
34
35our $UIFONT; 45our $FONTSIZE;
36 46
47our $MAP;
48our $MAPWIDGET;
49our $BUTTONBAR;
50our $LOGVIEW;
51our $CONSOLE;
52our $METASERVER;
53
37our $SDL_TIMER; 54our $SDL_ACTIVE;
38our $SDL_APP; 55our $SDL_EV;
39our $SDL_EV = new SDL::Event;
40our %SDL_CB; 56our %SDL_CB;
41 57
42our @GL_INIT; # hooks called on every gl init
43
44our $ALT_ENTER_MESSAGE; 58our $ALT_ENTER_MESSAGE;
59our $STATUS_LINE;
60our $DEBUG_STATUS;
45 61
46our $tw; # Test widget #d# 62sub status {
63 $STATUS_LINE->set_text ($_[0]);
64 my ($w, $h) = $STATUS_LINE->size_request;
65 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
66}
67
68sub debug {
69 $DEBUG_STATUS->set_text ($_[0]);
70 my ($w, $h) = $DEBUG_STATUS->size_request;
71 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
72}
73
74sub start_game {
75 status "logging in...";
76
77 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
78
79 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
80
81 $MAP = new CFClient::Map $mapsize, $mapsize;
82
83 my ($host, $port) = split /:/, $CFG->{host};
84
85 $CONN = new conn
86 host => $host,
87 port => $port || 13327,
88 user => $CFG->{user},
89 pass => $CFG->{password},
90 mapw => $mapsize,
91 maph => $mapsize,
92 ;
93
94 status "login successful";
95
96 CFClient::lowdelay fileno $CONN->{fh};
97}
98
99sub stop_game {
100 undef $CONN;
101}
102
103sub client_setup {
104 my $dialog = new CFClient::UI::FancyFrame
105 child => (my $vbox = new CFClient::UI::VBox);
106 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
107 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
108
109 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
110 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
111
112 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
113 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
114
115 $mode_slider->connect (changed => sub {
116 my ($self, $value) = @_;
117
118 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
119 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
120 });
121 $mode_slider->emit (changed => $mode_slider->{range}[0]);
122
123 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
124 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
125 my ($self, $value) = @_;
126 $CFG->{fullscreen} = $value;
127 });
128
129 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
130 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
131 my ($self, $value) = @_;
132 $CFG->{fast} = $value;
133 });
134
135 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
136 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
137 my ($self, $value) = @_;
138 $CFG->{fow_enable} = $value;
139 });
140
141 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
142 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
143 my ($self, $value) = @_;
144 $CFG->{fow_intensity} = $value;
145 });
146
147 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
148 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
149 my ($self, $value) = @_;
150 $CFG->{fow_smooth} = $value;
151 });
152
153 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
154 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
155 my ($self, $value) = @_;
156 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
157 });
158
159 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
160 destroy_screen ();
161 init_screen ();
162 });
163
164 $dialog
165}
166
167sub metaserver_dialog {
168 my $dialog = new CFClient::UI::FancyFrame
169 child => (my $vbox = new CFClient::UI::VBox);
170
171 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
172
173 $dialog
174}
175
176sub update_metaserver {
177 my ($HOST) = @_;
178
179 status "fetching metaserver list...";
180
181 my $buf;
182
183 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
184
185 Event->io (fd => $fh, poll => 'r', cb => sub {
186 my $res = sysread $fh, $buf, 8192, length $buf;
187
188 if (!defined $res) {
189 $_[0]->w->cancel;
190 status "metaserver: $!";
191 } elsif ($res == 0) {
192 $_[0]->w->cancel;
193 status "server list retrieved";
194
195 my $table = $METASERVER->{table};
196
197 $table->clear;
198
199 my @col = qw(Use #Users Host Uptime Version Description);
200 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
201 for 0 .. $#col;
202
203 my @align = qw(1 0 1 1 -1);
204
205 my $y = 0;
206 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
207 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
208
209 for ($desc) {
210 s/<br>/\n/gi;
211 s/<li>/\n· /gi;
212 s/<.*?>//sgi;
213 s/&/&amp;/g;
214 s/</&lt;/g;
215 s/>/&gt;/g;
216 }
217
218 $uptime = sprintf "%dd %02d:%02d:%02d",
219 (int $m->[8] / 86400),
220 (int $m->[8] / 3600) % 24,
221 (int $m->[8] / 60) % 60,
222 $m->[8] % 60;
223
224 $m = [$users, $host, $uptime, $version, $desc];
225
226 $y++;
227
228 $table->add (0, $y, new CFClient::UI::VBox children => [
229 (new CFClient::UI::Button text => " ", connect_activate => sub {
230 $HOST->set_text ($CFG->{host} = $host);
231 }),
232 (new CFClient::UI::Empty expand => 1),
233 ]);
234
235 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
236 for 0 .. $#$m;
237 }
238 }
239 });
240}
241
242sub server_setup {
243 my $dialog = new CFClient::UI::FancyFrame
244 child => (my $vbox = new CFClient::UI::VBox);
245
246 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
247 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
248 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
249
250 {
251 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
252
253 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
254 my ($self, $value) = @_;
255 $CFG->{host} = $value;
256 });
257
258 $METASERVER = metaserver_dialog;
259
260 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
261 update_metaserver $HOST;
262 });
263 }
264
265 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
266 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
267 my ($self, $value) = @_;
268 $CFG->{user} = $value;
269 });
270
271 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
272 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
273 my ($self, $value) = @_;
274 $CFG->{password} = $value;
275 });
276
277 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
278 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
279 my ($self, $value) = @_;
280 $CFG->{say_command} = $value;
281 });
282
283 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
284 $table->add (1, 7, new CFClient::UI::Slider
285 req_w => 100,
286 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
287 connect_changed => sub {
288 my ($self, $value) = @_;
289
290 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
291 },
292 );
293
294 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
295 start_game;
296 });
297
298 $dialog
299}
300
301sub message_window {
302 my $window = new CFClient::UI::FancyFrame
303 border_bg => [1, 1, 1, 0.5],
304 bg => [0.3, 0.3, 0.3, 0.8],
305 user_w => $::WIDTH/4,
306 user_h => $::HEIGHT,
307 child => (my $vbox = new CFClient::UI::VBox);
308
309 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
310 expand => 1,
311 fontsize => $::CFG->{log_fontsize},
312 );
313
314 $vbox->add (my $input = new CFClient::UI::LineEntry
315 connect_activate => sub {
316 my ($input, $text) = @_;
317 $input->set_text ('');
318
319 if ($text =~ /^\/(.*)/) {
320 $::CONN->user_send ("command $1");
321 } else {
322 my $say_cmd = $::CFG->{say_command} || 'say';
323 $::CONN->user_send ("command $say_cmd $text");
324 }
325 },
326 connect_escape => sub {
327 $MAPWIDGET->focus_in
328 },
329 );
330
331 $CONSOLE = {
332 window => $window,
333 input => $input
334 };
335
336 $window
337}
338
339sub sdl_init {
340 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
341 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
342 and die "SDL::Init failed!\n";
343}
47 344
48sub init_screen { 345sub init_screen {
49 $SDL_APP = new SDL::App 346 sdl_init;
50 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
51 -title => "Crossfire+ Client",
52 -width => $WIDTH,
53 -height => $HEIGHT,
54 -opengl => 1,
55 -red_size => 8,
56 -green_size => 8,
57 -blue_size => 8,
58 -double_buffer => 1,
59 -fullscreen => $FULLSCREEN,
60 -resizeable => 0;
61 347
62 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 348 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
349 $FULLSCREEN = $CFG->{fullscreen};
350 $FAST = $CFG->{fast};
63 351
64 $GL_EXT{GL_ARB_texture_non_power_of_two} 352 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
65 or warn "WARNING: non-power-of-two opengl extension required"; 353 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
354 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
355 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
66 356
67 $UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $HEIGHT / 40 357 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
68 or die "TTFOpenFont: $!"; 358 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
359 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
360 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
69 361
70 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Alt-Enter toggles fullscreen mode"; 362 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
71 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]); 363 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
72 $ALT_ENTER_MESSAGE->activate; 364 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
73 365
74 # Test code #d# 366 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
75 $tw = new Crossfire::Client::Widget::Window; 367 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
76 $tw->add (my $lbl = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Foo in the garden!"); 368 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
77# $tw = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Foo in the garden!"; 369 or die "SDL::SetVideoMode failed!\n";
78 370
79 $tw->move (0, $HEIGHT - 50); 371 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
80 $tw->activate;
81 # Test code end #d#
82 372
83 glClearColor 0, 0, 0, 0; 373 $SDL_EV = new SDL::Event;
374 $SDL_EV->set_unicode (1);
84 375
85 glEnable GL_TEXTURE_2D; 376 $SDL_ACTIVE = 1;
86 glShadeModel GL_FLAT;
87 glDisable GL_DEPTH_TEST;
88 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
89 377
90 glMatrixMode GL_PROJECTION; 378 $LAST_REFRESH = time - 0.01;
91 glLoadIdentity;
92 glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;
93 379
94 glMatrixMode GL_MODELVIEW; 380 CFClient::gl_init;
95 381
96 $_->() for @GL_INIT; 382 $FONTSIZE = int $HEIGHT / 40;
97}
98 383
99sub start_game { 384 #############################################################################
100 $SDL_TIMER = add Glib::Timeout 1000/100, sub { 385
386 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
387 $CFClient::UI::ROOT->add ($DEBUG_STATUS);
388
389 $STATUS_LINE = new CFClient::UI::Label
390 padding => 0,
391 y => $HEIGHT * 44 / 45 - $FONTSIZE;
392 $CFClient::UI::ROOT->add ($STATUS_LINE);
393
394 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
395 padding => 0,
396 y => $HEIGHT * 44 / 45,
397 height => $HEIGHT / 45,
398 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
399 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
400
401 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
402 $MAPWIDGET->focus_in;
403 $MAPWIDGET->connect (activate_console => sub {
404 my ($mapwidget, $preset) = @_;
405
406 if ($CONSOLE) {
407 $CONSOLE->{input}->focus_in;
408
409 if ($preset && $CONSOLE->{input}->get_text eq '') {
410 $CONSOLE->{input}->set_text ($preset);
411 }
412 }
413 });
414
415 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
416
417 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
418 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
419 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
420
421 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
422 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
423 status "Configuration Saved";
424 });
425
426 $BUTTONBAR->{children}[0]->emit ("activate");
427}
428
429sub destroy_screen {
430 $CFClient::UI::ROOT->{children} = [];
431 undef $SDL_ACTIVE;
432 undef $SDL_EV;
433 SDL::Quit;
434}
435
436my %animate_object;
437my $animate_timer;
438
439my $want_refresh;
440my $can_refresh;
441
442my $fps = 9;
443
444sub force_refresh {
445 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
446 debug sprintf "%3.2f", $fps;
447
448 $want_refresh = 0;
449 $can_refresh = 0;
450
451 $CFClient::UI::ROOT->draw;
452
453 SDL::GLSwapBuffers;
454
455 $LAST_REFRESH = $NOW;
456}
457
458my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
459 $NOW = time;
460
101 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 461 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
102 while $SDL_EV->poll; 462 while $SDL_EV->poll;
103 463
464 if (%animate_object) {
465 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
466 $want_refresh++;
467 }
468
469 if ($want_refresh) {
470 force_refresh;
471 } else {
472 $can_refresh = 1;
473 }
474});
475
476sub refresh {
477 $want_refresh++;
478}
479
480sub animation_start {
481 my ($widget) = @_;
482 $animate_object{$widget} = $widget;
483}
484
485sub animation_stop {
486 my ($widget) = @_;
487 delete $animate_object{$widget};
488}
489
490@conn::ISA = Crossfire::Protocol::;
491
492sub conn::user_send {
493 my ($self, $command) = @_;
494
495 $self->send ($command);
496 status $command;
497}
498
499sub conn::feed_map1a {
500 my ($self, $data) = @_;
501
502# $self->Crossfire::Protocol::feed_map1a ($data);
503
504 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
505 $MAP->map1a_update ($data);
506 $MAPWIDGET->update;
507}
508
509sub conn::flush_map {
510 my ($self) = @_;
511
512 my $map_info = delete $self->{map_info}
513 or return;
514
515 my ($hash, $x, $y, $w, $h) = @$map_info;
516
517 my $data = $MAP->get_rect ($x, $y, $w, $h);
518 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
519
520 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
521
522}
523
524sub conn::map_clear {
525 my ($self) = @_;
526
527 $self->flush_map;
528
529 $MAP->clear;
530}
531
532sub conn::map_info {
533 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
534
535 $self->flush_map;
536
537 $x = $::MAP->ox - $x;
538 $y = $::MAP->oy - $y;
539
540 $self->{map_info} = [$hash, $x, $y, $w, $h];
541
542 if (defined (my $data = $MAPCACHE->get ($hash))) {
543 $data = Compress::LZF::decompress $data;
544 warn sprintf "LOADmap[%s] length %d\n", $hash, length $data;#d#
545 for my $id ($MAP->set_rect ($x, $y, $data)) {
546 my $data = $TILECACHE->get ($id)
547 or next;
548
549 $self->set_texture ($id => $data);
104 1 550 }
551 }
552}
553
554sub conn::face_find {
555 my ($self, $facenum, $face) = @_;
556
557 my $hash = "$face->{chksum},$face->{name}";
558
559 my $id = $FACEMAP->get ($hash);
560
561 unless ($id) {
562 # create new id for face
563 # i love transactions
564 for (1..100) {
565 my $txn = $CFClient::DB_ENV->txn_begin;
566 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
567 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
568 $id++;
569 if ($FACEMAP->put (id => $id) == 0
570 && $FACEMAP->put ($hash => $id) == 0) {
571 $txn->txn_commit;
572
573 goto gotid;
574 }
575 }
576 $txn->abort;
577 }
578
579 CFClient::fatal "maximum number of transaction retries reached - database problems?";
580 }
581
582gotid:
583 $face->{id} = $id;
584 $MAP->set_face ($facenum => $id);
585 $TILECACHE->get ($id)
586}
587
588sub conn::face_update {
589 my ($self, $facenum, $face) = @_;
590
591 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
592
593 $self->set_texture ($face->{id} => delete $face->{image});
594}
595
596sub conn::set_texture {
597 my ($self, $id, $data) = @_;
598
599 $self->{texture}[$id] ||= do {
600 my $tex =
601 new_from_image CFClient::Texture
602 $data, minify => 1;
603
604 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
605 $MAPWIDGET->update;
606
607 $tex
105 }; 608 };
106
107 $WIDTH = $CFG->{width};
108 $HEIGHT = $CFG->{height};
109 $FULLSCREEN = 0;
110
111 init_screen;
112
113 $CONN = new conn
114 host => $CFG->{host},
115 port => $CFG->{port},
116 user => $CFG->{user},
117 pass => $CFG->{password};
118} 609}
119 610
120sub stop_game { 611sub conn::query {
121 remove Glib::Source $SDL_TIMER; 612 my ($self, $flags, $prompt) = @_;
122 613
123 undef $SDL_APP; 614 #TODO
124 SDL::Quit; 615 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
125} 616}
126 617
618sub conn::drawinfo {
619 my ($self, $color, $text) = @_;
127 620
128sub force_refresh { 621 my @color = (
129 glViewport 0, 0, $WIDTH, $HEIGHT; 622 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
130 glClear GL_COLOR_BUFFER_BIT; 623 [1.00, 1.00, 1.00],
131 624 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
132 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS; 625 [1.00, 0.00, 0.00],
133 626 [1.00, 0.54, 0.00],
134 SDL::GLSwapBuffers; 627 [0.11, 0.56, 1.00],
135} 628 [0.93, 0.46, 0.00],
136 629 [0.18, 0.54, 0.34],
137my $refresh_handler; 630 [0.56, 0.73, 0.56],
138 631 [0.80, 0.80, 0.80],
139sub refresh { 632 [0.55, 0.41, 0.13],
140 $refresh_handler ||= add Glib::Idle sub { 633 [0.99, 0.77, 0.26],
141 force_refresh; 634 [0.74, 0.65, 0.41],
142 undef $refresh_handler;
143 0
144 }; 635 );
636
637 $LOGVIEW->add_paragraph ($color[$color], $text);
145} 638}
146 639
147%SDL_CB = ( 640%SDL_CB = (
148 SDL_QUIT() => sub { 641 SDL_QUIT() => sub {
149 main_quit Gtk2; 642 Event::unloop -1;
150 }, 643 },
151 SDL_VIDEORESIZE() => sub { 644 SDL_VIDEORESIZE() => sub {
152 }, 645 },
153 SDL_VIDEOEXPOSE() => sub { 646 SDL_VIDEOEXPOSE() => sub {
154 refresh; 647 refresh;
155 }, 648 },
156 SDL_KEYDOWN() => sub { 649 SDL_KEYDOWN() => sub {
157 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 650 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
158 # alt-enter 651 # alt-enter
159 $FULLSCREEN = !$FULLSCREEN; 652 destroy_screen;
653 $CFG->{fullscreen} = !$CFG->{fullscreen};
160 init_screen; 654 init_screen;
161 } else { 655 } else {
162 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 656 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
163 } 657 }
164 }, 658 },
165 SDL_KEYUP() => sub { 659 SDL_KEYUP() => sub {
166 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 660 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
167 }, 661 },
168 SDL_MOUSEMOTION() => sub { 662 SDL_MOUSEMOTION() => sub {
169 warn "sdl motion\n";#d# 663 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
170 }, 664 },
171 SDL_MOUSEBUTTONDOWN() => sub { 665 SDL_MOUSEBUTTONDOWN() => sub {
172 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 666 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
173 }, 667 },
174 SDL_MOUSEBUTTONUP() => sub { 668 SDL_MOUSEBUTTONUP() => sub {
175 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 669 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
176 }, 670 },
177 SDL_ACTIVEEVENT() => sub { 671 SDL_ACTIVEEVENT() => sub {
178 warn "active\n";#d# 672# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
179 }, 673 },
180); 674);
181 675
182@conn::ISA = Crossfire::Protocol::;
183
184sub conn::map_update {
185 my ($self, $dirty) = @_;
186
187 refresh;
188}
189
190sub conn::map_scroll {
191 my ($self, $dx, $dy) = @_;
192
193 refresh;
194}
195
196sub conn::map_clear {
197 my ($self) = @_;
198
199 refresh;
200}
201
202sub conn::face_find {
203 my ($self, $face) = @_;
204
205 $FACECACHE->{"$face->{chksum},$face->{name}"}
206}
207
208sub conn::face_update {
209 my ($self, $face) = @_;
210
211 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
212
213 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
214}
215
216sub conn::query {
217 my ($self, $flags, $prompt) = @_;
218
219 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
220}
221
222sub gtk_add_cfg_field {
223 my ($tbl, $cfg, $klbl, $key, $value) = @_;
224 my $i = $cfg->{_i}++;
225 $tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
226 $tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
227 if ($key eq 'password') {
228 $ent->set_invisible_char ("*");
229 $ent->set (visibility => 0)
230 }
231 $ent->set_text ($value);
232 $ent->signal_connect (changed => sub {
233 my ($ent) = @_;
234 $cfg->{$key} = $ent->get_text;
235 });
236}
237
238sub run_config_dialog {
239 my (%events) = @_;
240
241 my $w = Gtk2::Window->new;
242
243 my @cfg = (
244 [qw/Host host/],
245 [qw/Port port/],
246 [qw/Username user/],
247 [qw/Password password/],
248 );
249
250 my $cfg = {};
251
252 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
253 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
254
255 $w->add (my $vb = Gtk2::VBox->new);
256 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
257 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
258 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
259 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
260 my $i = 0;
261 my $act = 0;
262 for (map { "$_->[0]x$_->[1]" } reverse @modes) {
263 if ($_ eq $selmode) { $act = $i }
264 $cb->append_text ($_);
265 $i++;
266 }
267 $cb->set_active ($act);
268 $cb->signal_connect (changed => sub {
269 my ($cb) = @_;
270 my $txt = $cb->get_active_text;
271 if ($txt =~ m/(\d+)x(\d+)/) {
272 $::CFG->{width} = $1;
273 $::CFG->{height} = $2;
274 }
275 });
276
277 $cfg->{_i} = 1;
278 for (@cfg) {
279 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
280 }
281
282 $vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
283 $hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
284 $cb->signal_connect (clicked => sub {
285 for (keys %$cfg) {
286 $::CFG->{$_} = $cfg->{$_}
287 if $_ ne '_i';
288 }
289 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
290 });
291 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
292 $cb->signal_connect (clicked => sub {
293 for (keys %$cfg) {
294 $::CFG->{$_} = $cfg->{$_}
295 if $_ ne '_i';
296 }
297 my $cb = $events{login} || sub {};
298 $cb->($::CFG->{user}, $::CFG->{password});
299 });
300 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
301 $cb->signal_connect (clicked => sub {
302 my $cb = $events{login} || sub {};
303 $cb->();
304 });
305 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
306 $cb->signal_connect (clicked => sub { $w->destroy });
307
308 $w->show_all;
309
310 $w->signal_connect (destroy => sub { Gtk2->main_quit });
311}
312
313
314############################################################################# 676#############################################################################
315 677
316SDL::Init SDL_INIT_EVERYTHING; 678$TILECACHE = CFClient::db_table "tilecache";
317SDL::TTFInit; 679$FACEMAP = CFClient::db_table "facemap";
318 680
319my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
320
321$mapwidget->activate;
322$mapwidget->focus_in;
323
324Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 681CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
325 682
326$CFG ||= { 683my %DEF_CFG = (
684 sdl_mode => 0,
327 width => 640, 685 width => 640,
328 height => 480, 686 height => 480,
329 fullscreen => 0, 687 fullscreen => 0,
688 fast => 0,
689 fow_enable => 1,
690 fow_intensity => 0.45,
691 fow_smooth => 0,
692 log_fontsize => 14,
693 mapsize => 100,
330 host => "crossfire.schmorp.de", 694 host => "crossfire.schmorp.de",
331 port => 13327, 695 say_command => 'say',
332}; 696);
333 697
334$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 698while (my ($k, $v) = each %DEF_CFG) {
699 $CFG->{$k} = $v unless exists $CFG->{$k};
700}
335 701
336run_config_dialog 702sdl_init;
337 login => sub { start_game },
338 logout => sub { stop_game };
339 703
340main Gtk2; 704@SDL_MODES = reverse
705 grep $_->[0] >= 640 && $_->[1] >= 480,
706 map [SDL::RectW ($_), SDL::RectH ($_)],
707 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
341 708
342Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; 709@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
710
711$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
712
713init_screen;
714
715{
716 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
717
718 CFClient::add_font $_ for @fonts;
719 CFClient::set_font $fonts[0];
720}
721
722Event::loop;
723
724

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines