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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.6 by root, Thu Apr 6 21:15:11 2006 UTC vs.
Revision 1.69 by root, Tue Apr 11 14:04:27 2006 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
		4	use utf8;
4		5
5	use Crossfire::Client;	6	use Glib;
6	use Crossfire::Protocol;	7	use Gtk2 -init;
7
8	package Crossfire::Client; # uh, yeah
9
10	use strict;
11		8
12	use SDL;	9	use SDL;
13	use SDL::App;	10	use SDL::App;
14	use SDL::Event;	11	use SDL::Event;
15	use SDL::Surface;	12	use SDL::Surface;
16	use SDL::OpenGL;	13	use SDL::OpenGL;
17	use SDL::OpenGL::Constants;	14	use SDL::OpenGL::Constants;
18		15
19	my $conn;	16	use Crossfire;
20	my $app;	17	use Crossfire::Protocol;
21		18
22	my $WIDTH = 640;	19	use CFClient;
23	my $HEIGHT = 480;	20	use CFClient::Widget;
24		21
25	sub glinit {	22	our $VERSION = '0.1';
26	# nuke all gl context data	23
27		24	my $MAX_FPS = 30;
		25	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
		26
		27	our $FACECACHE;
		28
		29	our $CFG;
		30	our $CONN;
		31
		32	our $WIDTH;
		33	our $HEIGHT;
		34	our $FULLSCREEN;
		35
		36	our $MAPWIDGET;
		37	our $FONTSIZE;
		38
		39	our $SDL_TIMER;
		40	our $SDL_APP;
		41	our $SDL_EV;
		42	our %SDL_CB;
		43
		44	our $ALT_ENTER_MESSAGE;
		45	our $STATUS_LINE;
		46	our $DEBUG_STATUS;
		47
		48	my $last_refresh;
		49	my %ANIMATE;
		50	my $refresh_handler;
		51
		52	our ($tw, $te); # Test widget #d#
		53
		54	sub init_screen {
28	$app = new SDL::App	55	$SDL_APP = new SDL::App
29	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	56	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
30	-title => "Crossfire+ Client",	57	-title => "Crossfire+ Client",
31	-width => $WIDTH,	58	-width => $WIDTH,
32	-height => $HEIGHT,	59	-height => $HEIGHT,
33	-opengl => 1,	60	-opengl => 1,
34	-red_size => 8,	61	-red_size => 5,
35	-green_size => 8,	62	-green_size => 5,
36	-blue_size => 8,	63	-blue_size => 5,
		64	-alpha_size => 0,
37	-double_buffer => 1,	65	-double_buffer => 1,
		66	-fullscreen => $FULLSCREEN,
38	-resizeable => 0;	67	-resizeable => 0;
39		68
		69	$SDL_EV = new SDL::Event;
		70	$SDL_EV->set_unicode (1);
		71
		72	$SDL_TIMER = add Glib::Timeout 1000/50, sub {
		73	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		74	while $SDL_EV->poll;
		75
		76	1
		77	};
		78
		79	$last_refresh = SDL::GetTicks;
		80
		81	CFClient::gl_init;
		82
		83	$FONTSIZE = int $HEIGHT / 50;
		84
		85	#############################################################################
		86
		87	glClearColor 0.45, 0.45, 0.45, 1;
		88
40	glEnable GL_TEXTURE_2D;	89	glEnable GL_TEXTURE_2D;
41	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL;	90	glEnable GL_COLOR_MATERIAL;
42	glShadeModel GL_FLAT;	91	glShadeModel GL_FLAT;
43	glDisable GL_DEPTH_TEST;	92	glDisable GL_DEPTH_TEST;
		93	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		94
		95	#############################################################################
		96
		97	$DEBUG_STATUS = new CFClient::Widget::Label;
		98	$CFClient::Widget::TOPLEVEL->add ($DEBUG_STATUS);
		99
		100	$STATUS_LINE = new CFClient::Widget::Label
		101	y => $HEIGHT * 59 / 60 - $FONTSIZE;
		102	$CFClient::Widget::TOPLEVEL->add ($STATUS_LINE);
		103
		104	$ALT_ENTER_MESSAGE = new CFClient::Widget::Label
		105	y => $HEIGHT * 59 / 60,
		106	height => $HEIGHT / 60,
		107	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		108	$CFClient::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		109
		110	$MAPWIDGET = new CFClient::Widget::MapWidget;
		111	$CFClient::Widget::TOPLEVEL->add ($MAPWIDGET);
		112	$MAPWIDGET->focus_in;
		113
		114	# Test code #d#
		115	unless ($tw) { # haha...
		116	$te = new CFClient::Widget::FancyFrame x => 300, z => 1;
		117	$te->add (new CFClient::Widget::Entry);
		118	$CFClient::Widget::TOPLEVEL->add ($te);
		119
		120	$tw = new CFClient::Widget::Animator x => $WIDTH - 200, w => 600, h => 300;
		121	my $lbl1 = new CFClient::Widget::Label text => "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
		122	my $lbl2 = new CFClient::Widget::Label text => "LBL2";
		123	my $vb = new CFClient::Widget::VBox;
		124	my $f = new CFClient::Widget::FancyFrame;
		125	my $f2 = new CFClient::Widget::FancyFrame;
		126	$f->add ($lbl1);
		127	$f2->add ($lbl2);
		128	$vb->add ($f);
		129	$vb->add ($f2, 1);
		130
		131	$tw->add ($vb);
		132	$tw->moveto (0, 0);
		133	$CFClient::Widget::TOPLEVEL->add ($tw);
		134
		135	# $f->move ($WIDTH - 200, 0);
		136	# $CFClient::Widget::TOPLEVEL->add ($f);
		137	}
		138	}
		139
		140	sub destroy_screen {
		141	remove Glib::Source $SDL_TIMER;
		142	undef $SDL_APP;
		143	undef $SDL_EV;
		144	SDL::Quit;
		145	}
		146
		147	sub start_game {
		148	$WIDTH = $CFG->{width};
		149	$HEIGHT = $CFG->{height};
		150	$FULLSCREEN = 0;
		151
		152	init_screen;
		153
		154	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		155
		156	$CONN = new conn
		157	host => $CFG->{host},
		158	port => $CFG->{port},
		159	user => $CFG->{user},
		160	pass => $CFG->{password},
		161	mapw => $mapsize,
		162	maph => $mapsize,
		163	;
		164
		165	CFClient::lowdelay fileno $CONN->{fh};
		166	}
		167
		168	sub stop_game {
		169	remove Glib::Source $refresh_handler if $refresh_handler;
		170	undef $refresh_handler;
		171
		172	undef $CONN;
		173	destroy_screen;
		174	}
		175
		176	sub force_refresh {
		177	glViewport 0, 0, $WIDTH, $HEIGHT;
		178
44	glMatrixMode GL_PROJECTION;	179	glMatrixMode GL_PROJECTION;
45
46	glLoadIdentity;	180	glLoadIdentity;
47	glOrtho 0, $WIDTH / 32, $HEIGHT / 32, 0, -1 , 1;	181	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
		182	glMatrixMode GL_MODELVIEW;
48		183
49	# re-bind all textures	184	glClear GL_COLOR_BUFFER_BIT;
		185
		186	$CFClient::Widget::TOPLEVEL->draw;
		187
		188	SDL::GLSwapBuffers;
50	}	189	}
		190
		191	sub debug {
		192	$DEBUG_STATUS->set_text ($_[0]);
		193	$DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request);
		194	$DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0);
		195	}
		196
		197	my $FPS;
