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.14 by elmex, Fri Apr 7 16:36:44 2006 UTC vs.
Revision 1.110 by root, Sat Apr 15 12:30:53 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8;
4 5
5use Glib; 6use Time::HiRes 'time';
6use Gtk2 -init; 7use Event;
7 8
8use SDL; 9use SDL;
9use SDL::App; 10use SDL::App;
10use SDL::Event; 11use SDL::Event;
11use SDL::Surface; 12use SDL::Surface;
12use SDL::OpenGL; 13use SDL::OpenGL;
13use SDL::OpenGL::Constants;
14 14
15use Crossfire; 15use Crossfire;
16use Crossfire::Client;
17use Crossfire::Protocol; 16use Crossfire::Protocol;
18 17
18use CFClient;
19use Client::Util; 19use CFClient::UI;
20 20
21our $VERSION = '0.1'; 21our $VERSION = '0.1';
22
23my $MAX_FPS = 60;
24my $MIN_FPS = 5; # unused as of yet
25
26our $FACECACHE;
27
28our $LAST_REFRESH;
29our $NOW;
22 30
23our $CFG; 31our $CFG;
24our $CONN; 32our $CONN;
33our $FAST; # fast, low-quality mode, possibly useful for software-rendering
25 34
35our @SDL_MODES;
36our $WIDTH;
37our $HEIGHT;
38our $FULLSCREEN;
39our $FONTSIZE;
40
41our $MAP;
42our $MAPWIDGET;
43
26our $SDL_TIMER; 44our $SDL_ACTIVE;
27our $SDL_APP; 45our $SDL_EV;
28our $SDL_EV = new SDL::Event;
29our %SDL_CB; 46our %SDL_CB;
30 47
31sub init_screen { 48our $ALT_ENTER_MESSAGE;
32 # nuke all gl context data 49our $STATUS_LINE;
50our $DEBUG_STATUS;
51our $BUTTONBAR;
52our $LOGVIEW;
53our $CONSOLE;
54
55sub status {
56 $STATUS_LINE->set_text ($_[0]);
57 my ($w, $h) = $STATUS_LINE->size_request;
58 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
59}
60
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}
66
67sub start_game {
68 status "logging in...";
69
70 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
71
72 $MAP = new CFClient::Map $mapsize, $mapsize;
33 73
34 $SDL_APP = new SDL::App
35 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
36 -title => "Crossfire+ Client",
37 -width => $CFG->{width},
38 -height => $CFG->{height},
39 -opengl => 1,
40 -red_size => 8,
41 -green_size => 8,
42 -blue_size => 8,
43 -double_buffer => 1,
44 -fullscreen => $CFG->{fullscreen},
45 -resizeable => 0;
46
47 glEnable GL_TEXTURE_2D;
48 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
49 glShadeModel GL_FLAT;
50 glDisable GL_DEPTH_TEST;
51 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
52 glEnable GL_BLEND;
53
54 glMatrixMode GL_PROJECTION;
55 glLoadIdentity;
56 glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1;
57
58 # re-bind all textures
59}
60
61sub start_game {
62 $SDL_TIMER = add Glib::Timeout 1000/20, sub {
63 while ($SDL_EV->poll) {
64 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->();
65 }
66
67 1
68 };
69
70 init_screen;
71
72 $CONN = new conn 74 $CONN = new conn
73 host => $CFG->{host}, 75 host => $CFG->{host},
74 port => $CFG->{port}; 76 port => $CFG->{port},
77 user => $CFG->{user},
78 pass => $CFG->{password},
79 mapw => $mapsize,
80 maph => $mapsize,
81 ;
82
83 status "login successful";
84
85 CFClient::lowdelay fileno $CONN->{fh};
75} 86}
76 87
77sub stop_game { 88sub stop_game {
78 remove Glib::Source $SDL_TIMER; 89 undef $CONN;
79
80 undef $SDL_APP;
81 SDL::Quit;
82} 90}
83 91
84sub refresh { 92sub config_dialog {
85 glClearColor 0, 0, 0, 0; 93 my $dialog = new CFClient::UI::FancyFrame
86 glClear GL_COLOR_BUFFER_BIT; 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]);
87 97
88 my $map = $CONN->{map}; 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);
89 100
90 for my $x (0 .. $CONN->{mapw} - 1) { 101 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
91 for my $y (0 .. $CONN->{maph} - 1) { 102 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
92 103
93 my $cell = $map->[$x][$y] 104 $mode_slider->connect (changed => sub {
94 or next; 105 my ($self, $value) = @_;
95 106
96 my $darkness = $cell->[3] * (1 / 255); 107 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
97 glColor $darkness, $darkness, $darkness; 108 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
109 });
110 $mode_slider->emit (changed => $mode_slider->{range}[0]);
98 111
99 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 112 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
100 my $tex = $CONN->{face}[$num]{texture} || 0; 113 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
101 114 my ($self, $value) = @_;
102 glBindTexture GL_TEXTURE_2D, $tex; 115 $CFG->{fullscreen} = $value;
116 });
103 117
104 glBegin GL_QUADS; 118 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
105 glTexCoord 0, 0; glVertex $x, $y; 119 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
106 glTexCoord 0, 1; glVertex $x, $y + 1; 120 my ($self, $value) = @_;
107 glTexCoord 1, 1; glVertex $x + 1, $y + 1; 121 $CFG->{fast} = $value;
108 glTexCoord 1, 0; glVertex $x + 1, $y; 122 });
109 glEnd; 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 {
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
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 | SDL_INIT_NOPARACHUTE
251 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
252 and die "SDL::Init failed!\n";
253}
254
255sub init_screen {
256 sdl_init;
257
258 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
259 $FULLSCREEN = $CFG->{fullscreen};
260 $FAST = $CFG->{fast};
261
262 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
263 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
264 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
265 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
266
267 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
268 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
269 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
270 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
271
272 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
273 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
274 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
275
276 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
277 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
278 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
279 or die "SDL::SetVideoMode failed!\n";
280
281 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
282
283 $SDL_EV = new SDL::Event;
284 $SDL_EV->set_unicode (1);
285
286 $SDL_ACTIVE = 1;
287
288 $LAST_REFRESH = time - 0.01;
289
290 CFClient::gl_init;
291
292 $FONTSIZE = int $HEIGHT / 40;
293
294 #############################################################################
295
296 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
297 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
298
299 $STATUS_LINE = new CFClient::UI::Label
300 padding => 0,
301 y => $HEIGHT * 44 / 45 - $FONTSIZE;
302 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
303
304 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
305 padding => 0,
306 y => $HEIGHT * 44 / 45,
307 height => $HEIGHT / 45,
308 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
309 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
310
311 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
312 $MAPWIDGET->focus_in;
313 $MAPWIDGET->connect (activate_console => sub {
314 my ($mapwidget, $preset) = @_;
315
316 if ($CONSOLE) {
317 $CONSOLE->{input}->focus_in;
318
319 if ($preset && $CONSOLE->{input}->get_text eq '') {
320 $CONSOLE->{input}->set_text ($preset);
110 } 321 }
111 } 322 }
323 });
324
325 $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
326
327 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper text => "Client Setup", other => config_dialog, state => 1);
328 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper text => "Server", other => config_dialog, state => 1);
329 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper text => "Console", other => console_window);
330 $BUTTONBAR->add (my $setup = new CFClient::UI::Button text => "Save Config", other => console_window);
331}
332
333sub destroy_screen {
334 $CFClient::UI::TOPLEVEL->{children} = [];
335 undef $SDL_ACTIVE;
336 undef $SDL_EV;
337 SDL::Quit;
338}
339
340my %animate_object;
341my $animate_timer;
342
343my $want_refresh;
344my $can_refresh;
345
346my $fps = 9;
347
348sub force_refresh {
349 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
350 debug sprintf "%3.2f", $fps;
351
352 $want_refresh = 0;
353 $can_refresh = 0;
354
355 $CFClient::UI::TOPLEVEL->draw;
356
357 SDL::GLSwapBuffers;
358
359 $LAST_REFRESH = $NOW;
360}
361
362my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
363 $NOW = time;
364
365 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
366 while $SDL_EV->poll;
367
368 if (%animate_object) {
369 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
370 $want_refresh++;
112 } 371 }
113 372
114 SDL::GLSwapBuffers; 373 if ($want_refresh) {
374 force_refresh;
375 } else {
376 $can_refresh = 1;
377 }
378});
379
380sub refresh {
381 $want_refresh++;
382}
383
384sub animation_start {
385 my ($widget) = @_;
386 $animate_object{$widget} = $widget;
387}
388
389sub animation_stop {
390 my ($widget) = @_;
391 delete $animate_object{$widget};
392}
393
394@conn::ISA = Crossfire::Protocol::;
395
396sub conn::user_send {
397 my ($self, $command) = @_;
398
399 $self->send ($command);
400 status $command;
401}
402
403sub conn::feed_map1a {
404 my ($self, $data) = @_;
405
406# $self->Crossfire::Protocol::feed_map1a ($data);
407
408 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
409 $MAP->map1a_update ($data);
410 $MAPWIDGET->update;
411}
412
413#sub conn::map_update {
414# my ($self, $dirty) = @_;
415#
416# $MAPWIDGET->update;
417#}
418
419sub conn::map_clear {
420 my ($self) = @_;
421
422 $MAP->clear;
423
424# refresh;
425}
426
427sub conn::face_find {
428 my ($self, $face) = @_;
429
430 $FACECACHE->{"$face->{chksum},$face->{name}"}
431}
432
433sub conn::face_update {
434 my ($self, $facenum, $face) = @_;
435
436 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
437
438 my $tex = $face->{texture} =
439 new_from_image CFClient::Texture
440 delete $face->{image}, minify => 1;
441
442 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
443 $MAPWIDGET->update;
444}
445
446sub conn::query {
447 my ($self, $flags, $prompt) = @_;
448
449 #TODO
450 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
451}
452
453sub conn::drawinfo {
454 my ($self, $color, $text) = @_;
455
456 my @color = (
457 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
458 [1.00, 1.00, 1.00],
459 [0.00, 0.00, 0.55],
460 [1.00, 0.00, 0.00],
461 [1.00, 0.54, 0.00],
462 [0.11, 0.56, 1.00],
463 [0.93, 0.46, 0.00],
464 [0.18, 0.54, 0.34],
465 [0.56, 0.73, 0.56],
466 [0.80, 0.80, 0.80],
467 [0.55, 0.41, 0.13],
468 [0.99, 0.77, 0.26],
469 [0.74, 0.65, 0.41],
470 );
471
472 $LOGVIEW->add_paragraph ($color[$color], $text);
115} 473}
116 474
117%SDL_CB = ( 475%SDL_CB = (
118 SDL_QUIT() => sub { 476 SDL_QUIT() => sub {
119 warn "sdl quit\n";#d# 477 Event::unloop -1;
120 exit;
121 }, 478 },
122 SDL_VIDEORESIZE() => sub { 479 SDL_VIDEORESIZE() => sub {
123 }, 480 },
124 SDL_VIDEOEXPOSE() => sub { 481 SDL_VIDEOEXPOSE() => sub {
125 refresh; 482 refresh;
126 }, 483 },
127 SDL_KEYDOWN() => sub { 484 SDL_KEYDOWN() => sub {
485 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
486 # alt-enter
487 destroy_screen;
488 $CFG->{fullscreen} = !$CFG->{fullscreen};
489 init_screen;
490 } else {
491 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
492 }
128 }, 493 },
129 SDL_KEYUP() => sub { 494 SDL_KEYUP() => sub {
495 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
130 }, 496 },
131 SDL_MOUSEMOTION() => sub { 497 SDL_MOUSEMOTION() => sub {
132 warn "sdl motion\n";#d# 498 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
133 }, 499 },
134 SDL_MOUSEBUTTONDOWN() => sub { 500 SDL_MOUSEBUTTONDOWN() => sub {
501 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
135 }, 502 },
136 SDL_MOUSEBUTTONUP() => sub { 503 SDL_MOUSEBUTTONUP() => sub {
504 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
137 }, 505 },
138 SDL_ACTIVEEVENT() => sub { 506 SDL_ACTIVEEVENT() => sub {
139 warn "active\n";#d# 507# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
140 }, 508 },
141); 509);
142 510
143@conn::ISA = Crossfire::Protocol::;
144
145sub conn::map_update {
146 my ($self, $dirty) = @_;
147
148 refresh;
149}
150
151sub conn::map_scroll {
152 my ($self, $dx, $dy) = @_;
153
154 refresh;
155}
156
157sub conn::map_clear {
158 my ($self) = @_;
159
160 refresh;
161}
162
163sub conn::face_update {
164 my ($self, $num, $face) = @_;
165
166 my $pb = new Gtk2::Gdk::PixbufLoader;
167 $pb->write ($face->{image});
168 $pb->close;
169
170 $pb = $pb->get_pixbuf;
171 $pb = $pb->add_alpha (0, 0, 0, 0);
172
173 glGetError();
174 my ($tex) = @{glGenTextures 1};
175
176 $face->{texture} = $tex;
177
178 glBindTexture GL_TEXTURE_2D, $tex;
179 my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;
180
181 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
182 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
183 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
184 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
185
186 glTexImage2D GL_TEXTURE_2D, 0,
187 GL_RGBA8,
188 $pb->get_width, $pb->get_height,
189 0,
190 GL_RGBA,
191 GL_UNSIGNED_BYTE,
192 $pb->get_pixels;
193 my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;
194}
195
196############################################################################# 511#############################################################################
197 512
198Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc"; 513CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
199 514
200$CFG ||= { 515my %DEF_CFG = (
516 sdl_mode => 0,
201 width => 640, 517 width => 640,
202 height => 480, 518 height => 480,
203 fullscreen => 0, 519 fullscreen => 0,
520 fast => 0,
521 fow_enable => 1,
522 fow_intensity => 0.45,
523 fow_smooth => 0,
524 log_fontsize => 14,
525 mapsize => 100,
204 host => "crossfire.schmorp.de", 526 host => "crossfire.schmorp.de",
205 port => 13327, 527 port => 13327,
206}; 528 say_command => 'say',
529);
207 530
208Client::Util::run_config_dialog 531while (my ($k, $v) = each %DEF_CFG) {
209 login => sub { print "Login $_[0] with $_[1]\n" }, 532 $CFG->{$k} = $v unless exists $CFG->{$k};
210 logout => sub { print "Logout" }; 533}
211 534
212main Gtk2; 535sdl_init;
213 536
537@SDL_MODES = reverse
538 grep $_->[0] >= 640 && $_->[1] >= 480,
539 map [SDL::RectW ($_), SDL::RectH ($_)],
540 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
541
542@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
543
544$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
545
546init_screen;
547
548{
549 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
550
551 CFClient::add_font $_ for @fonts;
552 CFClient::set_font $fonts[0];
553}
554
555$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
556
557Event::loop;
558
559Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
560

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines