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.59 by root, Mon Apr 10 11:55:16 2006 UTC vs.
Revision 1.81 by root, Wed Apr 12 02:05:46 2006 UTC

… …
14use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
15 15
16use Crossfire; 16use Crossfire;
17use Crossfire::Protocol; 17use Crossfire::Protocol;
18 18
19use Crossfire::Client; 19use CFClient;
20use Crossfire::Client::Widget; 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;
31our $FAST; # fast, low-quality mode
30 32
33our @SDL_MODES;
31our $WIDTH; 34our $WIDTH;
32our $HEIGHT; 35our $HEIGHT;
33our $FULLSCREEN; 36our $FULLSCREEN;
34 37
38our $NOW;
39
40our $MAPWIDGET;
35our $FONTSIZE; 41our $FONTSIZE;
36 42
37our $SDL_TIMER; 43our $SDL_TIMER;
38our $SDL_APP; 44our $SDL_APP;
39our $SDL_EV; 45our $SDL_EV;
40our %SDL_CB; 46our %SDL_CB;
41 47
42our @GL_INIT; # hooks called on every gl init
43
44our $ALT_ENTER_MESSAGE; 48our $ALT_ENTER_MESSAGE;
45our $STATUS_LINE; 49our $STATUS_LINE;
50our $DEBUG_STATUS;
46 51
47my $last_refresh; 52my $last_refresh;
48my %ANIMATE; 53my %ANIMATE;
49my $refresh_handler; 54my $refresh_handler;
50 55
51our ($tw, $te); # Test widget #d# 56sub config_dialog {
57 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
58 child => (my $vbox = new CFClient::UI::VBox);
59 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
60 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
61
62 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
63 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
64
65 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
66 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
67
68 $mode_slider->connect (changed => sub {
69 my ($self, $value) = @_;
70
71 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
72 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
73 });
74 $mode_slider->emit (changed => $mode_slider->{range}[0]);
75
76 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Host");
77 $table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
78
79 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
80 $table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
81
82 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
83 $table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
84
85 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
86 $table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
87
88 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
89 $table->add (1, 5, new CFClient::UI::Slider
90 req_w => 100,
91 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
92 connect_changed => sub {
93 my ($self, $value) = @_;
94
95 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
96 },
97 );
98
99 $vbox->add (my $hbox = new CFClient::UI::HBox);
100 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
101 warn "save\n";
102 });
103 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
104 warn "login\n";
105 });
106 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
107 warn "apply\n";
108 });
109
110 $CFClient::UI::TOPLEVEL->add ($dialog);
111}
52 112
53sub init_screen { 113sub init_screen {
54 $SDL_APP = new SDL::App 114 $SDL_APP = new SDL::App
55 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 115 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
56 -title => "Crossfire+ Client", 116 -title => "Crossfire+ Client",
… …
66 -resizeable => 0; 126 -resizeable => 0;
67 127
68 $SDL_EV = new SDL::Event; 128 $SDL_EV = new SDL::Event;
69 $SDL_EV->set_unicode (1); 129 $SDL_EV->set_unicode (1);
70 130
71 $last_refresh = SDL::GetTicks;
72
73 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
74
75 $GL_EXT{GL_ARB_texture_non_power_of_two}
76 or warn "WARNING: non-power-of-two opengl extension required";
77
78 $FONTSIZE = int $HEIGHT / 50;
79
80 #############################################################################
81
82 glClearColor 1, 1, 1, 1;
83
84 glEnable GL_TEXTURE_2D;
85 glEnable GL_COLOR_MATERIAL;
86 glShadeModel GL_FLAT;
87 glDisable GL_DEPTH_TEST;
88 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
89
90 $_->() for @GL_INIT;
91
92 #############################################################################
93
94 $STATUS_LINE = new Crossfire::Client::Widget::Label
95 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE,
96 "";
97 $Crossfire::Client::Widget::TOPLEVEL->add ($STATUS_LINE);
98
99 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label
100 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60,
101 "Use <b>Alt-Enter</b> to toggle fullscreen mode";
102 $Crossfire::Client::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
103
104 # Test code #d#
105 unless ($tw) { # haha...
106 $te = new Crossfire::Client::Widget::FancyFrame;
107 $te->add (new Crossfire::Client::Widget::Entry);
108 $te->move (300, 0, 2);
109 $Crossfire::Client::Widget::TOPLEVEL->add ($te);
110
111 $tw = new Crossfire::Client::Widget::Animator;
112 my $lbl1 = new Crossfire::Client::Widget::Label
113 0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
114 my $lbl2 = new Crossfire::Client::Widget::Label
115 0, 0, 10, $FONTSIZE, "LBL2";
116
117 my $vb = new Crossfire::Client::Widget::VBox;
118 my $f = new Crossfire::Client::Widget::FancyFrame;
119 my $f2 = new Crossfire::Client::Widget::FancyFrame;
120 $f->add ($lbl1);
121 $f2->add ($lbl2);
122 $vb->add ($f);
123 $vb->add ($f2, 1);
124
125 $tw->add ($vb);
126 $tw->w (400);
127 $tw->h (300);
128 $tw->move ($WIDTH - 200, 0);
129 $tw->moveto (0, 0);
130 $Crossfire::Client::Widget::TOPLEVEL->add ($tw);
131
132# $f->move ($WIDTH - 200, 0);
133# $Crossfire::Client::Widget::TOPLEVEL->add ($f);
134 }
135}
136
137sub start_game {
138 $SDL_TIMER = add Glib::Timeout 1000/50, sub { 131 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
139 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 132 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
140 while $SDL_EV->poll; 133 while $SDL_EV->poll;
141 134
142 1 135 1
143 }; 136 };
144 137
138 $last_refresh = SDL::GetTicks;
139
140 CFClient::gl_init;
141
142 $FONTSIZE = int $HEIGHT / 40;
143
144 #############################################################################
145
146 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
147 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
148
149 $STATUS_LINE = new CFClient::UI::Label
150 padding => 0,
151 y => $HEIGHT * 49 / 50 - $FONTSIZE;
152 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
153
154 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
155 padding => 0,
156 y => $HEIGHT * 49 / 50,
157 height => $HEIGHT / 50,
158 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
159 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
160
161 $MAPWIDGET = new CFClient::UI::MapWidget;
162 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
163 $MAPWIDGET->focus_in;
164
165 config_dialog;
166}
167
168sub destroy_screen {
169 $CFClient::UI::TOPLEVEL->{children} = [];
170 remove Glib::Source $SDL_TIMER;
171 undef $SDL_APP;
172 undef $SDL_EV;
173 SDL::Quit;
174}
175
176sub start_game {
145 $WIDTH = $CFG->{width}; 177 $WIDTH = $CFG->{width};
146 $HEIGHT = $CFG->{height}; 178 $HEIGHT = $CFG->{height};
147 $FULLSCREEN = 0; 179 $FULLSCREEN = 0;
148 180
149 init_screen; 181 init_screen;
… …
157 pass => $CFG->{password}, 189 pass => $CFG->{password},
158 mapw => $mapsize, 190 mapw => $mapsize,
159 maph => $mapsize, 191 maph => $mapsize,
160 ; 192 ;
161 193
162 Crossfire::Client::lowdelay fileno $CONN->{fh}; 194 CFClient::lowdelay fileno $CONN->{fh};
163} 195}
164 196
165sub stop_game { 197sub stop_game {
166 remove Glib::Source $SDL_TIMER;
167 remove Glib::Source $refresh_handler if $refresh_handler; 198 remove Glib::Source $refresh_handler if $refresh_handler;
168 undef $refresh_handler; 199 undef $refresh_handler;
169 200
170 undef $SDL_APP;
171 undef $CONN; 201 undef $CONN;
172 SDL::Quit; 202 destroy_screen;
173} 203}
174 204
175sub force_refresh { 205sub force_refresh {
176 glViewport 0, 0, $WIDTH, $HEIGHT; 206 glViewport 0, 0, $WIDTH, $HEIGHT;
177 207
178 glMatrixMode GL_PROJECTION; 208 glMatrixMode GL_PROJECTION;
179 glLoadIdentity; 209 glLoadIdentity;
180 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 210 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
181 glMatrixMode GL_MODELVIEW; 211 glMatrixMode GL_MODELVIEW;
212 glLoadIdentity;
182 213
183 glClear GL_COLOR_BUFFER_BIT; 214 glClear GL_COLOR_BUFFER_BIT;
184 215
185 $Crossfire::Client::Widget::TOPLEVEL->draw; 216 $CFClient::UI::TOPLEVEL->draw;
186 217
187 SDL::GLSwapBuffers; 218 SDL::GLSwapBuffers;
188} 219}
220
221sub debug {
222 $DEBUG_STATUS->set_text ($_[0]);
223 my ($w, $h) = $DEBUG_STATUS->size_request;
224 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
225}
226
227my $FPS;
189 228
190sub refresh { 229sub refresh {
191 $refresh_handler ||= add Glib::Idle sub { 230 $refresh_handler ||= add Glib::Idle sub {
192 if ($SDL_APP) { 231 if ($SDL_APP) {
193 my $next_refresh = SDL::GetTicks; 232 $NOW = SDL::GetTicks;
233
234 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
235 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
236 $NOW = SDL::GetTicks;
237 }
238
194 my $interval = ($next_refresh - $last_refresh) * 0.001; 239 my $interval = ($NOW - $last_refresh) * 0.001;
195 $last_refresh = $next_refresh; 240 $last_refresh = $NOW;
241
242 if ($interval) {
243 $FPS ||= 1 / $interval;
244 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
245 debug sprintf "%5.02f", $FPS;
246 }
196 247
197 force_refresh; 248 force_refresh;
198 $_->animate ($interval) for grep $_, values %ANIMATE; 249 $_->animate ($interval) for grep $_, values %ANIMATE;
199 250
200 if (%ANIMATE) { 251 if (%ANIMATE) {
… …
234 }, 285 },
235 SDL_KEYDOWN() => sub { 286 SDL_KEYDOWN() => sub {
236 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 287 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
237 # alt-enter 288 # alt-enter
238 $FULLSCREEN = !$FULLSCREEN; 289 $FULLSCREEN = !$FULLSCREEN;
290 destroy_screen;
239 init_screen; 291 init_screen;
240 } else { 292 } else {
241 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 293 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
242 } 294 }
243 }, 295 },
244 SDL_KEYUP() => sub { 296 SDL_KEYUP() => sub {
245 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 297 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
246 }, 298 },
247 SDL_MOUSEMOTION() => sub { 299 SDL_MOUSEMOTION() => sub {
248 Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV); 300 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
249 }, 301 },
250 SDL_MOUSEBUTTONDOWN() => sub { 302 SDL_MOUSEBUTTONDOWN() => sub {
251 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 303 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
252 }, 304 },
253 SDL_MOUSEBUTTONUP() => sub { 305 SDL_MOUSEBUTTONUP() => sub {
254 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 306 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
255 }, 307 },
256 SDL_ACTIVEEVENT() => sub { 308 SDL_ACTIVEEVENT() => sub {
257 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 309# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
258 }, 310 },
259); 311);
260 312
261@conn::ISA = Crossfire::Protocol::; 313@conn::ISA = Crossfire::Protocol::;
262 314
263sub conn::map_update { 315sub conn::map_update {
264 my ($self, $dirty) = @_; 316 my ($self, $dirty) = @_;
265 317
266 refresh; 318 $MAPWIDGET->update;
267} 319}
268 320
269sub conn::map_scroll { 321sub conn::map_scroll {
270 my ($self, $dx, $dy) = @_; 322 my ($self, $dx, $dy) = @_;
271 323
… …
287sub conn::face_update { 339sub conn::face_update {
288 my ($self, $face) = @_; 340 my ($self, $face) = @_;
289 341
290 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 342 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
291 343
292 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 344 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
293} 345}
294 346
295sub conn::query { 347sub conn::query {
296 my ($self, $flags, $prompt) = @_; 348 my ($self, $flags, $prompt) = @_;
297 349
… …
333 [qw/Password password/], 385 [qw/Password password/],
334 ); 386 );
335 387
336 my $cfg = {}; 388 my $cfg = {};
337 389
338 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
339 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
340
341 $w->add (my $vb = Gtk2::VBox->new); 390 $w->add (my $vb = Gtk2::VBox->new);
342 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 391 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
343 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 392 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
344 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 393 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
345 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 394 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
346 my $i = 0; 395 my $i = 0;
347 my $act = 0; 396 my $act = 0;
348 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 397 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
349 if ($_ eq $selmode) { $act = $i } 398 if ($_ eq $selmode) { $act = $i }
350 $cb->append_text ($_); 399 $cb->append_text ($_);
351 $i++; 400 $i++;
352 } 401 }
353 $cb->set_active ($act); 402 $cb->set_active ($act);
… …
370 $cb->signal_connect (clicked => sub { 419 $cb->signal_connect (clicked => sub {
371 for (keys %$cfg) { 420 for (keys %$cfg) {
372 $::CFG->{$_} = $cfg->{$_} 421 $::CFG->{$_} = $cfg->{$_}
373 if $_ ne '_i'; 422 if $_ ne '_i';
374 } 423 }
375 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 424 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
376 }); 425 });
377 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 426 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
378 $cb->signal_connect (clicked => sub { 427 $cb->signal_connect (clicked => sub {
379 for (keys %$cfg) { 428 for (keys %$cfg) {
380 $::CFG->{$_} = $cfg->{$_} 429 $::CFG->{$_} = $cfg->{$_}
… …
399 448
400############################################################################# 449#############################################################################
401 450
402SDL::Init SDL_INIT_EVERYTHING; 451SDL::Init SDL_INIT_EVERYTHING;
403 452
404my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 453@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
454 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
405 455
406$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
407$mapwidget->focus_in;
408
409Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 456CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
410 457
411$CFG ||= { 458$CFG ||= {
412 width => 640, 459 width => 640,
413 height => 480, 460 height => 480,
414 mapsize => 100, 461 mapsize => 100,
415 fullscreen => 0, 462 fullscreen => 0,
416 host => "crossfire.schmorp.de", 463 host => "crossfire.schmorp.de",
417 port => 13327, 464 port => 13327,
418}; 465};
419 466
420Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf"; 467{
468 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
469
470 CFClient::add_font $_ for @fonts;
471 CFClient::set_font $fonts[0];
472}
421 473
422$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 474$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
423 475
424run_config_dialog 476run_config_dialog
425 login => sub { start_game }, 477 login => sub { start_game },

Diff Legend

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