[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.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;	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::Protocol;
27		18
28	my $WIDTH = 640;	19	use Crossfire::Client;
29	my $HEIGHT = 480;	20	use Crossfire::Client::Widget;
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
		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 {
34	$app = new SDL::App	54	$SDL_APP = new SDL::App
35	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	55	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
36	-title => "Crossfire+ Client",	56	-title => "Crossfire+ Client",
37	-width => $WIDTH,	57	-width => $WIDTH,
38	-height => $HEIGHT,	58	-height => $HEIGHT,
39	-opengl => 1,	59	-opengl => 1,
40	-red_size => 8,	60	-red_size => 5,
41	-green_size => 8,	61	-green_size => 5,
42	-blue_size => 8,	62	-blue_size => 5,
		63	-alpha_size => 0,
43	-double_buffer => 1,	64	-double_buffer => 1,
		65	-fullscreen => $FULLSCREEN,
44	-resizeable => 0;	66	-resizeable => 0;
45		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
46	glEnable GL_TEXTURE_2D;	84	glEnable GL_TEXTURE_2D;
47	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	85	glEnable GL_COLOR_MATERIAL;
48	glShadeModel GL_FLAT;	86	glShadeModel GL_FLAT;
49	glDisable GL_DEPTH_TEST;	87	glDisable GL_DEPTH_TEST;
50	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	88	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
51	glEnable GL_BLEND;	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;
52		177
53	glMatrixMode GL_PROJECTION;	178	glMatrixMode GL_PROJECTION;
54	glLoadIdentity;	179	glLoadIdentity;
55	glOrtho 0, $WIDTH / 32, $HEIGHT / 32, 0, -1 , 1;	180	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
		181	glMatrixMode GL_MODELVIEW;
56		182
57	# re-bind all textures	183	glClear GL_COLOR_BUFFER_BIT;
		184
		185	$Crossfire::Client::Widget::TOPLEVEL->draw;
		186
		187	SDL::GLSwapBuffers;
58	}	188	}
59		189
60	sub refresh {	190	sub refresh {
61	glClearColor 0, 0, 0, 0;	191	$refresh_handler \|\|= add Glib::Idle sub {
62	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;
63		196
64	my $map = $conn->{map};	197	force_refresh;
		198	$_->animate ($interval) for grep $_, values %ANIMATE;
65		199
66	for my $x (0 .. $conn->{mapw} - 1) {	200	if (%ANIMATE) {
67	for my $y (0 .. $conn->{maph} - 1) {
68
69	my $cell = $map->[$x][$y]
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;	201	1
		202	} else {
		203	undef $refresh_handler;
		204	0
87	}	205	}
		206	} else {
		207	undef $refresh_handler;
		208	0
88	}	209	}
89	}	210	};
90
91	SDL::GLSwapBuffers;
92	}	211	}
93		212
94	my $ev = new SDL::Event;	213	sub animation_start {
95	my %ev_cb;	214	my ($widget) = @_;
		215	$ANIMATE{$widget} = $widget;
		216	Scalar::Util::weaken $ANIMATE{$widget};
96		217
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;	218	refresh;
113	};	219	}
114		220
115	event {SDL_KEYDOWN} does {	221	sub animation_stop {
116	print "keypress\n";	222	my ($widget) = @_;
117	};	223	delete $ANIMATE{$widget};
		224	}
118		225
119	event {SDL_KEYUP} does {	226	%SDL_CB = (
120	print "keyup\n";#d#	227	SDL_QUIT() => sub {
121	};	228	main_quit Gtk2;
122		229	},
123	event {SDL_MOUSEMOTION} does {	230	SDL_VIDEORESIZE() => sub {
124	print "motion\n";	231	},
125	};	232	SDL_VIDEOEXPOSE() => sub {
126		233	refresh;
127	event {SDL_MOUSEBUTTONDOWN} does {	234	},
128	print "button\n";	235	SDL_KEYDOWN() => sub {
129	};	236	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
130		237	# alt-enter
131	event {SDL_MOUSEBUTTONUP} does {	238	$FULLSCREEN = !$FULLSCREEN;
132	print "buttup\n";	239	init_screen;
133	};	240	} else {
134		241	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
135	event {SDL_ACTIVEEVENT} does {	242	}
136	print "active\n";	243	},
137	};	244	SDL_KEYUP() => sub {
138		245	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
139	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	);
140		260
141	@conn::ISA = Crossfire::Protocol::;	261	@conn::ISA = Crossfire::Protocol::;
142		262
143	sub conn::map_update {	263	sub conn::map_update {
144	my ($self, $dirty) = @_;	264	my ($self, $dirty) = @_;
147	}	267	}
148		268
149	sub conn::map_scroll {	269	sub conn::map_scroll {
150	my ($self, $dx, $dy) = @_;	270	my ($self, $dx, $dy) = @_;
151		271
152	refresh;	272	# refresh;
153	}	273	}
154		274
155	sub conn::map_clear {	275	sub conn::map_clear {
156	my ($self) = @_;	276	my ($self) = @_;
157		277
158	refresh;	278	# refresh;
		279	}
		280
		281	sub conn::face_find {
		282	my ($self, $face) = @_;
		283
		284	$FACECACHE->{"$face->{chksum},$face->{name}"}
159	}	285	}
160		286
161	sub conn::face_update {	287	sub conn::face_update {
162	my ($self, $num, $face) = @_;	288	my ($self, $face) = @_;
163		289
164	warn "up face $self,$num,$face\n";#d#	290	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
165	use Gtk2;
166		291
167	my $pb = new Gtk2::Gdk::PixbufLoader;	292	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
168	$pb->write ($face->{image});	293	}
169	$pb->close;
170		294
171	$pb = $pb->get_pixbuf;	295	sub conn::query {
172	$pb = $pb->add_alpha (0, 0, 0, 0);	296	my ($self, $flags, $prompt) = @_;
173		297
174	glGetError();	298	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
175	my ($tex) = @{glGenTextures 1};	299	}
176		300
177	$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/],
178		334	);
179	glBindTexture GL_TEXTURE_2D, $tex;	335
180	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;
181		360	}
182	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;	361	});
183	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;	362
184	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	363	$cfg->{_i} = 1;
185	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	364	for (@cfg) {
186		365	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
187	glTexImage2D GL_TEXTURE_2D, 0,	366	}
188	GL_RGBA8,	367
189	$pb->get_width, $pb->get_height,	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';
190	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';
191	GL_RGBA,	382	}
192	GL_UNSIGNED_BYTE,	383	my $cb = $events{login} \|\| sub {};
193	$pb->get_pixels;	384	$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;	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 });
195	}	397	}
		398
196		399
197	#############################################################################	400	#############################################################################
198		401
199	use Event;	402	SDL::Init SDL_INIT_EVERYTHING;
200		403
		404	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
		405
		406	$Crossfire::Client::Widget::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.59 by root, Mon Apr 10 11:55:16 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.59 by root, Mon Apr 10 11:55:16 2006 UTC