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.31 by elmex, Sat Apr 8 16:34:47 2006 UTC vs.
Revision 1.75 by root, Tue Apr 11 21:24:10 2006 UTC

… …
12use SDL::Surface; 12use SDL::Surface;
13use SDL::OpenGL; 13use SDL::OpenGL;
14use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
15 15
16use Crossfire; 16use Crossfire;
17use Crossfire::Client;
18use Crossfire::Protocol; 17use Crossfire::Protocol;
19 18
20use Crossfire::Client::Widget; 19use CFClient;
20use CFClient::UI;
21
22our $VERSION = '0.1';
23
24my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
21 26
22our $FACECACHE; 27our $FACECACHE;
23
24our $VERSION = '0.1';
25
26our %GL_EXT;
27 28
28our $CFG; 29our $CFG;
29our $CONN; 30our $CONN;
30 31
32our @SDL_MODES;
31our $WIDTH; 33our $WIDTH;
32our $HEIGHT; 34our $HEIGHT;
33our $FULLSCREEN; 35our $FULLSCREEN;
34 36
37our $NOW;
38
39our $MAPWIDGET;
35our $UIFONT; 40our $FONTSIZE;
36 41
37our $SDL_TIMER; 42our $SDL_TIMER;
38our $SDL_APP; 43our $SDL_APP;
39our $SDL_EV = new SDL::Event; 44our $SDL_EV;
40our %SDL_CB; 45our %SDL_CB;
41 46
42our @GL_INIT; # hooks called on every gl init
43
44our $ALT_ENTER_MESSAGE; 47our $ALT_ENTER_MESSAGE;
48our $STATUS_LINE;
49our $DEBUG_STATUS;
50
51my $last_refresh;
52my %ANIMATE;
53my $refresh_handler;
54
55our ($tw, $te); # Test widget #d#
45 56
46sub init_screen { 57sub init_screen {
47 $SDL_APP = new SDL::App 58 $SDL_APP = new SDL::App
48 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 59 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
49 -title => "Crossfire+ Client", 60 -title => "Crossfire+ Client",
50 -width => $WIDTH, 61 -width => $WIDTH,
51 -height => $HEIGHT, 62 -height => $HEIGHT,
52 -opengl => 1, 63 -opengl => 1,
53 -red_size => 8, 64 -red_size => 5,
54 -green_size => 8, 65 -green_size => 5,
55 -blue_size => 8, 66 -blue_size => 5,
67 -alpha_size => 0,
56 -double_buffer => 1, 68 -double_buffer => 1,
57 -fullscreen => $FULLSCREEN, 69 -fullscreen => $FULLSCREEN,
58 -resizeable => 0; 70 -resizeable => 0;
59 71
60 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 72 $SDL_EV = new SDL::Event;
73 $SDL_EV->set_unicode (1);
61 74
62 $GL_EXT{GL_ARB_texture_non_power_of_two} 75 $SDL_TIMER = add Glib::Timeout 1000/50, sub {
63 or warn "WARNING: non-power-of-two opengl extension required"; 76 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
77 while $SDL_EV->poll;
64 78
65 $UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $HEIGHT / 40 79 1
66 or die "TTFOpenFont: $!"; 80 };
67 81
68 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Alt-Enter toggles fullscreen mode"; 82 $last_refresh = SDL::GetTicks;
69 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
70 $ALT_ENTER_MESSAGE->activate;
71 83
84 CFClient::gl_init;
85
86 $FONTSIZE = int $HEIGHT / 50;
87
88 #############################################################################
89
72 glClearColor 0, 0, 0, 0; 90 glClearColor 0.45, 0.45, 0.45, 1;
73 91
74 glEnable GL_TEXTURE_2D; 92 glEnable GL_TEXTURE_2D;
93 glEnable GL_COLOR_MATERIAL;
75 glShadeModel GL_FLAT; 94 glShadeModel GL_FLAT;
76 glDisable GL_DEPTH_TEST; 95 glDisable GL_DEPTH_TEST;
77 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 96 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
78 97
79 glMatrixMode GL_PROJECTION; 98 #############################################################################
80 glLoadIdentity;
81 glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;
82 99
83 glMatrixMode GL_MODELVIEW; 100 $DEBUG_STATUS = new CFClient::UI::Label;
101 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
102
103 $STATUS_LINE = new CFClient::UI::Label
104 y => $HEIGHT * 59 / 60 - $FONTSIZE;
105 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
84 106
85 $_->() for @GL_INIT; 107 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
108 y => $HEIGHT * 59 / 60,
109 height => $HEIGHT / 60,
110 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
111 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
112
113 $MAPWIDGET = new CFClient::UI::MapWidget;
114 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
115 $MAPWIDGET->focus_in;
116}
117
118sub destroy_screen {
119 remove Glib::Source $SDL_TIMER;
120 undef $SDL_APP;
121 undef $SDL_EV;
122 SDL::Quit;
123}
124
125sub config_dialog {
126 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
127 child => (my $vbox = new CFClient::UI::VBox);
128 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
129 $vbox->add (my $table = new CFClient::UI::Table);
130
131 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
132 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
133
134 $hbox->add (my $mode_slider = new CFClient::UI::Slider req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
135 $hbox->add (my $mode_label = new CFClient::UI::Label);
136
137 $mode_slider->connect (changed => sub {
138 my (undef, $value) = @_;
139
140 $CFG->{sdl_mode} = $value = int $value + 0.5;
141 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
142 });
143 $mode_slider->emit (changed => $mode_slider->{range}[0]);
144
145 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Host");
146 $table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
147
148 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
149 $table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
150
151 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
152 $table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
153
154 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
155 $table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
156
157 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
158 $table->add (1, 5, my $mapsize_slider = new CFClient::UI::Slider req_w => 100, range => [$CFG->{mapsize}, 10, 100 + 1, 1]);
159
160 $CFClient::UI::TOPLEVEL->add ($dialog);
86} 161}
87 162
88sub start_game { 163sub start_game {
89 $SDL_TIMER = add Glib::Timeout 1000/100, sub {
90 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
91 while $SDL_EV->poll;
92
93 1
94 };
95
96 $WIDTH = $CFG->{width}; 164 $WIDTH = $CFG->{width};
97 $HEIGHT = $CFG->{height}; 165 $HEIGHT = $CFG->{height};
98 $FULLSCREEN = 0; 166 $FULLSCREEN = 0;
99 167
100 init_screen; 168 init_screen;
169
170 config_dialog;
171
172 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
101 173
102 $CONN = new conn 174 $CONN = new conn
103 host => $CFG->{host}, 175 host => $CFG->{host},
104 port => $CFG->{port}, 176 port => $CFG->{port},
105 user => $CFG->{user}, 177 user => $CFG->{user},
106 pass => $CFG->{password}; 178 pass => $CFG->{password},
179 mapw => $mapsize,
180 maph => $mapsize,
181 ;
182
183 CFClient::lowdelay fileno $CONN->{fh};
107} 184}
108 185
109sub stop_game { 186sub stop_game {
110 remove Glib::Source $SDL_TIMER; 187 remove Glib::Source $refresh_handler if $refresh_handler;
188 undef $refresh_handler;
111 189
112 undef $SDL_APP; 190 undef $CONN;
113 SDL::Quit; 191 destroy_screen;
114} 192}
115
116 193
117sub force_refresh { 194sub force_refresh {
118 glViewport 0, 0, $WIDTH, $HEIGHT; 195 glViewport 0, 0, $WIDTH, $HEIGHT;
196
197 glMatrixMode GL_PROJECTION;
198 glLoadIdentity;
199 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
200 glMatrixMode GL_MODELVIEW;
201 glLoadIdentity;
202
119 glClear GL_COLOR_BUFFER_BIT; 203 glClear GL_COLOR_BUFFER_BIT;
120 204
121 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS; 205 $CFClient::UI::TOPLEVEL->draw;
122 206
123 SDL::GLSwapBuffers; 207 SDL::GLSwapBuffers;
124} 208}
125 209
126my $refresh_handler; 210sub debug {
211 $DEBUG_STATUS->set_text ($_[0]);
212 my ($w, $h) = $DEBUG_STATUS->size_request;
213 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
214}
215
216my $FPS;
127 217
128sub refresh { 218sub refresh {
129 $refresh_handler ||= add Glib::Idle sub { 219 $refresh_handler ||= add Glib::Idle sub {
220 if ($SDL_APP) {
221 $NOW = SDL::GetTicks;
222
223 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
224 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
225 $NOW = SDL::GetTicks;
226 }
227
228 my $interval = ($NOW - $last_refresh) * 0.001;
229 $last_refresh = $NOW;
230
231 if ($interval) {
232 $FPS ||= 1 / $interval;
233 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04;
234 debug sprintf "%5.02f", $FPS;
235 }
236
130 force_refresh; 237 force_refresh;
238 $_->animate ($interval) for grep $_, values %ANIMATE;
239
240 if (%ANIMATE) {
241 1
242 } else {
243 undef $refresh_handler;
244 0
245 }
246 } else {
131 undef $refresh_handler; 247 undef $refresh_handler;
248 0
132 0 249 }
133 }; 250 };
251}
252
253sub animation_start {
254 my ($widget) = @_;
255 $ANIMATE{$widget} = $widget;
256 Scalar::Util::weaken $ANIMATE{$widget};
257
258 refresh;
259}
260
261sub animation_stop {
262 my ($widget) = @_;
263 delete $ANIMATE{$widget};
134} 264}
135 265
136%SDL_CB = ( 266%SDL_CB = (
137 SDL_QUIT() => sub { 267 SDL_QUIT() => sub {
138 main_quit Gtk2; 268 main_quit Gtk2;
… …
146 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 276 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
147 # alt-enter 277 # alt-enter
148 $FULLSCREEN = !$FULLSCREEN; 278 $FULLSCREEN = !$FULLSCREEN;
149 init_screen; 279 init_screen;
150 } else { 280 } else {
151 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 281 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
152 } 282 }
153 }, 283 },
154 SDL_KEYUP() => sub { 284 SDL_KEYUP() => sub {
155 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 285 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
156 }, 286 },
157 SDL_MOUSEMOTION() => sub { 287 SDL_MOUSEMOTION() => sub {
158 warn "sdl motion\n";#d# 288 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
159 }, 289 },
160 SDL_MOUSEBUTTONDOWN() => sub { 290 SDL_MOUSEBUTTONDOWN() => sub {
161 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 291 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
162 }, 292 },
163 SDL_MOUSEBUTTONUP() => sub { 293 SDL_MOUSEBUTTONUP() => sub {
164 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 294 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
165 }, 295 },
166 SDL_ACTIVEEVENT() => sub { 296 SDL_ACTIVEEVENT() => sub {
167 warn "active\n";#d# 297# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
168 }, 298 },
169); 299);
170 300
171@conn::ISA = Crossfire::Protocol::; 301@conn::ISA = Crossfire::Protocol::;
172 302
173sub conn::map_update { 303sub conn::map_update {
174 my ($self, $dirty) = @_; 304 my ($self, $dirty) = @_;
175 305
176 refresh; 306 $MAPWIDGET->update;
177} 307}
178 308
179sub conn::map_scroll { 309sub conn::map_scroll {
180 my ($self, $dx, $dy) = @_; 310 my ($self, $dx, $dy) = @_;
181 311
182 refresh; 312# refresh;
183} 313}
184 314
185sub conn::map_clear { 315sub conn::map_clear {
186 my ($self) = @_; 316 my ($self) = @_;
187 317
188 refresh; 318# refresh;
189} 319}
190 320
191sub conn::face_find { 321sub conn::face_find {
192 my ($self, $face) = @_; 322 my ($self, $face) = @_;
193 323
… …
197sub conn::face_update { 327sub conn::face_update {
198 my ($self, $face) = @_; 328 my ($self, $face) = @_;
199 329
200 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 330 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
201 331
202 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 332 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
333}
334
335sub conn::query {
336 my ($self, $flags, $prompt) = @_;
337
338 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
203} 339}
204 340
205sub gtk_add_cfg_field { 341sub gtk_add_cfg_field {
206 my ($tbl, $cfg, $klbl, $key, $value) = @_; 342 my ($tbl, $cfg, $klbl, $key, $value) = @_;
207 my $i = $cfg->{_i}++; 343 my $i = $cfg->{_i}++;
… …
213 } 349 }
214 $ent->set_text ($value); 350 $ent->set_text ($value);
215 $ent->signal_connect (changed => sub { 351 $ent->signal_connect (changed => sub {
216 my ($ent) = @_; 352 my ($ent) = @_;
217 $cfg->{$key} = $ent->get_text; 353 $cfg->{$key} = $ent->get_text;
354 # TODO: Mapsize should be a slider in the game gui
355 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
356 $cfg->{$key} = 100;
357 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
358 $cfg->{$key} = 50;
359 }
218 }); 360 });
219} 361}
220 362
221sub run_config_dialog { 363sub run_config_dialog {
222 my (%events) = @_; 364 my (%events) = @_;
… …
224 my $w = Gtk2::Window->new; 366 my $w = Gtk2::Window->new;
225 367
226 my @cfg = ( 368 my @cfg = (
227 [qw/Host host/], 369 [qw/Host host/],
228 [qw/Port port/], 370 [qw/Port port/],
371 [qw/Mapsize% mapsize/],
229 [qw/Username user/], 372 [qw/Username user/],
230 [qw/Password password/], 373 [qw/Password password/],
231 ); 374 );
232 375
233 my $cfg = {}; 376 my $cfg = {};
234
235 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
236 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
237 377
238 $w->add (my $vb = Gtk2::VBox->new); 378 $w->add (my $vb = Gtk2::VBox->new);
239 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 379 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
240 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 380 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
241 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 381 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
242 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 382 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
243 my $i = 0; 383 my $i = 0;
244 my $act = 0; 384 my $act = 0;
245 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 385 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
246 if ($_ eq $selmode) { $act = $i } 386 if ($_ eq $selmode) { $act = $i }
247 $cb->append_text ($_); 387 $cb->append_text ($_);
248 $i++; 388 $i++;
249 } 389 }
250 $cb->set_active ($act); 390 $cb->set_active ($act);
… …
267 $cb->signal_connect (clicked => sub { 407 $cb->signal_connect (clicked => sub {
268 for (keys %$cfg) { 408 for (keys %$cfg) {
269 $::CFG->{$_} = $cfg->{$_} 409 $::CFG->{$_} = $cfg->{$_}
270 if $_ ne '_i'; 410 if $_ ne '_i';
271 } 411 }
272 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 412 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
273 }); 413 });
274 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 414 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
275 $cb->signal_connect (clicked => sub { 415 $cb->signal_connect (clicked => sub {
276 for (keys %$cfg) { 416 for (keys %$cfg) {
277 $::CFG->{$_} = $cfg->{$_} 417 $::CFG->{$_} = $cfg->{$_}
… …
280 my $cb = $events{login} || sub {}; 420 my $cb = $events{login} || sub {};
281 $cb->($::CFG->{user}, $::CFG->{password}); 421 $cb->($::CFG->{user}, $::CFG->{password});
282 }); 422 });
283 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5); 423 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
284 $cb->signal_connect (clicked => sub { 424 $cb->signal_connect (clicked => sub {
285 my $cb = $events{login} || sub {}; 425 my $cb = $events{logout} || sub {};
286 $cb->(); 426 $cb->();
287 }); 427 });
288 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5); 428 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
289 $cb->signal_connect (clicked => sub { $w->destroy }); 429 $cb->signal_connect (clicked => sub { $w->destroy });
290 430
… …
295 435
296 436
297############################################################################# 437#############################################################################
298 438
299SDL::Init SDL_INIT_EVERYTHING; 439SDL::Init SDL_INIT_EVERYTHING;
300SDL::TTFInit;
301 440
302my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 441@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
442 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
303 443
304$mapwidget->activate;
305$mapwidget->focus_in;
306
307Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 444CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
308 445
309$CFG ||= { 446$CFG ||= {
310 width => 640, 447 width => 640,
311 height => 480, 448 height => 480,
449 mapsize => 100,
312 fullscreen => 0, 450 fullscreen => 0,
313 host => "crossfire.schmorp.de", 451 host => "crossfire.schmorp.de",
314 port => 13327, 452 port => 13327,
315}; 453};
316 454
455{
456 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
457
458 CFClient::add_font $_ for @fonts;
459 CFClient::set_font $fonts[0];
460}
461
317$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 462$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
318 463
319run_config_dialog 464run_config_dialog
320 login => sub { start_game }, 465 login => sub { start_game },
321 logout => sub { stop_game }; 466 logout => sub { stop_game };

Diff Legend

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