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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.74 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.86 by root, Wed Apr 12 18:09:22 2006 UTC

…		…
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 = 30;	23	my $MAX_FPS = 60;
		24	my $MIN_FPS = 5; # unused
25	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame	25	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
26		26
27	our $FACECACHE;	27	our $FACECACHE;
28		28
29	our $CFG;	29	our $CFG;
30	our $CONN;	30	our $CONN;
		31	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
31		32
		33	our @SDL_MODES;
32	our $WIDTH;	34	our $WIDTH;
33	our $HEIGHT;	35	our $HEIGHT;
34	our $FULLSCREEN;	36	our $FULLSCREEN;
35		37
36	our $NOW;	38	our $NOW;
37		39
38	our $MAPWIDGET;	40	our $MAPWIDGET;
39	our $FONTSIZE;	41	our $FONTSIZE;
40		42
41	our $SDL_TIMER;	43	our $SDL_TIMER;
42	our $SDL_APP;	44	our $SDL_ACTIVE;
43	our $SDL_EV;	45	our $SDL_EV;
44	our %SDL_CB;	46	our %SDL_CB;
45		47
46	our $ALT_ENTER_MESSAGE;	48	our $ALT_ENTER_MESSAGE;
47	our $STATUS_LINE;	49	our $STATUS_LINE;
…		…
49		51
50	my $last_refresh;	52	my $last_refresh;
51	my %ANIMATE;	53	my %ANIMATE;
52	my $refresh_handler;	54	my $refresh_handler;
53		55
54	our ($tw, $te); # Test widget #d#	56	sub status {
55		57	$STATUS_LINE->set_text ($_[0]);
56	sub init_screen {	58	my ($w, $h) = $STATUS_LINE->size_request;
57	$SDL_APP = new SDL::App	59	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
58	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
59	-title => "Crossfire+ Client",
60	-width => $WIDTH,
61	-height => $HEIGHT,
62	-opengl => 1,
63	-red_size => 5,
64	-green_size => 5,
65	-blue_size => 5,
66	-alpha_size => 0,
67	-double_buffer => 1,
68	-fullscreen => $FULLSCREEN,
69	-resizeable => 0;
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
89	glClearColor 0.45, 0.45, 0.45, 1;
90
91	glEnable GL_TEXTURE_2D;
92	glEnable GL_COLOR_MATERIAL;
93	glShadeModel GL_FLAT;
94	glDisable GL_DEPTH_TEST;
95	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
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	}	60	}
116		61
117	sub destroy_screen {	62	sub debug {
118	remove Glib::Source $SDL_TIMER;	63	$DEBUG_STATUS->set_text ($_[0]);
119	undef $SDL_APP;	64	my ($w, $h) = $DEBUG_STATUS->size_request;
120	undef $SDL_EV;	65	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
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	}	66	}
139		67
140	sub start_game {	68	sub start_game {
141	$WIDTH = $CFG->{width};	69	status "logging in...";
142	$HEIGHT = $CFG->{height};
143	$FULLSCREEN = 0;
144
145	init_screen;
146
147	config_dialog;
148		70
149	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	71	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
150		72
151	$CONN = new conn	73	$CONN = new conn
152	host => $CFG->{host},	74	host => $CFG->{host},
…		…
155	pass => $CFG->{password},	77	pass => $CFG->{password},
156	mapw => $mapsize,	78	mapw => $mapsize,
157	maph => $mapsize,	79	maph => $mapsize,
158	;	80	;
159		81
		82	status "login successful";
		83
160	CFClient::lowdelay fileno $CONN->{fh};	84	CFClient::lowdelay fileno $CONN->{fh};
161	}	85	}
162		86
163	sub stop_game {	87	sub stop_game {
		88	undef $CONN;
		89	}
		90
		91	sub config_dialog {
		92	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
		93	child => (my $vbox = new CFClient::UI::VBox);
		94	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
		95	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		96
		97	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
		98	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
		99
		100	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
		101	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
		102
		103	$mode_slider->connect (changed => sub {
		104	my ($self, $value) = @_;
		105
		106	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
		107	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
		108	});
		109	$mode_slider->emit (changed => $mode_slider->{range}[0]);
		110
		111	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
		112	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
		113	my ($self, $value) = @_;
		114	$CFG->{fullscreen} = $value;
		115	});
		116
		117	$table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		118	destroy_screen ();
		119	init_screen ();
		120	});
		121
		122	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");
		123	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		124	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
		125	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
		126
		127	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
		128	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
		129
		130	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
		131	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
		132
		133	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
		134	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
		135
		136	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
		137	$table->add (1, 6, new CFClient::UI::Slider
		138	req_w => 100,
		139	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		140	connect_changed => sub {
		141	my ($self, $value) = @_;
		142
		143	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		144	},
		145	);
		146
		147	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		148	start_game;
		149	});
		150
		151	$vbox->add (my $hbox = new CFClient::UI::HBox);
		152
		153	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
		154	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		155	status "Configuration Saved";
		156	});
		157	$CFClient::UI::TOPLEVEL->add ($dialog);
		158	}
		159
		160	sub init_screen {
		161	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
		162	$FULLSCREEN = $CFG->{fullscreen};
		163
		164	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		165	and die "SDL::Init failed!\n";
		166
		167	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
		168	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
		169	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
		170	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
		171
		172	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
		173	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
		174	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
		175	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
		176
		177	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
		178	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
		179	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		180
		181	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		182	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		183	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		184	or die "SDL::SetVideoMode failed!\n";
		185
		186	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
		187
		188	$SDL_EV = new SDL::Event;
		189	$SDL_EV->set_unicode (1);
		190
		191	$SDL_ACTIVE = 1;
		192
		193	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
		194	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		195	while $SDL_EV->poll;
		196
		197	1
		198	};
		199
		200	$last_refresh = SDL::GetTicks;
		201
		202	CFClient::gl_init;
		203
		204	$FONTSIZE = int $HEIGHT / 40;
		205
		206	#############################################################################
		207
		208	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;
		209	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
		210
		211	$STATUS_LINE = new CFClient::UI::Label
		212	padding => 0,
		213	y => $HEIGHT * 49 / 50 - $FONTSIZE;
		214	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
		215
		216	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		217	padding => 0,
		218	y => $HEIGHT * 49 / 50,
		219	height => $HEIGHT / 50,
		220	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		221	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		222
		223	$MAPWIDGET = new CFClient::UI::MapWidget;
		224	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
		225	$MAPWIDGET->focus_in;
		226
		227	config_dialog;
		228	}
		229
		230	sub destroy_screen {
		231	$CFClient::UI::TOPLEVEL->{children} = [];
		232	remove Glib::Source $SDL_TIMER;
164	remove Glib::Source $refresh_handler if $refresh_handler;	233	remove Glib::Source $refresh_handler if $refresh_handler;
165	undef $refresh_handler;	234	undef $refresh_handler;
166		235	undef $SDL_ACTIVE;
167	undef $CONN;	236	undef $SDL_EV;
168	destroy_screen;	237	SDL::Quit;
169	}	238	}
170		239
171	sub force_refresh {	240	sub force_refresh {
172	glViewport 0, 0, $WIDTH, $HEIGHT;	241	glViewport 0, 0, $WIDTH, $HEIGHT;
173		242
…		…
182	$CFClient::UI::TOPLEVEL->draw;	251	$CFClient::UI::TOPLEVEL->draw;
183		252
184	SDL::GLSwapBuffers;	253	SDL::GLSwapBuffers;
185	}	254	}
186		255
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;	256	my $FPS;
194		257
195	sub refresh {	258	sub refresh {
196	$refresh_handler \|\|= add Glib::Idle sub {	259	$refresh_handler \|\|= add Glib::Idle sub {
197	if ($SDL_APP) {	260	if ($SDL_ACTIVE) {
198	$NOW = SDL::GetTicks;	261	$NOW = SDL::GetTicks;
199		262
200	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {	263	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
201	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);	264	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
202	$NOW = SDL::GetTicks;	265	$NOW = SDL::GetTicks;
…		…
205	my $interval = ($NOW - $last_refresh) * 0.001;	268	my $interval = ($NOW - $last_refresh) * 0.001;
206	$last_refresh = $NOW;	269	$last_refresh = $NOW;
207		270
208	if ($interval) {	271	if ($interval) {
209	$FPS \|\|= 1 / $interval;	272	$FPS \|\|= 1 / $interval;
210	$FPS = $FPS * 0.96 + (1 / $interval) * 0.04;	273	$FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
211	debug sprintf "%5.02f", $FPS;	274	debug sprintf "%5.02f", $FPS;
212	}	275	}
213		276
214	force_refresh;	277	force_refresh;
215	$_->animate ($interval) for grep $_, values %ANIMATE;	278	$_->animate ($interval) for grep $_, values %ANIMATE;
…		…
251	},	314	},
252	SDL_KEYDOWN() => sub {	315	SDL_KEYDOWN() => sub {
253	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	316	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
254	# alt-enter	317	# alt-enter
255	$FULLSCREEN = !$FULLSCREEN;	318	$FULLSCREEN = !$FULLSCREEN;
		319	destroy_screen;
256	init_screen;	320	init_screen;
257	} else {	321	} else {
258	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	322	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
259	}	323	}
260	},	324	},
…		…
350	[qw/Password password/],	414	[qw/Password password/],
351	);	415	);
352		416
353	my $cfg = {};	417	my $cfg = {};
354		418
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);	419	$w->add (my $vb = Gtk2::VBox->new);
359	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);	420	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
360	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};	421	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
361	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);	422	$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);	423	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
363	my $i = 0;	424	my $i = 0;
364	my $act = 0;	425	my $act = 0;
365	for (map { "$_->[0]x$_->[1]" } reverse @modes) {	426	for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
366	if ($_ eq $selmode) { $act = $i }	427	if ($_ eq $selmode) { $act = $i }
367	$cb->append_text ($_);	428	$cb->append_text ($_);
368	$i++;	429	$i++;
369	}	430	}
370	$cb->set_active ($act);	431	$cb->set_active ($act);
…		…
416		477
417	#############################################################################	478	#############################################################################
418		479
419	SDL::Init SDL_INIT_EVERYTHING;	480	SDL::Init SDL_INIT_EVERYTHING;
420		481
		482	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
		483	@{ SDL::ListModes 0, SDL_FULLSCREEN\|SDL_HWSURFACE };
		484
421	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	485	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
422		486
423	$CFG \|\|= {	487	$CFG \|\|= {
424	width => 640,	488	width => 640,
425	height => 480,	489	height => 480,
		490	fullscreen => 0,
		491	sdl_mode => 0,
426	mapsize => 100,	492	mapsize => 100,
427	fullscreen => 0,
428	host => "crossfire.schmorp.de",	493	host => "crossfire.schmorp.de",
429	port => 13327,	494	port => 13327,
430	};	495	};
431		496
432	{	497	{
…		…
436	CFClient::set_font $fonts[0];	501	CFClient::set_font $fonts[0];
437	}	502	}
438		503
439	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	504	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
440		505
441	run_config_dialog	506	init_screen;
442	login => sub { start_game },
443	logout => sub { stop_game };
444		507
445	main Gtk2;	508	main Gtk2;
446		509
447	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	510	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
		511

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.74 by root, Tue Apr 11 20:44:49 2006 UTC vs. Revision 1.86 by root, Wed Apr 12 18:09:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.74 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.86 by root, Wed Apr 12 18:09:22 2006 UTC