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

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

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.11 by elmex, Fri Apr 7 16:08:01 2006 UTC vs.
Revision 1.56 by root, Sun Apr 9 22:28:05 2006 UTC