51		198
52	sub refresh {	199	sub refresh {
53	glClearColor 0.5, 0.5, 0.7, 0;	200	$refresh_handler \|\|= add Glib::Idle sub {
54	glClear GL_COLOR_BUFFER_BIT;	201	if ($SDL_APP) {
		202	my $next_refresh = SDL::GetTicks;
55		203
56	my $map = $conn->{map};	204	if ($next_refresh - $last_refresh < $TICKS_PER_FRAME) {
57		205	SDL::Delay $TICKS_PER_FRAME - ($next_refresh - $last_refresh);
58	for my $x (0 .. $conn->{mapw} - 1) {	206	$next_refresh = SDL::GetTicks;
59	for my $y (0 .. $conn->{maph} - 1) {
60
61	my $cell = $map->[$x][$y]
62	or next;
63
64	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {
65	my $tex = $conn->{face}[$num]{texture} \|\| 0;
66
67	glBindTexture GL_TEXTURE_2D, $tex;
68
69	glColor 1,0.2,0.7;
70	glBegin GL_QUADS;
71	glTexCoord 0, 0; glVertex $x, $y;
72	glTexCoord 0, 1; glVertex $x, $y + 0.9;
73	glTexCoord 1, 1; glVertex $x + 0.9, $y + 0.9;
74	glTexCoord 1, 0; glVertex $x + 0.9, $y;
75	glEnd;
76	}	207	}
		208
		209	my $interval = ($next_refresh - $last_refresh) * 0.001;
		210	$last_refresh = $next_refresh;
		211
		212	if ($interval) {
		213	$FPS \|\|= 1 / $interval;
		214	$FPS = $FPS * 0.96 + (1 / $interval) * 0.04;
		215	debug sprintf "%5.02f", $FPS;
		216	}
		217
		218	force_refresh;
		219	$_->animate ($interval) for grep $_, values %ANIMATE;
		220
		221	if (%ANIMATE) {
		222	1
		223	} else {
		224	undef $refresh_handler;
		225	0
		226	}
		227	} else {
		228	undef $refresh_handler;
		229	0
77	}	230	}
78	}	231	};
79
80	SDL::GLSwapBuffers;
81	}	232	}
82		233
83	my $ev = new SDL::Event;	234	sub animation_start {
84	my %ev_cb;	235	my ($widget) = @_;
		236	$ANIMATE{$widget} = $widget;
		237	Scalar::Util::weaken $ANIMATE{$widget};
85		238
86	sub event(&$) {
87	$ev_cb{$_[0]->()} = $_[1];
88	}
89
90	sub does(&) { shift }
91
92	event {SDL_QUIT} does {
93	exit;
94	};
95
96	event {SDL_VIDEORESIZE} does {
97	print "resize\n";
98	};
99
100	event {SDL_VIDEOEXPOSE} does {
101	refresh;	239	refresh;
102	};	240	}
103		241
104	event {SDL_KEYDOWN} does {	242	sub animation_stop {
105	print "keypress\n";	243	my ($widget) = @_;
106	};	244	delete $ANIMATE{$widget};
		245	}
