[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.71 by root, Tue Apr 11 17:02:36 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
		19	use CFClient;
20	use Crossfire::Client::Widget;	20	use CFClient::Widget;
		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::Widget::Label;
		100	$CFClient::Widget::TOPLEVEL->add ($DEBUG_STATUS);
94		101
95	$STATUS_LINE = new Crossfire::Client::Widget::Label	102	$STATUS_LINE = new CFClient::Widget::Label
96	0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE,	103	y => $HEIGHT * 59 / 60 - $FONTSIZE;
97	"";
98	$TOPLEVEL->add ($STATUS_LINE);	104	$CFClient::Widget::TOPLEVEL->add ($STATUS_LINE);
99		105
100	$ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label	106	$ALT_ENTER_MESSAGE = new CFClient::Widget::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::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		111
		112	$MAPWIDGET = new CFClient::Widget::MapWidget;
		113	$CFClient::Widget::TOPLEVEL->add ($MAPWIDGET);
		114	$MAPWIDGET->focus_in;
104		115
105	# Test code #d#	116	# Test code #d#
106	unless ($tw) { # haha...	117	unless ($tw) { # haha...
107	$tw = new Crossfire::Client::Widget::Animator;	118	my $w = new CFClient::Widget::Window
108	my $lbl1 = new Crossfire::Client::Widget::Label	119	w => 300, h => 300,
109	0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";	120	child => (my $frame = new CFClient::Widget::FancyFrame);
		121	$CFClient::Widget::TOPLEVEL->add ($w);
		122
		123	$frame->add (my $vbox = new CFClient::Widget::VBox);
		124
		125	$vbox->add (new CFClient::Widget::Entry text => "hallo");
		126	$vbox->add (new CFClient::Widget::Slider);
		127
		128	$tw = new CFClient::Widget::Animator x => $WIDTH - 200, w => 600, h => 300;
		129	my $lbl1 = new CFClient::Widget::Label text => "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
110	my $lbl2 = new Crossfire::Client::Widget::Label	130	my $lbl2 = new CFClient::Widget::Label text => "LBL2";
111	0, 0, 10, $FONTSIZE, "LBL2";
112
113	my $vb = new Crossfire::Client::Widget::VBox;	131	my $vb = new CFClient::Widget::VBox;
114	my $f = new Crossfire::Client::Widget::FancyFrame;	132	my $f = new CFClient::Widget::FancyFrame;
115	my $f2 = new Crossfire::Client::Widget::FancyFrame;	133	my $f2 = new CFClient::Widget::FancyFrame;
116	$f->add ($lbl1);	134	$f->add ($lbl1);
117	$f2->add ($lbl2);	135	$f2->add ($lbl2);
118	$vb->add ($f);	136	$vb->add ($f);
119	$vb->add ($f2, 1);	137	$vb->add ($f2, 1);
120		138
121	$tw->add ($vb);	139	$tw->add ($vb);
122	$tw->w (400);
123	$tw->h (300);
124	$tw->move ($WIDTH - 200, 0);
125	$tw->moveto (0, 0);	140	$tw->moveto (0, 0);
126	$TOPLEVEL->add ($tw);	141	$CFClient::Widget::TOPLEVEL->add ($tw);
127		142
128	# $f->move ($WIDTH - 200, 0);	143	# $f->move ($WIDTH - 200, 0);
129	# $TOPLEVEL->add ($f);	144	# $CFClient::Widget::TOPLEVEL->add ($f);
130	}	145	}
131	}	146	}
132		147
		148	sub destroy_screen {
		149	remove Glib::Source $SDL_TIMER;
		150	undef $SDL_APP;
		151	undef $SDL_EV;
		152	SDL::Quit;
		153	}
		154
