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