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

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

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.2 by root, Thu Apr 6 20:00:23 2006 UTC vs.
Revision 1.62 by root, Mon Apr 10 19:34:04 2006 UTC