107		246
108	event {SDL_KEYUP} does {	247	%SDL_CB = (
109	print "keyup\n";#d#	248	SDL_QUIT() => sub {
110	};	249	main_quit Gtk2;
111		250	},
112	event {SDL_MOUSEMOTION} does {	251	SDL_VIDEORESIZE() => sub {
113	print "motion\n";	252	},
114	};	253	SDL_VIDEOEXPOSE() => sub {
115		254	refresh;
116	event {SDL_MOUSEBUTTONDOWN} does {	255	},
117	print "button\n";	256	SDL_KEYDOWN() => sub {
118	};	257	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
119		258	# alt-enter
120	event {SDL_MOUSEBUTTONUP} does {	259	$FULLSCREEN = !$FULLSCREEN;
121	print "buttup\n";	260	init_screen;
122	};	261	} else {
123		262	CFClient::Widget::feed_sdl_key_down_event ($SDL_EV);
124	event {SDL_ACTIVEEVENT} does {	263	}
125	print "active\n";	264	},
126	};	265	SDL_KEYUP() => sub {
127		266	CFClient::Widget::feed_sdl_key_up_event ($SDL_EV);
128	package Crossfire::Client;	267	},
		268	SDL_MOUSEMOTION() => sub {
		269	CFClient::Widget::feed_sdl_motion_event ($SDL_EV);
		270	},
		271	SDL_MOUSEBUTTONDOWN() => sub {
		272	CFClient::Widget::feed_sdl_button_down_event ($SDL_EV);
		273	},
		274	SDL_MOUSEBUTTONUP() => sub {
		275	CFClient::Widget::feed_sdl_button_up_event ($SDL_EV);
		276	},
		277	SDL_ACTIVEEVENT() => sub {
		278	printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
		279	},
		280	);
