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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines