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.67 by root, Tue Apr 11 13:14:36 2006 UTC vs.
Revision 1.104 by root, Fri Apr 14 14:55:28 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 CFClient; 18use CFClient;
20use CFClient::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 64, 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 CFClient::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 CFClient::Widget::Label 0, 0, 1, $FONTSIZE, "";
97 $CFClient::Widget::TOPLEVEL->add ($DEBUG_STATUS);
98 73
99 $STATUS_LINE = new CFClient::Widget::Label
100 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE,
101 "";
102 $CFClient::Widget::TOPLEVEL->add ($STATUS_LINE);
103
104 $ALT_ENTER_MESSAGE = new CFClient::Widget::Label
105 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60,
106 "Use <b>Alt-Enter</b> to toggle fullscreen mode";
107 $CFClient::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
108
109 # Test code #d#
110 unless ($tw) { # haha...
111 $te = new CFClient::Widget::FancyFrame;
112 $te->add (new CFClient::Widget::Entry);
113 $te->move (300, 0, 2);
114 $CFClient::Widget::TOPLEVEL->add ($te);
115
116 $tw = new CFClient::Widget::Animator;
117 my $lbl1 = new CFClient::Widget::Label
118 0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
119 my $lbl2 = new CFClient::Widget::Label
120 0, 0, 10, $FONTSIZE, "LBL2";
121
122 my $vb = new CFClient::Widget::VBox;
123 my $f = new CFClient::Widget::FancyFrame;
124 my $f2 = new CFClient::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 $CFClient::Widget::TOPLEVEL->add ($tw);
136
137# $f->move ($WIDTH - 200, 0);
138# $CFClient::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 CFClient::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 (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
175 destroy_screen; 143 destroy_screen ();
144 init_screen ();
145 });
146
147 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
148 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
149 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
150 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
151 my ($self, $value) = @_;
152 $CFG->{host} = $value;
153 });
154
155 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
156 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
157 my ($self, $value) = @_;
158 $CFG->{port} = $value;
159 });
160
161 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
162 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
163 my ($self, $value) = @_;
164 $CFG->{user} = $value;
165 });
166
167 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
168 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
169 my ($self, $value) = @_;
170 $CFG->{password} = $value;
171 });
172
173 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
174 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
175 my ($self, $value) = @_;
176 $CFG->{say_command} = $value;
177 });
178
179 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
180 $table->add (1, 7, new CFClient::UI::Slider
181 req_w => 100,
182 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
183 connect_changed => sub {
184 my ($self, $value) = @_;
185
186 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
187 },
188 );
189
190 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
191 start_game;
192 });
193
194 $vbox->add (my $hbox = new CFClient::UI::HBox);
195
196 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
197 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
198 status "Configuration Saved";
199 });
200
201 $dialog
176} 202}
203
204sub console_window {
205 my $window = new CFClient::UI::FancyFrame
206 border_bg => [1, 1, 1, 0.5],
207 bg => [0.3, 0.3, 0.3, 0.8],
208 child => (my $vbox = new CFClient::UI::VBox);
209
210 $vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);
211 $vbox->add (my $input = new CFClient::UI::LineEntry);
212 $input->connect (activate => sub {
213 my ($input, $text) = @_;
214 $input->set_text ('');
215
216 if ($text =~ /^\/(.*)/) {
217 $::CONN->user_send ("command $1");
218 } else {
219 my $say_cmd = $::CFG->{say_command} || 'say';
220 $::CONN->user_send ("command $say_cmd $text");
221 }
222 1
223 });
224 $input->connect (escape => sub {
225 $MAPWIDGET->focus_in
226 });
227 $input->focus_in;
228
229 $CONSOLE = {
230 window => $window,
231 input => $input
232 };
233
234 $window
235}
236
237sub sdl_init {
238 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
239 and die "SDL::Init failed!\n";
240}
241
242sub init_screen {
243 sdl_init;
244
245 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
246 $FULLSCREEN = $CFG->{fullscreen};
247 $FAST = $CFG->{fast};
248
249 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
250 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
251 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
252 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
253
254 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
255 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
256 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
257 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
258
259 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
260 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
261 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
262
263 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
264 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
265 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
266 or die "SDL::SetVideoMode failed!\n";
267
268 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
269
270 $SDL_EV = new SDL::Event;
271 $SDL_EV->set_unicode (1);
272
273 $SDL_ACTIVE = 1;
274
275 $LAST_REFRESH = time - 0.01;
276
277 CFClient::gl_init;
278
279 $FONTSIZE = int $HEIGHT / 40;
280
281 #############################################################################
282
283 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
284 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
285
286 $STATUS_LINE = new CFClient::UI::Label
287 padding => 0,
288 y => $HEIGHT * 44 / 45 - $FONTSIZE;
289 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
290
291 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
292 padding => 0,
293 y => $HEIGHT * 44 / 45,
294 height => $HEIGHT / 45,
295 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
296 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
297
298 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
299 $MAPWIDGET->focus_in;
300 $MAPWIDGET->connect (activate_console => sub {
301 my ($mapwidget, $preset) = @_;
302
303 if ($CONSOLE) {
304 $CONSOLE->{input}->focus_in;
305
306 if ($preset && $CONSOLE->{input}->get_text eq '') {
307 $CONSOLE->{input}->set_text ($preset);
308 }
309 }
310 });
311
312 $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
313
314 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
315 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
316}
317
318sub destroy_screen {
319 $CFClient::UI::TOPLEVEL->{children} = [];
320 undef $SDL_ACTIVE;
321 undef $SDL_EV;
322 SDL::Quit;
323}
324
325my %animate_object;
326my $animate_timer;
327
328my $want_refresh;
329my $can_refresh;
330
331my $fps = 9;
177 332
178sub force_refresh { 333sub force_refresh {
334 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
335 debug sprintf "%3.2f", $fps;
336
337 $want_refresh = 0;
338 $can_refresh = 0;
339
179 glViewport 0, 0, $WIDTH, $HEIGHT; 340 glViewport 0, 0, $WIDTH, $HEIGHT;
341 glClearColor +($CFG->{fow_intensity}) x 3, 1;
342 glClear GL_COLOR_BUFFER_BIT;
180 343
181 glMatrixMode GL_PROJECTION; 344 glMatrixMode GL_PROJECTION;
182 glLoadIdentity; 345 glLoadIdentity;
183 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 346 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
184 glMatrixMode GL_MODELVIEW; 347 glMatrixMode GL_MODELVIEW;
348 glLoadIdentity;
185 349
186 glClear GL_COLOR_BUFFER_BIT;
187
188 $CFClient::Widget::TOPLEVEL->draw; 350 $CFClient::UI::TOPLEVEL->draw;
189 351
190 SDL::GLSwapBuffers; 352 SDL::GLSwapBuffers;
191}
192 353
193sub debug { 354 $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} 355}
198 356
199my $FPS; 357my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
358 $NOW = time;
359
360 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
361 while $SDL_EV->poll;
362
363 if (%animate_object) {
364 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
365 $want_refresh++;
366 }
367
368 if ($want_refresh) {
369 force_refresh;
370 } else {
371 $can_refresh = 1;
372 }
373});
200 374
201sub refresh { 375sub refresh {
202 $refresh_handler ||= add Glib::Idle sub { 376 $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", $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} 377}
235 378
236sub animation_start { 379sub animation_start {
237 my ($widget) = @_; 380 my ($widget) = @_;
238 $ANIMATE{$widget} = $widget; 381 $animate_object{$widget} = $widget;
239 Scalar::Util::weaken $ANIMATE{$widget};
240
241 refresh;
242} 382}
243 383
244sub animation_stop { 384sub animation_stop {
245 my ($widget) = @_; 385 my ($widget) = @_;
246 delete $ANIMATE{$widget}; 386 delete $animate_object{$widget};
387}
388
389@conn::ISA = Crossfire::Protocol::;
390
391sub conn::user_send {
392 my ($self, $command) = @_;
393
394 $self->send ($command);
395 status $command;
396}
397
398sub conn::feed_map1a {
399 my ($self, $data) = @_;
400
401# $self->Crossfire::Protocol::feed_map1a ($data);
402
403 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
404 $MAP->map1a_update ($data);
405 $MAPWIDGET->update;
406}
407
408#sub conn::map_update {
409# my ($self, $dirty) = @_;
410#
411# $MAPWIDGET->update;
412#}
413
414sub conn::map_clear {
415 my ($self) = @_;
416
417 $MAP->clear;
418
419# refresh;
420}
421
422sub conn::face_find {
423 my ($self, $face) = @_;
424
425 $FACECACHE->{"$face->{chksum},$face->{name}"}
426}
427
428sub conn::face_update {
429 my ($self, $facenum, $face) = @_;
430
431 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
432
433 my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
434
435 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
436 $MAPWIDGET->update;
437}
438
439sub conn::query {
440 my ($self, $flags, $prompt) = @_;
441
442 #TODO
443 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
444}
445
446sub conn::drawinfo {
447 my ($self, $color, $text) = @_;
448
449 my @color = (
450 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
451 [1.00, 1.00, 1.00],
452 [0.00, 0.00, 0.55],
453 [1.00, 0.00, 0.00],
454 [1.00, 0.54, 0.00],
455 [0.11, 0.56, 1.00],
456 [0.93, 0.46, 0.00],
457 [0.18, 0.54, 0.34],
458 [0.56, 0.73, 0.56],
459 [0.80, 0.80, 0.80],
460 [0.55, 0.41, 0.13],
461 [0.99, 0.77, 0.26],
462 [0.74, 0.65, 0.41],
463 );
464
465 $LOGVIEW->add_paragraph ($color[$color], $text);
247} 466}
248 467
249%SDL_CB = ( 468%SDL_CB = (
250 SDL_QUIT() => sub { 469 SDL_QUIT() => sub {
251 main_quit Gtk2; 470 Event::unloop -1;
252 }, 471 },
253 SDL_VIDEORESIZE() => sub { 472 SDL_VIDEORESIZE() => sub {
254 }, 473 },
255 SDL_VIDEOEXPOSE() => sub { 474 SDL_VIDEOEXPOSE() => sub {
256 refresh; 475 refresh;
257 }, 476 },
258 SDL_KEYDOWN() => sub { 477 SDL_KEYDOWN() => sub {
259 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 478 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
260 # alt-enter 479 # alt-enter
261 $FULLSCREEN = !$FULLSCREEN; 480 destroy_screen;
481 $CFG->{fullscreen} = !$CFG->{fullscreen};
262 init_screen; 482 init_screen;
263 } else { 483 } else {
264 CFClient::Widget::feed_sdl_key_down_event ($SDL_EV); 484 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
265 } 485 }
266 }, 486 },
267 SDL_KEYUP() => sub { 487 SDL_KEYUP() => sub {
268 CFClient::Widget::feed_sdl_key_up_event ($SDL_EV); 488 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
269 }, 489 },
270 SDL_MOUSEMOTION() => sub { 490 SDL_MOUSEMOTION() => sub {
271 CFClient::Widget::feed_sdl_motion_event ($SDL_EV); 491 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
272 }, 492 },
273 SDL_MOUSEBUTTONDOWN() => sub { 493 SDL_MOUSEBUTTONDOWN() => sub {
274 CFClient::Widget::feed_sdl_button_down_event ($SDL_EV); 494 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
275 }, 495 },
276 SDL_MOUSEBUTTONUP() => sub { 496 SDL_MOUSEBUTTONUP() => sub {
277 CFClient::Widget::feed_sdl_button_up_event ($SDL_EV); 497 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
278 }, 498 },
279 SDL_ACTIVEEVENT() => sub { 499 SDL_ACTIVEEVENT() => sub {
280 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 500# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
281 }, 501 },
282); 502);
283 503
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 CFClient::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 CFClient::write_cfg "$CFrossfire::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############################################################################# 504#############################################################################
424 505
425SDL::Init SDL_INIT_EVERYTHING;
426
427my $mapwidget = CFClient::Widget::MapWidget->new;
428
429$CFClient::Widget::TOPLEVEL->add ($mapwidget);
430$mapwidget->focus_in;
431
432CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 506CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
433 507
434$CFG ||= { 508my %DEF_CFG = (
435 width => 640, 509 width => 640,
436 height => 480, 510 height => 480,
511 fast => 0,
512 fow_enable => 1,
513 fow_intensity => 0.45,
514 fow_smooth => 0,
515 fullscreen => 0,
516 sdl_mode => 0,
437 mapsize => 100, 517 mapsize => 100,
438 fullscreen => 0,
439 host => "crossfire.schmorp.de", 518 host => "crossfire.schmorp.de",
440 port => 13327, 519 port => 13327,
441}; 520 say_command => 'say',
521);
522
523while (my ($k, $v) = each %DEF_CFG) {
524 $CFG->{$k} = $v unless exists $CFG->{$k};
525}
526
527sdl_init;
528
529@SDL_MODES = reverse
530 grep $_->[0] >= 640 && $_->[1] >= 480,
531 map [SDL::RectW ($_), SDL::RectH ($_)],
532 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
533
534@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
535
536$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
537
538init_screen;
442 539
443{ 540{
444 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 541 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
445 542
446 CFClient::add_font $_ for @fonts; 543 CFClient::add_font $_ for @fonts;
447 CFClient::set_font $fonts[0]; 544 CFClient::set_font $fonts[0];
448} 545}
449 546
450$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 547$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
451 548
452run_config_dialog 549Event::loop;
453 login => sub { start_game },
454 logout => sub { stop_game };
455 550
456main Gtk2;
457
458CFsave_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; 551Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
552

Diff Legend

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