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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.19 by root, Fri Apr 7 19:33:42 2006 UTC vs. Revision 1.76 by root, Tue Apr 11 22:14:14 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.19 by root, Fri Apr 7 19:33:42 2006 UTC vs.
Revision 1.76 by root, Tue Apr 11 22:14:14 2006 UTC