[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.90 by root, Wed Apr 12 21:35:11 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;
20	use CFClient::UI;	19	use CFClient::UI;
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 as of yet
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);
113	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	107	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
114	my ($self, $value) = @_;	108	my ($self, $value) = @_;
115	$CFG->{fullscreen} = $value;	109	$CFG->{fullscreen} = $value;
116	});	110	});
117		111
		112	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		113	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		114	my ($self, $value) = @_;
		115	$CFG->{fast} = $value;
		116	});
		117
		118	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fog of War");
		119	$table->add (1, 2, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		120	my ($self, $value) = @_;
		121	$CFG->{fow_intensity} = $value;
		122	});
		123
118	$table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	124	$table->add (1, 4, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
119	destroy_screen ();	125	destroy_screen ();
120	init_screen ();	126	init_screen ();
121	});	127	});
122		128
123	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");	129	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
124	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	130	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
125	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	131	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
126	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	132	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
127		133
128	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	134	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
…		…
156	status "Configuration Saved";	162	status "Configuration Saved";
157	});	163	});
158	$CFClient::UI::TOPLEVEL->add ($dialog);	164	$CFClient::UI::TOPLEVEL->add ($dialog);
159	}	165	}
160		166
		167	sub sdl_init {
		168	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		169	and die "SDL::Init failed!\n";
		170	}
		171
161	sub init_screen {	172	sub init_screen {
		173	sdl_init;
		174
162	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	175	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
163	$FULLSCREEN = $CFG->{fullscreen};	176	$FULLSCREEN = $CFG->{fullscreen};
		177	$FAST = $CFG->{fast};
164		178
165	$SDL_APP = new SDL::App	179	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
166	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	180	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
167	-title => "Crossfire+ Client",	181	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
168	-width => $WIDTH,	182	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
169	-height => $HEIGHT,	183
170	-opengl => 1,	184	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
171	-red_size => 5,	185	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
172	-green_size => 5,	186	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
173	-blue_size => 5,	187	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
174	-alpha_size => 0,	188
175	-double_buffer => 1,	189	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
176	-fullscreen => $FULLSCREEN,	190	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
177	-resizeable => 0;	191	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		192
		193	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		194	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		195	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		196	or die "SDL::SetVideoMode failed!\n";
		197
		198	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
178		199
179	$SDL_EV = new SDL::Event;	200	$SDL_EV = new SDL::Event;
180	$SDL_EV->set_unicode (1);	201	$SDL_EV->set_unicode (1);
181		202
182	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {	203	$SDL_ACTIVE = 1;
183	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
184	while $SDL_EV->poll;
185		204
186	1	205	$LAST_REFRESH = time - 0.01;
187	};
188
189	$last_refresh = SDL::GetTicks;
190		206
191	CFClient::gl_init;	207	CFClient::gl_init;
192		208
193	$FONTSIZE = int $HEIGHT / 40;	209	$FONTSIZE = int $HEIGHT / 40;
194		210
…		…
216	config_dialog;	232	config_dialog;
217	}	233	}
218		234
219	sub destroy_screen {	235	sub destroy_screen {
220	$CFClient::UI::TOPLEVEL->{children} = [];	236	$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;	237	undef $SDL_ACTIVE;
225	undef $SDL_EV;	238	undef $SDL_EV;
226	SDL::Quit;	239	SDL::Quit;
227	}	240	}
228		241
		242	my %animate_object;
		243	my $animate_timer;
		244
		245	my $want_refresh;
		246	my $can_refresh;
		247
		248	my $fps = 9;
		249
229	sub force_refresh {	250	sub force_refresh {
		251	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		252	debug sprintf "%3.2f", $fps;
		253
		254	$want_refresh = 0;
		255	$can_refresh = 0;
		256
230	glViewport 0, 0, $WIDTH, $HEIGHT;	257	glViewport 0, 0, $WIDTH, $HEIGHT;
231		258
232	glMatrixMode GL_PROJECTION;	259	glMatrixMode GL_PROJECTION;
233	glLoadIdentity;	260	glLoadIdentity;
234	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;	261	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
235	glMatrixMode GL_MODELVIEW;	262	glMatrixMode GL_MODELVIEW;
236	glLoadIdentity;	263	glLoadIdentity;
237		264
		265	glClearColor +($CFG->{fow_intensity}) x 3, 1;
238	glClear GL_COLOR_BUFFER_BIT;	266	glClear GL_COLOR_BUFFER_BIT;
239		267
240	$CFClient::UI::TOPLEVEL->draw;	268	$CFClient::UI::TOPLEVEL->draw;
241		269
242	SDL::GLSwapBuffers;	270	SDL::GLSwapBuffers;
243	}
244		271
245	my $FPS;	272	$LAST_REFRESH = $NOW;
		273	}
		274
		275	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		276	$NOW = time;
		277
		278	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		279	while $SDL_EV->poll;
		280
		281	if (%animate_object) {
		282	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		283	$want_refresh++;
		284	}
		285
		286	if ($want_refresh) {
		287	force_refresh;
		288	} else {
		289	$can_refresh = 1;
		290	}
		291	});
