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

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

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.8 by root, Fri Apr 7 08:42:56 2006 UTC vs.
Revision 1.65 by root, Tue Apr 11 12:27:51 2006 UTC