[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/pclient

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs.
Revision 1.87 by root, Wed Apr 12 20:06:37 2006 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use Glib;	6	use Time::HiRes 'time';
7	use Gtk2 -init;	7	use Event;
8		8
9	use SDL;	9	use SDL;
10	use SDL::App;	10	use SDL::App;
11	use SDL::Event;	11	use SDL::Event;
12	use SDL::Surface;	12	use SDL::Surface;
13	use SDL::OpenGL;	13	use SDL::OpenGL;
14	use SDL::OpenGL::Constants;
15		14
16	use Crossfire;	15	use Crossfire;
17	use Crossfire::Protocol;	16	use Crossfire::Protocol;
18		17
19	use CFClient;	18	use CFClient;
21		20
22	our $VERSION = '0.1';	21	our $VERSION = '0.1';
23		22
24	my $MAX_FPS = 60;	23	my $MAX_FPS = 60;
25	my $MIN_FPS = 5; # unused	24	my $MIN_FPS = 5; # unused
26	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
27		25
28	our $FACECACHE;	26	our $FACECACHE;
		27
		28	our $LAST_REFRESH;
		29	our $NOW;
29		30
30	our $CFG;	31	our $CFG;
31	our $CONN;	32	our $CONN;
32	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	33	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
33		34
34	our @SDL_MODES;	35	our @SDL_MODES;
35	our $WIDTH;	36	our $WIDTH;
36	our $HEIGHT;	37	our $HEIGHT;
37	our $FULLSCREEN;	38	our $FULLSCREEN;
38		39
39	our $NOW;
40
41	our $MAPWIDGET;	40	our $MAPWIDGET;
42	our $FONTSIZE;	41	our $FONTSIZE;
43		42
44	our $SDL_TIMER;	43	our $SDL_ACTIVE;
45	our $SDL_APP;
46	our $SDL_EV;	44	our $SDL_EV;
47	our %SDL_CB;	45	our %SDL_CB;
48		46
49	our $ALT_ENTER_MESSAGE;	47	our $ALT_ENTER_MESSAGE;
50	our $STATUS_LINE;	48	our $STATUS_LINE;
51	our $DEBUG_STATUS;	49	our $DEBUG_STATUS;
52
53	my $last_refresh;
54	my %ANIMATE;
55	my $refresh_handler;
56		50
57	sub status {	51	sub status {
58	$STATUS_LINE->set_text ($_[0]);	52	$STATUS_LINE->set_text ($_[0]);
59	my ($w, $h) = $STATUS_LINE->size_request;	53	my ($w, $h) = $STATUS_LINE->size_request;
60	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	54	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
…		…
160		154
161	sub init_screen {	155	sub init_screen {
162	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	156	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
163	$FULLSCREEN = $CFG->{fullscreen};	157	$FULLSCREEN = $CFG->{fullscreen};
164		158
165	$SDL_APP = new SDL::App	159	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
166	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	160	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
167	-title => "Crossfire+ Client",	161	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
168	-width => $WIDTH,	162	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
169	-height => $HEIGHT,	163
170	-opengl => 1,	164	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
171	-red_size => 5,	165	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
172	-green_size => 5,	166	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
173	-blue_size => 5,	167	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
174	-alpha_size => 0,	168
175	-double_buffer => 1,	169	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
176	-fullscreen => $FULLSCREEN,	170	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
177	-resizeable => 0;	171	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		172
		173	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		174	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		175	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		176	or die "SDL::SetVideoMode failed!\n";
		177
		178	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
178		179
179	$SDL_EV = new SDL::Event;	180	$SDL_EV = new SDL::Event;
180	$SDL_EV->set_unicode (1);	181	$SDL_EV->set_unicode (1);
181		182
182	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {	183	$SDL_ACTIVE = 1;
183	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
184	while $SDL_EV->poll;
185		184
186	1	185	$LAST_REFRESH = time - 0.01;
187	};
188
189	$last_refresh = SDL::GetTicks;
190		186
191	CFClient::gl_init;	187	CFClient::gl_init;
192		188
193	$FONTSIZE = int $HEIGHT / 40;	189	$FONTSIZE = int $HEIGHT / 40;
194		190
…		…
216	config_dialog;	212	config_dialog;
217	}	213	}
218		214
219	sub destroy_screen {	215	sub destroy_screen {
220	$CFClient::UI::TOPLEVEL->{children} = [];	216	$CFClient::UI::TOPLEVEL->{children} = [];
221	remove Glib::Source $SDL_TIMER;
222	remove Glib::Source $refresh_handler if $refresh_handler;
223	undef $refresh_handler;
224	undef $SDL_APP;	217	undef $SDL_ACTIVE;
225	undef $SDL_EV;	218	undef $SDL_EV;
226	SDL::Quit;	219	SDL::Quit;
227	}	220	}
228		221
		222	my %animate_object;
		223	my $animate_timer;
		224
		225	my $want_refresh;
		226	my $can_refresh;
		227
		228	my $fps = 9;
		229
229	sub force_refresh {	230	sub force_refresh {
		231	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		232	debug sprintf "%3.2f", $fps;
		233
		234	$want_refresh = 0;
		235	$can_refresh = 0;
		236
230	glViewport 0, 0, $WIDTH, $HEIGHT;	237	glViewport 0, 0, $WIDTH, $HEIGHT;
231		238
232	glMatrixMode GL_PROJECTION;	239	glMatrixMode GL_PROJECTION;
233	glLoadIdentity;	240	glLoadIdentity;
234	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;	241	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
…		…
238	glClear GL_COLOR_BUFFER_BIT;	245	glClear GL_COLOR_BUFFER_BIT;
239		246
240	$CFClient::UI::TOPLEVEL->draw;	247	$CFClient::UI::TOPLEVEL->draw;
241		248
242	SDL::GLSwapBuffers;	249	SDL::GLSwapBuffers;
243	}
244		250
245	my $FPS;	251	$LAST_REFRESH = $NOW;
		252	}
		253
		254	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		255	$NOW = time;
		256
		257	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		258	while $SDL_EV->poll;
		259
		260	if (%animate_object) {
		261	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		262	$want_refresh++;
		263	}
		264
		265	if ($want_refresh) {
		266	force_refresh;
		267	} else {
		268	$can_refresh = 1;
		269	}
		270	});
246		271
247	sub refresh {	272	sub refresh {
248	$refresh_handler \|\|= add Glib::Idle sub {	273	$want_refresh++;
249	if ($SDL_APP) {
250	$NOW = SDL::GetTicks;
251
252	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
253	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
254	$NOW = SDL::GetTicks;
255	}
256
257	my $interval = ($NOW - $last_refresh) * 0.001;
258	$last_refresh = $NOW;
259
260	if ($interval) {
261	$FPS \|\|= 1 / $interval;
262	$FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
263	debug sprintf "%5.02f", $FPS;
264	}
265
266	force_refresh;
267	$_->animate ($interval) for grep $_, values %ANIMATE;
268
269	if (%ANIMATE) {
270	1
271	} else {
272	undef $refresh_handler;
273	0
274	}
275	} else {
276	undef $refresh_handler;
277	0
278	}
279	};
280	}	274	}
281		275
282	sub animation_start {	276	sub animation_start {
283	my ($widget) = @_;	277	my ($widget) = @_;
284	$ANIMATE{$widget} = $widget;	278	$animate_object{$widget} = $widget;
285	Scalar::Util::weaken $ANIMATE{$widget};
286
287	refresh;
288	}	279	}
289		280
290	sub animation_stop {	281	sub animation_stop {
291	my ($widget) = @_;	282	my ($widget) = @_;
292	delete $ANIMATE{$widget};	283	delete $animate_object{$widget};
		284	}
		285
		286	@conn::ISA = Crossfire::Protocol::;
		287
		288	sub conn::map_update {
		289	my ($self, $dirty) = @_;
		290
		291	$MAPWIDGET->update;
		292	}
		293
		294	sub conn::map_scroll {
		295	my ($self, $dx, $dy) = @_;
		296
		297	# refresh;
		298	}
		299
		300	sub conn::map_clear {
		301	my ($self) = @_;
		302
		303	# refresh;
		304	}
		305
		306	sub conn::face_find {
		307	my ($self, $face) = @_;
		308
		309	$FACECACHE->{"$face->{chksum},$face->{name}"}
		310	}
		311
		312	sub conn::face_update {
		313	my ($self, $face) = @_;
		314
		315	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		316
		317	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		318	}
		319
		320	sub conn::query {
		321	my ($self, $flags, $prompt) = @_;
		322
		323	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
293	}	324	}
294		325
295	%SDL_CB = (	326	%SDL_CB = (
296	SDL_QUIT() => sub {	327	SDL_QUIT() => sub {
297	main_quit Gtk2;	328	Event::unloop -1;
298	},	329	},
299	SDL_VIDEORESIZE() => sub {	330	SDL_VIDEORESIZE() => sub {
300	},	331	},
301	SDL_VIDEOEXPOSE() => sub {	332	SDL_VIDEOEXPOSE() => sub {
302	refresh;	333	refresh;
…		…
326	SDL_ACTIVEEVENT() => sub {	357	SDL_ACTIVEEVENT() => sub {
327	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	358	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
328	},	359	},
329	);	360	);
330		361
331	@conn::ISA = Crossfire::Protocol::;
332
333	sub conn::map_update {
334	my ($self, $dirty) = @_;
335
336	$MAPWIDGET->update;
337	}
338
339	sub conn::map_scroll {
340	my ($self, $dx, $dy) = @_;
341
342	# refresh;
343	}
344
345	sub conn::map_clear {
346	my ($self) = @_;
347
348	# refresh;
349	}
350
351	sub conn::face_find {
352	my ($self, $face) = @_;
353
354	$FACECACHE->{"$face->{chksum},$face->{name}"}
355	}
356
357	sub conn::face_update {
358	my ($self, $face) = @_;
359
360	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
361
362	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
363	}
364
365	sub conn::query {
366	my ($self, $flags, $prompt) = @_;
367
368	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
369	}
370
371	sub gtk_add_cfg_field {
372	my ($tbl, $cfg, $klbl, $key, $value) = @_;
373	my $i = $cfg->{_i}++;
374	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
375	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
376	if ($key eq 'password') {
377	$ent->set_invisible_char ("*");
378	$ent->set (visibility => 0)
379	}
380	$ent->set_text ($value);
381	$ent->signal_connect (changed => sub {
382	my ($ent) = @_;
383	$cfg->{$key} = $ent->get_text;
384	# TODO: Mapsize should be a slider in the game gui
385	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
386	$cfg->{$key} = 100;
387	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
388	$cfg->{$key} = 50;
389	}
390	});
391	}
392
393	sub run_config_dialog {
394	my (%events) = @_;
395
396	my $w = Gtk2::Window->new;
397
398	my @cfg = (
399	[qw/Host host/],
400	[qw/Port port/],
401	[qw/Mapsize% mapsize/],
402	[qw/Username user/],
403	[qw/Password password/],
404	);
405
406	my $cfg = {};
407
408	$w->add (my $vb = Gtk2::VBox->new);
409	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
410	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
411	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
412	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
413	my $i = 0;
414	my $act = 0;
415	for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
416	if ($_ eq $selmode) { $act = $i }
417	$cb->append_text ($_);
418	$i++;
419	}
420	$cb->set_active ($act);
421	$cb->signal_connect (changed => sub {
422	my ($cb) = @_;
423	my $txt = $cb->get_active_text;
424	if ($txt =~ m/(\d+)x(\d+)/) {
425	$::CFG->{width} = $1;
426	$::CFG->{height} = $2;
427	}
428	});
429
430	$cfg->{_i} = 1;
431	for (@cfg) {
432	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
433	}
434
435	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
436	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
437	$cb->signal_connect (clicked => sub {
438	for (keys %$cfg) {
439	$::CFG->{$_} = $cfg->{$_}
440	if $_ ne '_i';
441	}
442	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
443	});
444	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
445	$cb->signal_connect (clicked => sub {
446	for (keys %$cfg) {
447	$::CFG->{$_} = $cfg->{$_}
448	if $_ ne '_i';
449	}
450	my $cb = $events{login} \|\| sub {};
451	$cb->($::CFG->{user}, $::CFG->{password});
452	});
453	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
454	$cb->signal_connect (clicked => sub {
455	my $cb = $events{logout} \|\| sub {};
456	$cb->();
457	});
458	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
459	$cb->signal_connect (clicked => sub { $w->destroy });
460
461	$w->show_all;
462
463	$w->signal_connect (destroy => sub { Gtk2->main_quit });
464	}
465
466
467	#############################################################################	362	#############################################################################
468
469	SDL::Init SDL_INIT_EVERYTHING;
470
471	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
472	@{ SDL::ListModes 0, SDL_FULLSCREEN\|SDL_HWSURFACE };
473		363
474	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	364	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
475		365
476	$CFG \|\|= {	366	$CFG \|\|= {
477	width => 640,	367	width => 640,
…		…
481	mapsize => 100,	371	mapsize => 100,
482	host => "crossfire.schmorp.de",	372	host => "crossfire.schmorp.de",
483	port => 13327,	373	port => 13327,
484	};	374	};
485		375
		376	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		377	and die "SDL::Init failed!\n";
		378
		379	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
		380	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		381
		382	init_screen;
		383
486	{	384	{
487	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	385	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
488		386
489	CFClient::add_font $_ for @fonts;	387	CFClient::add_font $_ for @fonts;
490	CFClient::set_font $fonts[0];	388	CFClient::set_font $fonts[0];
491	}	389	}
492		390
493	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	391	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
494		392
495	init_screen;	393	Event::loop;
496
497	main Gtk2;
498		394
499	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	395	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
500		396

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs. Revision 1.87 by root, Wed Apr 12 20:06:37 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs.
Revision 1.87 by root, Wed Apr 12 20:06:37 2006 UTC