246		292
247	sub refresh {	293	sub refresh {
248	$refresh_handler \|\|= add Glib::Idle sub {	294	$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	}	295	}
281		296
282	sub animation_start {	297	sub animation_start {
283	my ($widget) = @_;	298	my ($widget) = @_;
284	$ANIMATE{$widget} = $widget;	299	$animate_object{$widget} = $widget;
285	Scalar::Util::weaken $ANIMATE{$widget};
286
287	refresh;
288	}	300	}
289		301
290	sub animation_stop {	302	sub animation_stop {
291	my ($widget) = @_;	303	my ($widget) = @_;
292	delete $ANIMATE{$widget};	304	delete $animate_object{$widget};
		305	}
		306
		307	@conn::ISA = Crossfire::Protocol::;
		308
		309	sub conn::user_send {
		310	my ($self, $command) = @_;
		311
		312	$self->send ($command);
		313	status $command;
		314	}
		315
		316	sub conn::map_update {
		317	my ($self, $dirty) = @_;
		318
		319	$MAPWIDGET->update;
		320	}
		321
		322	sub conn::map_scroll {
		323	my ($self, $dx, $dy) = @_;
		324
		325	# refresh;
		326	}
		327
		328	sub conn::map_clear {
		329	my ($self) = @_;
		330
		331	# refresh;
		332	}
		333
		334	sub conn::face_find {
		335	my ($self, $face) = @_;
		336
		337	$FACECACHE->{"$face->{chksum},$face->{name}"}
		338	}
		339
		340	sub conn::face_update {
		341	my ($self, $face) = @_;
		342
		343	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		344
		345	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		346	}
		347
		348	sub conn::query {
		349	my ($self, $flags, $prompt) = @_;
		350
		351	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
293	}	352	}
294		353
295	%SDL_CB = (	354	%SDL_CB = (
296	SDL_QUIT() => sub {	355	SDL_QUIT() => sub {
297	main_quit Gtk2;	356	Event::unloop -1;
298	},	357	},
299	SDL_VIDEORESIZE() => sub {	358	SDL_VIDEORESIZE() => sub {
300	},	359	},
301	SDL_VIDEOEXPOSE() => sub {	360	SDL_VIDEOEXPOSE() => sub {
302	refresh;	361	refresh;
…		…
326	SDL_ACTIVEEVENT() => sub {	385	SDL_ACTIVEEVENT() => sub {
327	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	386	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
328	},	387	},
329	);	388	);
330		389
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	#############################################################################	390	#############################################################################
468		391
469	SDL::Init SDL_INIT_EVERYTHING;	392	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
		393
		394	my %DEF_CFG = (
		395	width => 640,
		396	height => 480,
		397	fast => 0,
		398	fow_intensity => 0.45,
		399	fullscreen => 0,
		400	sdl_mode => 0,
		401	mapsize => 100,
		402	host => "crossfire.schmorp.de",
		403	port => 13327,
		404	);
		405
		406	while (my ($k, $v) = each %DEF_CFG) {
		407	$CFG->{$k} = $v unless exists $CFG->{$k};
		408	}
		409
		410	sdl_init;
470		411
471	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],	412	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
472	@{ SDL::ListModes 0, SDL_FULLSCREEN\|SDL_HWSURFACE };	413	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
473		414
474	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	415	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
475		416
476	$CFG \|\|= {	417	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
477	width => 640,	418
478	height => 480,	419	init_screen;
479	fullscreen => 0,
480	sdl_mode => 0,
481	mapsize => 100,
482	host => "crossfire.schmorp.de",
483	port => 13327,
484	};
485		420
486	{	421	{
487	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	422	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
488		423
489	CFClient::add_font $_ for @fonts;	424	CFClient::add_font $_ for @fonts;
490	CFClient::set_font $fonts[0];	425	CFClient::set_font $fonts[0];
491	}	426	}
492		427
493	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	428	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
494		429
495	init_screen;	430	Event::loop;
496
497	main Gtk2;
498		431
499	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	432	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
500		433

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.90 by root, Wed Apr 12 21:35:11 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.90 by root, Wed Apr 12 21:35:11 2006 UTC