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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.26 by elmex, Fri Apr 7 20:57:29 2006 UTC vs.
Revision 1.77 by root, Tue Apr 11 22:49:13 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.26 by elmex, Fri Apr 7 20:57:29 2006 UTC vs. Revision 1.77 by root, Tue Apr 11 22:49:13 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.26 by elmex, Fri Apr 7 20:57:29 2006 UTC vs.
Revision 1.77 by root, Tue Apr 11 22:49:13 2006 UTC