133	sub start_game {	155	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};	156	$WIDTH = $CFG->{width};
142	$HEIGHT = $CFG->{height};	157	$HEIGHT = $CFG->{height};
143	$FULLSCREEN = 0;	158	$FULLSCREEN = 0;
144		159
145	init_screen;	160	init_screen;
146		161
147	my $mapsize = List::Util::min 64, List::Util::max 11, int $HEIGHT * $CFG->{mapsize} * 0.01 / 32;	162	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
148		163
149	$CONN = new conn	164	$CONN = new conn
150	host => $CFG->{host},	165	host => $CFG->{host},
151	port => $CFG->{port},	166	port => $CFG->{port},
152	user => $CFG->{user},	167	user => $CFG->{user},
153	pass => $CFG->{password},	168	pass => $CFG->{password},
154	mapw => $mapsize,	169	mapw => $mapsize,
155	maph => $mapsize,	170	maph => $mapsize,
156	;	171	;
157		172
158	Crossfire::Client::lowdelay fileno $CONN->{fh};	173	CFClient::lowdelay fileno $CONN->{fh};
159	}	174	}
160		175
161	sub stop_game {	176	sub stop_game {
162	remove Glib::Source $SDL_TIMER;
163	remove Glib::Source $refresh_handler if $refresh_handler;	177	remove Glib::Source $refresh_handler if $refresh_handler;
164	undef $refresh_handler;	178	undef $refresh_handler;
165		179
166	undef $SDL_APP;
167	undef $CONN;	180	undef $CONN;
168	SDL::Quit;	181	destroy_screen;
169	}	182	}
170
171		183
172	sub force_refresh {	184	sub force_refresh {
173	glViewport 0, 0, $WIDTH, $HEIGHT;	185	glViewport 0, 0, $WIDTH, $HEIGHT;
174		186
175	glMatrixMode GL_PROJECTION;	187	glMatrixMode GL_PROJECTION;
176	glLoadIdentity;	188	glLoadIdentity;
177	glOrtho 0, $WIDTH, $HEIGHT, 0, -6000 , 6000;	189	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
178	glMatrixMode GL_MODELVIEW;	190	glMatrixMode GL_MODELVIEW;
179		191
180	glClear GL_COLOR_BUFFER_BIT;	192	glClear GL_COLOR_BUFFER_BIT;
181		193
182	$TOPLEVEL->draw;	194	$CFClient::Widget::TOPLEVEL->draw;
183		195
184	SDL::GLSwapBuffers;	196	SDL::GLSwapBuffers;
185	}	197	}
		198
		199	sub debug {
		200	$DEBUG_STATUS->set_text ($_[0]);
		201	$DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request);
		202	$DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0);
		203	}
		204
		205	my $FPS;
