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