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

Diff Legend

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