186		206
187	sub refresh {	207	sub refresh {
188	$refresh_handler \|\|= add Glib::Idle sub {	208	$refresh_handler \|\|= add Glib::Idle sub {
189	return unless $SDL_APP;	209	if ($SDL_APP) {
		210	$NOW = SDL::GetTicks;
190		211
191	my $next_refresh = SDL::GetTicks;	212	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
		213	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
		214	$NOW = SDL::GetTicks;
		215	}
		216
192	my $interval = ($next_refresh - $last_refresh) * 0.001;	217	my $interval = ($NOW - $last_refresh) * 0.001;
193	$last_refresh = $next_refresh;	218	$last_refresh = $NOW;
194		219
		220	if ($interval) {
		221	$FPS \|\|= 1 / $interval;
		222	$FPS = $FPS * 0.96 + (1 / $interval) * 0.04;
		223	debug sprintf "%5.02f", $FPS;
		224	}
		225
195	force_refresh;	226	force_refresh;
196	$_->animate ($interval) for grep $_, values %ANIMATE;	227	$_->animate ($interval) for grep $_, values %ANIMATE;
197		228
198	if (%ANIMATE) {	229	if (%ANIMATE) {
		230	1
		231	} else {
		232	undef $refresh_handler;
		233	0
199	1	234	}
200	} else {	235	} else {
201	undef $refresh_handler;	236	undef $refresh_handler;
202	0	237	0
203	}	238	}
204	};	239	};
…		…
230	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	265	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
231	# alt-enter	266	# alt-enter
232	$FULLSCREEN = !$FULLSCREEN;	267	$FULLSCREEN = !$FULLSCREEN;
233	init_screen;	268	init_screen;
234	} else {	269	} else {
235	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);	270	CFClient::Widget::feed_sdl_key_down_event ($SDL_EV);
236	}	271	}
237	},	272	},
238	SDL_KEYUP() => sub {	273	SDL_KEYUP() => sub {
239	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);	274	CFClient::Widget::feed_sdl_key_up_event ($SDL_EV);
240	},	275	},
241	SDL_MOUSEMOTION() => sub {	276	SDL_MOUSEMOTION() => sub {
242	my ($x, $y) = ($SDL_EV->motion_x, $SDL_EV->motion_y);	277	CFClient::Widget::feed_sdl_motion_event ($SDL_EV);
243	$HOVER = $TOPLEVEL->find_widget ($x, $y);
244	::refresh;
245
246	warn "mouse $x, $y = $HOVER\n";
247	},	278	},
248	SDL_MOUSEBUTTONDOWN() => sub {	279	SDL_MOUSEBUTTONDOWN() => sub {
249	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);	280	CFClient::Widget::feed_sdl_button_down_event ($SDL_EV);
250	},	281	},
251	SDL_MOUSEBUTTONUP() => sub {	282	SDL_MOUSEBUTTONUP() => sub {
252	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);	283	CFClient::Widget::feed_sdl_button_up_event ($SDL_EV);
253	},	284	},
254	SDL_ACTIVEEVENT() => sub {	285	SDL_ACTIVEEVENT() => sub {
255	warn "active\n";#d#	286	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
256	},	287	},
257	);	288	);
258		289
259	@conn::ISA = Crossfire::Protocol::;	290	@conn::ISA = Crossfire::Protocol::;
260		291
261	sub conn::map_update {	292	sub conn::map_update {
262	my ($self, $dirty) = @_;	293	my ($self, $dirty) = @_;
263		294
264	refresh;	295	$MAPWIDGET->update;
265	}	296	}
266		297
267	sub conn::map_scroll {	298	sub conn::map_scroll {
268	my ($self, $dx, $dy) = @_;	299	my ($self, $dx, $dy) = @_;
269		300
…		…
285	sub conn::face_update {	316	sub conn::face_update {
286	my ($self, $face) = @_;	317	my ($self, $face) = @_;
287		318
288	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	319	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
289		320
290	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};	321	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
291	}	322	}
292		323
293	sub conn::query {	324	sub conn::query {
294	my ($self, $flags, $prompt) = @_;	325	my ($self, $flags, $prompt) = @_;
295		326
…		…
368	$cb->signal_connect (clicked => sub {	399	$cb->signal_connect (clicked => sub {
369	for (keys %$cfg) {	400	for (keys %$cfg) {
370	$::CFG->{$_} = $cfg->{$_}	401	$::CFG->{$_} = $cfg->{$_}
371	if $_ ne '_i';	402	if $_ ne '_i';
372	}	403	}
373	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";	404	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
374	});	405	});
375	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);	406	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
376	$cb->signal_connect (clicked => sub {	407	$cb->signal_connect (clicked => sub {
377	for (keys %$cfg) {	408	for (keys %$cfg) {
378	$::CFG->{$_} = $cfg->{$_}	409	$::CFG->{$_} = $cfg->{$_}
…		…
397		428
398	#############################################################################	429	#############################################################################
399		430
400	SDL::Init SDL_INIT_EVERYTHING;	431	SDL::Init SDL_INIT_EVERYTHING;
401		432
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";	433	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
410		434
411	$CFG \|\|= {	435	$CFG \|\|= {
412	width => 640,	436	width => 640,
413	height => 480,	437	height => 480,
414	mapsize => 100,	438	mapsize => 100,
415	fullscreen => 0,	439	fullscreen => 0,
416	host => "crossfire.schmorp.de",	440	host => "crossfire.schmorp.de",
417	port => 13327,	441	port => 13327,
418	};	442	};
419		443
420	Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf";	444	{
		445	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		446
		447	CFClient::add_font $_ for @fonts;
		448	CFClient::set_font $fonts[0];
		449	}
421		450
422	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	451	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
423		452
424	run_config_dialog	453	run_config_dialog
425	login => sub { start_game },	454	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.71 by root, Tue Apr 11 17:02:36 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.71 by root, Tue Apr 11 17:02:36 2006 UTC