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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.20 by elmex, Fri Apr 7 19:58:55 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 20:44:49 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.20 by elmex, Fri Apr 7 19:58:55 2006 UTC vs. Revision 1.74 by root, Tue Apr 11 20:44:49 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.20 by elmex, Fri Apr 7 19:58:55 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 20:44:49 2006 UTC