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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.52 by root, Sun Apr 9 22:12:12 2006 UTC vs. Revision 1.75 by root, Tue Apr 11 21:24:10 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.52 by root, Sun Apr 9 22:12:12 2006 UTC vs.
Revision 1.75 by root, Tue Apr 11 21:24:10 2006 UTC