129		281
130	@conn::ISA = Crossfire::Protocol::;	282	@conn::ISA = Crossfire::Protocol::;
131		283
132	sub conn::map_update {	284	sub conn::map_update {
133	my ($self, $dirty) = @_;	285	my ($self, $dirty) = @_;
134		286
135	refresh;	287	$MAPWIDGET->update;
136	}	288	}
137		289
138	sub conn::map_scroll {	290	sub conn::map_scroll {
139	my ($self, $dx, $dy) = @_;	291	my ($self, $dx, $dy) = @_;
140		292
141	refresh;	293	# refresh;
142	}	294	}
143		295
144	sub conn::map_clear {	296	sub conn::map_clear {
145	my ($self) = @_;	297	my ($self) = @_;
146		298
147	refresh;	299	# refresh;
		300	}
		301
		302	sub conn::face_find {
		303	my ($self, $face) = @_;
		304
		305	$FACECACHE->{"$face->{chksum},$face->{name}"}
148	}	306	}
149		307
150	sub conn::face_update {	308	sub conn::face_update {
151	my ($self, $num, $face) = @_;	309	my ($self, $face) = @_;
152		310
153	warn "up face $self,$num,$face\n";#d#	311	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
154	#TODO
155	open my $fh, ">:raw", "/tmp/x~";
156	syswrite $fh, $face->{image};
157	close $fh;
158		312
159	my $surface = new SDL::Surface -name => "/tmp/x~";	313	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		314	}
160		315
161	unlink "/tmp/x~";	316	sub conn::query {
		317	my ($self, $flags, $prompt) = @_;
162		318
163	my ($tex) = @{glGenTextures 1};	319	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
164	glGetError();	320	}
165		321
166	$face->{texture} = $tex;	322	sub gtk_add_cfg_field {
		323	my ($tbl, $cfg, $klbl, $key, $value) = @_;
		324	my $i = $cfg->{_i}++;
		325	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
		326	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
		327	if ($key eq 'password') {
		328	$ent->set_invisible_char ("*");
		329	$ent->set (visibility => 0)
		330	}
		331	$ent->set_text ($value);
		332	$ent->signal_connect (changed => sub {
		333	my ($ent) = @_;
		334	$cfg->{$key} = $ent->get_text;
		335	# TODO: Mapsize should be a slider in the game gui
		336	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
		337	$cfg->{$key} = 100;
		338	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
		339	$cfg->{$key} = 50;
		340	}
		341	});
		342	}
		343
		344	sub run_config_dialog {
		345	my (%events) = @_;
		346
		347	my $w = Gtk2::Window->new;
		348
		349	my @cfg = (
		350	[qw/Host host/],
		351	[qw/Port port/],
		352	[qw/Mapsize% mapsize/],
		353	[qw/Username user/],
		354	[qw/Password password/],
167		355	);
168	glBindTexture GL_TEXTURE_2D, $tex;	356
169	my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;	357	my $cfg = {};
		358
		359	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
		360	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
		361
		362	$w->add (my $vb = Gtk2::VBox->new);
		363	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
		364	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
		365	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
		366	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
		367	my $i = 0;
		368	my $act = 0;
		369	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
		370	if ($_ eq $selmode) { $act = $i }
		371	$cb->append_text ($_);
		372	$i++;
		373	}
		374	$cb->set_active ($act);
		375	$cb->signal_connect (changed => sub {
		376	my ($cb) = @_;
		377	my $txt = $cb->get_active_text;
		378	if ($txt =~ m/(\d+)x(\d+)/) {
		379	$::CFG->{width} = $1;
		380	$::CFG->{height} = $2;
170		381	}
171	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;	382	});
172	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
173	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
174	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
175
176	$surface->rgba;
177		383
178	glTexImage2D GL_TEXTURE_2D, 0,	384	$cfg->{_i} = 1;
179	4, # components	385	for (@cfg) {
180	$surface->width, $surface->height,	386	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
		387	}
		388
		389	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
		390	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
		391	$cb->signal_connect (clicked => sub {
		392	for (keys %$cfg) {
		393	$::CFG->{$_} = $cfg->{$_}
		394	if $_ ne '_i';
181	0,	395	}
		396	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
		397	});
		398	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
		399	$cb->signal_connect (clicked => sub {
		400	for (keys %$cfg) {
		401	$::CFG->{$_} = $cfg->{$_}
		402	if $_ ne '_i';
182	GL_RGBA,	403	}
183	GL_UNSIGNED_BYTE,	404	my $cb = $events{login} \|\| sub {};
184	$surface->pixels;	405	$cb->($::CFG->{user}, $::CFG->{password});
185	my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;	406	});
		407	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
		408	$cb->signal_connect (clicked => sub {
		409	my $cb = $events{logout} \|\| sub {};
		410	$cb->();
		411	});
		412	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
		413	$cb->signal_connect (clicked => sub { $w->destroy });
		414
		415	$w->show_all;
		416
		417	$w->signal_connect (destroy => sub { Gtk2->main_quit });
186	}	418	}
		419
187		420
188	#############################################################################	421	#############################################################################
189		422
190	use Event;	423	SDL::Init SDL_INIT_EVERYTHING;
191		424
192	glinit;	425	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
193		426
194	$conn = new conn	427	$CFG \|\|= {
		428	width => 640,
		429	height => 480,
		430	mapsize => 100,
		431	fullscreen => 0,
195	host => "cf.schmorp.de",	432	host => "crossfire.schmorp.de",
196	port => 13327;	433	port => 13327,
197
198	Event->timer (after => 0, interval => 1/20, hard => 1, cb => sub {
199	while ($ev->poll) {
200	($ev_cb{$ev->type} \|\| sub { warn "unhandled event ", $ev->type })->();
201	}
202	});	434	};
203		435
204	Event::loop;	436	{
		437	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
205		438
		439	CFClient::add_font $_ for @fonts;
		440	CFClient::set_font $fonts[0];
		441	}
206		442
		443	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
		444
		445	run_config_dialog
		446	login => sub { start_game },
		447	logout => sub { stop_game };
		448
		449	main Gtk2;
		450
		451	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.6 by root, Thu Apr 6 21:15:11 2006 UTC vs. Revision 1.69 by root, Tue Apr 11 14:04:27 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.6 by root, Thu Apr 6 21:15:11 2006 UTC vs.
Revision 1.69 by root, Tue Apr 11 14:04:27 2006 UTC