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.12 by elmex, Fri Apr 7 16:29:19 2006 UTC vs.
Revision 1.118 by elmex, Sun Apr 16 17:43:17 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8;
4 5
5use Crossfire; 6use Time::HiRes 'time';
6use Crossfire::Client; 7use Event;
7use Crossfire::Protocol;
8
9use Client::Util;
10
11package Crossfire::Client; # uh, yeah
12
13use strict;
14
15our $CFG;
16our $VERSION = '0.1';
17 8
18use SDL; 9use SDL;
19use SDL::App; 10use SDL::App;
20use SDL::Event; 11use SDL::Event;
21use SDL::Surface; 12use SDL::Surface;
22use SDL::OpenGL; 13use SDL::OpenGL;
23use SDL::OpenGL::Constants;
24 14
25my $conn; 15use Crossfire;
26my $app; 16use Crossfire::Protocol;
27 17
28my $WIDTH = 640; 18use Compress::LZF;
29my $HEIGHT = 480;
30 19
31sub glinit { 20use CFClient;
32 # nuke all gl context data 21use CFClient::UI;
22
23our $VERSION = '0.1';
24
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;
36
37our $CFG;
38our $CONN;
39our $FAST; # fast, low-quality mode, possibly useful for software-rendering
40
41our @SDL_MODES;
42our $WIDTH;
43our $HEIGHT;
44our $FULLSCREEN;
45our $FONTSIZE;
46
47our $MAP;
48our $MAPWIDGET;
49our $BUTTONBAR;
50our $LOGVIEW;
51our $CONSOLE;
52our $METASERVER;
53
54our $SDL_ACTIVE;
55our $SDL_EV;
56our %SDL_CB;
57
58our $ALT_ENTER_MESSAGE;
59our $STATUS_LINE;
60our $DEBUG_STATUS;
61
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};
33 84
34 $app = new SDL::App 85 $CONN = new conn
35 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 86 host => $host,
36 -title => "Crossfire+ Client", 87 port => $port || 13327,
37 -width => $WIDTH, 88 user => $CFG->{user},
38 -height => $HEIGHT, 89 pass => $CFG->{password},
39 -opengl => 1, 90 mapw => $mapsize,
40 -red_size => 8, 91 maph => $mapsize,
41 -green_size => 8, 92 ;
42 -blue_size => 8,
43 -double_buffer => 1,
44 -resizeable => 0;
45 93
46 glEnable GL_TEXTURE_2D; 94 status "login successful";
47 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
48 glShadeModel GL_FLAT;
49 glDisable GL_DEPTH_TEST;
50 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
51 glEnable GL_BLEND;
52 95
53 glMatrixMode GL_PROJECTION; 96 CFClient::lowdelay fileno $CONN->{fh};
54 glLoadIdentity;
55 glOrtho 0, $WIDTH / 32, $HEIGHT / 32, 0, -1 , 1;
56
57 # re-bind all textures
58} 97}
59 98
60sub refresh { 99sub stop_game {
61 glClearColor 0, 0, 0, 0; 100 undef $CONN;
62 glClear GL_COLOR_BUFFER_BIT; 101}
63 102
64 my $map = $conn->{map}; 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]);
65 108
66 for my $x (0 .. $conn->{mapw} - 1) { 109 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
67 for my $y (0 .. $conn->{maph} - 1) { 110 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
68 111
69 my $cell = $map->[$x][$y] 112 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
70 or next; 113 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
71 114
72 my $darkness = $cell->[3] * (1 / 255); 115 $mode_slider->connect (changed => sub {
73 my $darkness = 0.8 + 0.2*rand; 116 my ($self, $value) = @_;
74 glColor $darkness, $darkness, $darkness;
75 117
76 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 118 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
77 my $tex = $conn->{face}[$num]{texture} || 0; 119 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
78 120 });
79 glBindTexture GL_TEXTURE_2D, $tex; 121 $mode_slider->emit (changed => $mode_slider->{range}[0]);
80 122
81 glBegin GL_QUADS; 123 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
82 glTexCoord 0, 0; glVertex $x, $y; 124 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
83 glTexCoord 0, 1; glVertex $x, $y + 1; 125 my ($self, $value) = @_;
84 glTexCoord 1, 1; glVertex $x + 1, $y + 1; 126 $CFG->{fullscreen} = $value;
85 glTexCoord 1, 0; glVertex $x + 1, $y; 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 ]);
86 glEnd; 234
235 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
236 for 0 .. $#$m;
87 } 237 }
88 } 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 });
89 } 263 }
90 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_focus_in => sub {
316 my ($input, $prev_focus) = @_;
317
318 delete $input->{refocus_map};
319
320 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
321 $input->{refocus_map} = 1;
322 }
323 delete $input->{auto_activated};
324 },
325 connect_activate => sub {
326 my ($input, $text) = @_;
327 $input->set_text ('');
328
329 if ($text =~ /^\/(.*)/) {
330 $::CONN->user_send ("command $1");
331 } else {
332 my $say_cmd = $::CFG->{say_command} || 'say';
333 $::CONN->user_send ("command $say_cmd $text");
334 }
335 if ($input->{refocus_map}) {
336 delete $input->{refocus_map};
337 $MAPWIDGET->focus_in
338 }
339 },
340 connect_escape => sub {
341 $MAPWIDGET->focus_in
342 },
343 );
344
345 $CONSOLE = {
346 window => $window,
347 input => $input
348 };
349
350 $window
351}
352
353sub sdl_init {
354 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
355 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
356 and die "SDL::Init failed!\n";
357}
358
359sub init_screen {
360 sdl_init;
361
362 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
363 $FULLSCREEN = $CFG->{fullscreen};
364 $FAST = $CFG->{fast};
365
366 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
367 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
368 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
369 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
370
371 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
372 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
373 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
374 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
375
376 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
377 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
378 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
379
380 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
381 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
382 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
383 or die "SDL::SetVideoMode failed!\n";
384
385 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
386
387 $SDL_EV = new SDL::Event;
388 $SDL_EV->set_unicode (1);
389
390 $SDL_ACTIVE = 1;
391
392 $LAST_REFRESH = time - 0.01;
393
394 CFClient::gl_init;
395
396 $FONTSIZE = int $HEIGHT / 40;
397
398 #############################################################################
399
400 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
401 $CFClient::UI::ROOT->add ($DEBUG_STATUS);
402
403 $STATUS_LINE = new CFClient::UI::Label
404 padding => 0,
405 y => $HEIGHT * 44 / 45 - $FONTSIZE;
406 $CFClient::UI::ROOT->add ($STATUS_LINE);
407
408 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
409 padding => 0,
410 y => $HEIGHT * 44 / 45,
411 height => $HEIGHT / 45,
412 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
413 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
414
415 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
416 $MAPWIDGET->focus_in;
417 $MAPWIDGET->connect (activate_console => sub {
418 my ($mapwidget, $preset) = @_;
419
420 if ($CONSOLE) {
421 $CONSOLE->{input}->{auto_activated} = 1;
422 $CONSOLE->{input}->focus_in;
423
424 if ($preset && $CONSOLE->{input}->get_text eq '') {
425 $CONSOLE->{input}->set_text ($preset);
426 }
427 }
428 });
429
430 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
431
432 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
433 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
434 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
435
436 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
437 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
438 status "Configuration Saved";
439 });
440
441 $BUTTONBAR->{children}[0]->emit ("activate");
442}
443
444sub destroy_screen {
445 $CFClient::UI::ROOT->{children} = [];
446 undef $SDL_ACTIVE;
447 undef $SDL_EV;
448 SDL::Quit;
449}
450
451my %animate_object;
452my $animate_timer;
453
454my $want_refresh;
455my $can_refresh;
456
457my $fps = 9;
458
459sub force_refresh {
460 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
461 debug sprintf "%3.2f", $fps;
462
463 $want_refresh = 0;
464 $can_refresh = 0;
465
466 $CFClient::UI::ROOT->draw;
467
91 SDL::GLSwapBuffers; 468 SDL::GLSwapBuffers;
92}
93 469
94my $ev = new SDL::Event; 470 $LAST_REFRESH = $NOW;
95my %ev_cb;
96
97sub event(&$) {
98 $ev_cb{$_[0]->()} = $_[1];
99} 471}
100 472
101sub does(&) { shift } 473my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
474 $NOW = time;
102 475
103event {SDL_QUIT} does { 476 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
104 exit; 477 while $SDL_EV->poll;
478
479 if (%animate_object) {
480 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
481 $want_refresh++;
482 }
483
484 if ($want_refresh) {
485 force_refresh;
486 } else {
487 $can_refresh = 1;
488 }
105}; 489});
106 490
107event {SDL_VIDEORESIZE} does { 491sub refresh {
108 print "resize\n"; 492 $want_refresh++;
109}; 493}
110 494
111event {SDL_VIDEOEXPOSE} does { 495sub animation_start {
112 refresh; 496 my ($widget) = @_;
113}; 497 $animate_object{$widget} = $widget;
498}
114 499
115event {SDL_KEYDOWN} does { 500sub animation_stop {
116 print "keypress\n"; 501 my ($widget) = @_;
117}; 502 delete $animate_object{$widget};
118 503}
119event {SDL_KEYUP} does {
120 print "keyup\n";#d#
121};
122
123event {SDL_MOUSEMOTION} does {
124 print "motion\n";
125};
126
127event {SDL_MOUSEBUTTONDOWN} does {
128 print "button\n";
129};
130
131event {SDL_MOUSEBUTTONUP} does {
132 print "buttup\n";
133};
134
135event {SDL_ACTIVEEVENT} does {
136 print "active\n";
137};
138
139package Crossfire::Client;
140 504
141@conn::ISA = Crossfire::Protocol::; 505@conn::ISA = Crossfire::Protocol::;
142 506
143sub conn::map_update { 507sub conn::user_send {
508 my ($self, $command) = @_;
509
510 $self->send ($command);
511 status $command;
512}
513
514sub conn::feed_map1a {
144 my ($self, $dirty) = @_; 515 my ($self, $data) = @_;
145 516
146 refresh; 517# $self->Crossfire::Protocol::feed_map1a ($data);
147}
148 518
149sub conn::map_scroll { 519 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
520 $MAP->map1a_update ($data);
521 $MAPWIDGET->update;
522}
523
524sub conn::flush_map {
150 my ($self, $dx, $dy) = @_; 525 my ($self) = @_;
151 526
152 refresh; 527 my $map_info = delete $self->{map_info}
528 or return;
529
530 my ($hash, $x, $y, $w, $h) = @$map_info;
531
532 my $data = $MAP->get_rect ($x, $y, $w, $h);
533 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
534
535 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
536
153} 537}
154 538
155sub conn::map_clear { 539sub conn::map_clear {
156 my ($self) = @_; 540 my ($self) = @_;
157 541
158 refresh; 542 $self->flush_map;
543
544 $MAP->clear;
545}
546
547sub conn::map_info {
548 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
549
550 $self->flush_map;
551
552 $x = $::MAP->ox - $x;
553 $y = $::MAP->oy - $y;
554
555 $self->{map_info} = [$hash, $x, $y, $w, $h];
556
557 if (defined (my $data = $MAPCACHE->get ($hash))) {
558 $data = Compress::LZF::decompress $data;
559 warn sprintf "LOADmap[%s] length %d\n", $hash, length $data;#d#
560 for my $id ($MAP->set_rect ($x, $y, $data)) {
561 my $data = $TILECACHE->get ($id)
562 or next;
563
564 $self->set_texture ($id => $data);
565 }
566 }
567}
568
569sub conn::face_find {
570 my ($self, $facenum, $face) = @_;
571
572 my $hash = "$face->{chksum},$face->{name}";
573
574 my $id = $FACEMAP->get ($hash);
575
576 unless ($id) {
577 # create new id for face
578 # i love transactions
579 for (1..100) {
580 my $txn = $CFClient::DB_ENV->txn_begin;
581 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
582 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
583 $id++;
584 if ($FACEMAP->put (id => $id) == 0
585 && $FACEMAP->put ($hash => $id) == 0) {
586 $txn->txn_commit;
587
588 goto gotid;
589 }
590 }
591 $txn->abort;
592 }
593
594 CFClient::fatal "maximum number of transaction retries reached - database problems?";
595 }
596
597gotid:
598 $face->{id} = $id;
599 $MAP->set_face ($facenum => $id);
600 $TILECACHE->get ($id)
159} 601}
160 602
161sub conn::face_update { 603sub conn::face_update {
162 my ($self, $num, $face) = @_; 604 my ($self, $facenum, $face) = @_;
163 605
164 warn "up face $self,$num,$face\n";#d# 606 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
165 use Gtk2;
166 607
167 my $pb = new Gtk2::Gdk::PixbufLoader; 608 $self->set_texture ($face->{id} => delete $face->{image});
168 $pb->write ($face->{image}); 609}
169 $pb->close;
170 610
171 $pb = $pb->get_pixbuf; 611sub conn::set_texture {
172 $pb = $pb->add_alpha (0, 0, 0, 0); 612 my ($self, $id, $data) = @_;
173 613
174 glGetError(); 614 $self->{texture}[$id] ||= do {
175 my ($tex) = @{glGenTextures 1}; 615 my $tex =
616 new_from_image CFClient::Texture
617 $data, minify => 1;
176 618
177 $face->{texture} = $tex; 619 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
620 $MAPWIDGET->update;
621
622 $tex
178 623 };
179 glBindTexture GL_TEXTURE_2D, $tex; 624}
180 my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr; 625
181 626sub conn::query {
182 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 627 my ($self, $flags, $prompt) = @_;
183 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 628
184 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 629 #TODO
185 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 630 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
631}
632
633sub conn::drawinfo {
634 my ($self, $color, $text) = @_;
635
636 my @color = (
637 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
638 [1.00, 1.00, 1.00],
639 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
640 [1.00, 0.00, 0.00],
641 [1.00, 0.54, 0.00],
642 [0.11, 0.56, 1.00],
643 [0.93, 0.46, 0.00],
644 [0.18, 0.54, 0.34],
645 [0.56, 0.73, 0.56],
646 [0.80, 0.80, 0.80],
647 [0.55, 0.41, 0.13],
648 [0.99, 0.77, 0.26],
649 [0.74, 0.65, 0.41],
186 650 );
187 glTexImage2D GL_TEXTURE_2D, 0, 651
188 GL_RGBA8, 652 $LOGVIEW->add_paragraph ($color[$color], $text);
189 $pb->get_width, $pb->get_height,
190 0,
191 GL_RGBA,
192 GL_UNSIGNED_BYTE,
193 $pb->get_pixels;
194 my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;
195} 653}
654
655%SDL_CB = (
656 SDL_QUIT() => sub {
657 Event::unloop -1;
658 },
659 SDL_VIDEORESIZE() => sub {
660 },
661 SDL_VIDEOEXPOSE() => sub {
662 refresh;
663 },
664 SDL_KEYDOWN() => sub {
665 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
666 # alt-enter
667 destroy_screen;
668 $CFG->{fullscreen} = !$CFG->{fullscreen};
669 init_screen;
670 } else {
671 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
672 }
673 },
674 SDL_KEYUP() => sub {
675 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
676 },
677 SDL_MOUSEMOTION() => sub {
678 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
679 },
680 SDL_MOUSEBUTTONDOWN() => sub {
681 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
682 },
683 SDL_MOUSEBUTTONUP() => sub {
684 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
685 },
686 SDL_ACTIVEEVENT() => sub {
687# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
688 },
689);
196 690
197############################################################################# 691#############################################################################
198 692
199use Event; 693$TILECACHE = CFClient::db_table "tilecache";
694$FACEMAP = CFClient::db_table "facemap";
200 695
201Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc"; 696CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
202 697
203 698my %DEF_CFG = (
204if ($ARGV[0] eq 'config') { 699 sdl_mode => 0,
205 Client::Util::run_config_dialog; 700 width => 640,
206} 701 height => 480,
207 702 fullscreen => 0,
208glinit; 703 fast => 0,
209 704 fow_enable => 1,
210$conn = new conn 705 fow_intensity => 0.45,
706 fow_smooth => 0,
707 log_fontsize => 14,
708 mapsize => 100,
211 host => "cf.schmorp.de", 709 host => "crossfire.schmorp.de",
212 port => 13327; 710 say_command => 'say',
213
214Event->timer (after => 0, interval => 1/20, hard => 1, cb => sub {
215 while ($ev->poll) {
216 ($ev_cb{$ev->type} || sub { warn "unhandled event ", $ev->type })->();
217 }
218}); 711);
712
713while (my ($k, $v) = each %DEF_CFG) {
714 $CFG->{$k} = $v unless exists $CFG->{$k};
715}
716
717sdl_init;
718
719@SDL_MODES = reverse
720 grep $_->[0] >= 640 && $_->[1] >= 480,
721 map [SDL::RectW ($_), SDL::RectH ($_)],
722 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
723
724@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
725
726$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
727
728init_screen;
729
730{
731 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
732
733 CFClient::add_font $_ for @fonts;
734 CFClient::set_font $fonts[0];
735}
219 736
220Event::loop; 737Event::loop;
221 738
739

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines