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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.56 by root, Sun Apr 9 22:28:05 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 20:44:49 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::Widget;	19	use CFClient;
		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
21		26
22	our $FACECACHE;	27	our $FACECACHE;
23
24	our $VERSION = '0.1';
25
26	our %GL_EXT;
27		28
28	our $CFG;	29	our $CFG;
29	our $CONN;	30	our $CONN;
30		31
31	our $WIDTH;	32	our $WIDTH;
32	our $HEIGHT;	33	our $HEIGHT;
33	our $FULLSCREEN;	34	our $FULLSCREEN;
34		35
		36	our $NOW;
		37
		38	our $MAPWIDGET;
35	our $FONTSIZE;	39	our $FONTSIZE;
36	our $FOCUS;
37	our $HOVER;
38		40
39	our $SDL_TIMER;	41	our $SDL_TIMER;
40	our $SDL_APP;	42	our $SDL_APP;
41	our $SDL_EV = new SDL::Event;	43	our $SDL_EV;
42	our %SDL_CB;	44	our %SDL_CB;
43
44	our @GL_INIT; # hooks called on every gl init
45		45
46	our $ALT_ENTER_MESSAGE;	46	our $ALT_ENTER_MESSAGE;
47	our $STATUS_LINE;	47	our $STATUS_LINE;
48		48	our $DEBUG_STATUS;
49	our $TOPLEVEL;
50
51	our $tw; # Test widget #d#
52		49
53	my $last_refresh;	50	my $last_refresh;
54	my %ANIMATE;	51	my %ANIMATE;
55	my $refresh_handler;	52	my $refresh_handler;
		53
		54	our ($tw, $te); # Test widget #d#
56		55
57	sub init_screen {	56	sub init_screen {
58	$SDL_APP = new SDL::App	57	$SDL_APP = new SDL::App
59	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	58	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
60	-title => "Crossfire+ Client",	59	-title => "Crossfire+ Client",
…		…
67	-alpha_size => 0,	66	-alpha_size => 0,
68	-double_buffer => 1,	67	-double_buffer => 1,
69	-fullscreen => $FULLSCREEN,	68	-fullscreen => $FULLSCREEN,
70	-resizeable => 0;	69	-resizeable => 0;
71		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
72	$last_refresh = SDL::GetTicks;	81	$last_refresh = SDL::GetTicks;
73		82
74	%GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;	83	CFClient::gl_init;
75
76	$GL_EXT{GL_ARB_texture_non_power_of_two}
77	or warn "WARNING: non-power-of-two opengl extension required";
78		84
79	$FONTSIZE = int $HEIGHT / 50;	85	$FONTSIZE = int $HEIGHT / 50;
80		86
81	#############################################################################	87	#############################################################################
82		88
83	glClearColor 0, 0, 0, 0;	89	glClearColor 0.45, 0.45, 0.45, 1;
84		90
85	glEnable GL_TEXTURE_2D;	91	glEnable GL_TEXTURE_2D;
86	glEnable GL_COLOR_MATERIAL;	92	glEnable GL_COLOR_MATERIAL;
87	glShadeModel GL_FLAT;	93	glShadeModel GL_FLAT;
88	glDisable GL_DEPTH_TEST;	94	glDisable GL_DEPTH_TEST;
89	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	95	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
90		96
91	$_->() for @GL_INIT;
92
93	#############################################################################	97	#############################################################################
		98
		99	$DEBUG_STATUS = new CFClient::UI::Label;
		100	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
94		101
95	$STATUS_LINE = new Crossfire::Client::Widget::Label	102	$STATUS_LINE = new CFClient::UI::Label
96	0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE,	103	y => $HEIGHT * 59 / 60 - $FONTSIZE;
97	"";
98	$TOPLEVEL->add ($STATUS_LINE);	104	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
99		105
100	$ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label	106	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
101	0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60,	107	y => $HEIGHT * 59 / 60,
		108	height => $HEIGHT / 60,
102	"Use <b>Alt-Enter</b> to toggle fullscreen mode";	109	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
103	$TOPLEVEL->add ($ALT_ENTER_MESSAGE);	110	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
104		111
105	# Test code #d#	112	$MAPWIDGET = new CFClient::UI::MapWidget;
106	unless ($tw) { # haha...	113	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
107	$tw = new Crossfire::Client::Widget::Animator;	114	$MAPWIDGET->focus_in;
108	my $lbl1 = new Crossfire::Client::Widget::Label	115	}
109	0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
110	my $lbl2 = new Crossfire::Client::Widget::Label
111	0, 0, 10, $FONTSIZE, "LBL2";
112		116
113	my $vb = new Crossfire::Client::Widget::VBox;	117	sub destroy_screen {
114	my $f = new Crossfire::Client::Widget::FancyFrame;	118	remove Glib::Source $SDL_TIMER;
115	my $f2 = new Crossfire::Client::Widget::FancyFrame;	119	undef $SDL_APP;
116	$f->add ($lbl1);	120	undef $SDL_EV;
117	$f2->add ($lbl2);	121	SDL::Quit;
118	$vb->add ($f);	122	}
119	$vb->add ($f2, 1);
120		123
121	$tw->add ($vb);	124	sub config_dialog {
122	$tw->w (400);	125	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
123	$tw->h (300);	126	child => (my $vbox = new CFClient::UI::VBox);
124	$tw->move ($WIDTH - 200, 0);	127	$vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
125	$tw->moveto (0, 0);	128	$vbox->add (my $table = new CFClient::UI::Table);
126	$TOPLEVEL->add ($tw);
127		129
128	# $f->move ($WIDTH - 200, 0);	130	$table->add (0, 0, new CFClient::UI::Label text => "Video Mode");
129	# $TOPLEVEL->add ($f);	131	$table->add (0, 1, new CFClient::UI::Label text => "Host");
130	}	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);
131	}	138	}
132		139
133	sub start_game {	140	sub start_game {
134	$SDL_TIMER = add Glib::Timeout 1000/50, sub {
135	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
136	while $SDL_EV->poll;
137
138	1
139	};
140
141	$WIDTH = $CFG->{width};	141	$WIDTH = $CFG->{width};
142	$HEIGHT = $CFG->{height};	142	$HEIGHT = $CFG->{height};
143	$FULLSCREEN = 0;	143	$FULLSCREEN = 0;
144		144
145	init_screen;	145	init_screen;
146		146
		147	config_dialog;
		148
147	my $mapsize = List::Util::min 64, List::Util::max 11, int $HEIGHT * $CFG->{mapsize} * 0.01 / 32;	149	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
148		150
149	$CONN = new conn	151	$CONN = new conn
150	host => $CFG->{host},	152	host => $CFG->{host},
151	port => $CFG->{port},	153	port => $CFG->{port},
152	user => $CFG->{user},	154	user => $CFG->{user},
153	pass => $CFG->{password},	155	pass => $CFG->{password},
154	mapw => $mapsize,	156	mapw => $mapsize,
155	maph => $mapsize,	157	maph => $mapsize,
156	;	158	;
157		159
158	Crossfire::Client::lowdelay fileno $CONN->{fh};	160	CFClient::lowdelay fileno $CONN->{fh};
159	}	161	}
160		162
161	sub stop_game {	163	sub stop_game {
162	remove Glib::Source $SDL_TIMER;
163	remove Glib::Source $refresh_handler if $refresh_handler;	164	remove Glib::Source $refresh_handler if $refresh_handler;
164	undef $refresh_handler;	165	undef $refresh_handler;
165		166
166	undef $SDL_APP;
167	undef $CONN;	167	undef $CONN;
168	SDL::Quit;	168	destroy_screen;
169	}	169	}
170
171		170
172	sub force_refresh {	171	sub force_refresh {
173	glViewport 0, 0, $WIDTH, $HEIGHT;	172	glViewport 0, 0, $WIDTH, $HEIGHT;
174		173
175	glMatrixMode GL_PROJECTION;	174	glMatrixMode GL_PROJECTION;
176	glLoadIdentity;	175	glLoadIdentity;
177	glOrtho 0, $WIDTH, $HEIGHT, 0, -6000 , 6000;	176	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
178	glMatrixMode GL_MODELVIEW;	177	glMatrixMode GL_MODELVIEW;
		178	glLoadIdentity;
179		179
180	glClear GL_COLOR_BUFFER_BIT;	180	glClear GL_COLOR_BUFFER_BIT;
181		181
182	$TOPLEVEL->draw;	182	$CFClient::UI::TOPLEVEL->draw;
183		183
184	SDL::GLSwapBuffers;	184	SDL::GLSwapBuffers;
185	}	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;
186		194
187	sub refresh {	195	sub refresh {
188	$refresh_handler \|\|= add Glib::Idle sub {	196	$refresh_handler \|\|= add Glib::Idle sub {
189	return unless $SDL_APP;	197	if ($SDL_APP) {
		198	$NOW = SDL::GetTicks;
190		199
191	my $next_refresh = SDL::GetTicks;	200	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
		201	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
		202	$NOW = SDL::GetTicks;
		203	}
		204
192	my $interval = ($next_refresh - $last_refresh) * 0.001;	205	my $interval = ($NOW - $last_refresh) * 0.001;
193	$last_refresh = $next_refresh;	206	$last_refresh = $NOW;
194		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
195	force_refresh;	214	force_refresh;
196	$_->animate ($interval) for grep $_, values %ANIMATE;	215	$_->animate ($interval) for grep $_, values %ANIMATE;
197		216
198	if (%ANIMATE) {	217	if (%ANIMATE) {
		218	1
		219	} else {
		220	undef $refresh_handler;
		221	0
199	1	222	}
200	} else {	223	} else {
201	undef $refresh_handler;	224	undef $refresh_handler;
202	0	225	0
203	}	226	}
204	};	227	};
…		…
230	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) {
231	# alt-enter	254	# alt-enter
232	$FULLSCREEN = !$FULLSCREEN;	255	$FULLSCREEN = !$FULLSCREEN;
233	init_screen;	256	init_screen;
234	} else {	257	} else {
235	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);	258	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
236	}	259	}
237	},	260	},
238	SDL_KEYUP() => sub {	261	SDL_KEYUP() => sub {
239	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);	262	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
240	},	263	},
241	SDL_MOUSEMOTION() => sub {	264	SDL_MOUSEMOTION() => sub {
242	my ($x, $y) = ($SDL_EV->motion_x, $SDL_EV->motion_y);	265	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
243	$HOVER = $TOPLEVEL->find_widget ($x, $y);
244	::refresh;
245
246	warn "mouse $x, $y = $HOVER\n";
247	},	266	},
248	SDL_MOUSEBUTTONDOWN() => sub {	267	SDL_MOUSEBUTTONDOWN() => sub {
249	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);	268	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
250	},	269	},
251	SDL_MOUSEBUTTONUP() => sub {	270	SDL_MOUSEBUTTONUP() => sub {
252	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);	271	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
253	},	272	},
254	SDL_ACTIVEEVENT() => sub {	273	SDL_ACTIVEEVENT() => sub {
255	warn "active\n";#d#	274	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
256	},	275	},
257	);	276	);
258		277
259	@conn::ISA = Crossfire::Protocol::;	278	@conn::ISA = Crossfire::Protocol::;
260		279
261	sub conn::map_update {	280	sub conn::map_update {
262	my ($self, $dirty) = @_;	281	my ($self, $dirty) = @_;
263		282
264	refresh;	283	$MAPWIDGET->update;
265	}	284	}
266		285
267	sub conn::map_scroll {	286	sub conn::map_scroll {
268	my ($self, $dx, $dy) = @_;	287	my ($self, $dx, $dy) = @_;
269		288
…		…
285	sub conn::face_update {	304	sub conn::face_update {
286	my ($self, $face) = @_;	305	my ($self, $face) = @_;
287		306
288	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	307	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
289		308
290	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};	309	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
291	}	310	}
292		311
293	sub conn::query {	312	sub conn::query {
294	my ($self, $flags, $prompt) = @_;	313	my ($self, $flags, $prompt) = @_;
295		314
…		…
368	$cb->signal_connect (clicked => sub {	387	$cb->signal_connect (clicked => sub {
369	for (keys %$cfg) {	388	for (keys %$cfg) {
370	$::CFG->{$_} = $cfg->{$_}	389	$::CFG->{$_} = $cfg->{$_}
371	if $_ ne '_i';	390	if $_ ne '_i';
372	}	391	}
373	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";	392	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
374	});	393	});
375	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);	394	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
376	$cb->signal_connect (clicked => sub {	395	$cb->signal_connect (clicked => sub {
377	for (keys %$cfg) {	396	for (keys %$cfg) {
378	$::CFG->{$_} = $cfg->{$_}	397	$::CFG->{$_} = $cfg->{$_}
…		…
397		416
398	#############################################################################	417	#############################################################################
399		418
400	SDL::Init SDL_INIT_EVERYTHING;	419	SDL::Init SDL_INIT_EVERYTHING;
401		420
402	$TOPLEVEL = Crossfire::Client::Widget::Toplevel->new;
403
404	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
405
406	$TOPLEVEL->add ($mapwidget);
407	$mapwidget->focus_in;
408
409	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";	421	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
410		422
411	$CFG \|\|= {	423	$CFG \|\|= {
412	width => 640,	424	width => 640,
413	height => 480,	425	height => 480,
414	mapsize => 100,	426	mapsize => 100,
415	fullscreen => 0,	427	fullscreen => 0,
416	host => "crossfire.schmorp.de",	428	host => "crossfire.schmorp.de",
417	port => 13327,	429	port => 13327,
418	};	430	};
419		431
420	Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf";	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	}
421		438
422	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	439	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
423		440
424	run_config_dialog	441	run_config_dialog
425	login => sub { start_game },	442	login => sub { start_game },

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.56 by root, Sun Apr 9 22:28:05 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.56 by root, Sun Apr 9 22:28:05 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 20:44:49 2006 UTC