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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.12 by elmex, Fri Apr 7 16:29:19 2006 UTC vs.
Revision 1.31 by elmex, Sat Apr 8 16:34:47 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 $UIFONT;
		36
		37	our $SDL_TIMER;
		38	our $SDL_APP;
		39	our $SDL_EV = new SDL::Event;
		40	our %SDL_CB;
		41
		42	our @GL_INIT; # hooks called on every gl init
		43
		44	our $ALT_ENTER_MESSAGE;
		45
		46	sub init_screen {
34	$app = new SDL::App	47	$SDL_APP = new SDL::App
35	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	48	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
36	-title => "Crossfire+ Client",	49	-title => "Crossfire+ Client",
37	-width => $WIDTH,	50	-width => $WIDTH,
38	-height => $HEIGHT,	51	-height => $HEIGHT,
39	-opengl => 1,	52	-opengl => 1,
40	-red_size => 8,	53	-red_size => 8,
41	-green_size => 8,	54	-green_size => 8,
42	-blue_size => 8,	55	-blue_size => 8,
43	-double_buffer => 1,	56	-double_buffer => 1,
		57	-fullscreen => $FULLSCREEN,
44	-resizeable => 0;	58	-resizeable => 0;
45		59
		60	%GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
		61
		62	$GL_EXT{GL_ARB_texture_non_power_of_two}
		63	or warn "WARNING: non-power-of-two opengl extension required";
		64
		65	$UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $HEIGHT / 40
		66	or die "TTFOpenFont: $!";
		67
		68	$ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Alt-Enter toggles fullscreen mode";
		69	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
		70	$ALT_ENTER_MESSAGE->activate;
		71
		72	glClearColor 0, 0, 0, 0;
		73
46	glEnable GL_TEXTURE_2D;	74	glEnable GL_TEXTURE_2D;
47	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
48	glShadeModel GL_FLAT;	75	glShadeModel GL_FLAT;
49	glDisable GL_DEPTH_TEST;	76	glDisable GL_DEPTH_TEST;
50	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	77	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
51	glEnable GL_BLEND;
52		78
53	glMatrixMode GL_PROJECTION;	79	glMatrixMode GL_PROJECTION;
54	glLoadIdentity;	80	glLoadIdentity;
55	glOrtho 0, $WIDTH / 32, $HEIGHT / 32, 0, -1 , 1;	81	glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;
56		82
57	# re-bind all textures	83	glMatrixMode GL_MODELVIEW;
		84
		85	$_->() for @GL_INIT;
58	}	86	}
		87
		88	sub start_game {
		89	$SDL_TIMER = add Glib::Timeout 1000/100, sub {
		90	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		91	while $SDL_EV->poll;
		92
		93	1
		94	};
		95
		96	$WIDTH = $CFG->{width};
		97	$HEIGHT = $CFG->{height};
		98	$FULLSCREEN = 0;
		99
		100	init_screen;
		101
		102	$CONN = new conn
		103	host => $CFG->{host},
		104	port => $CFG->{port},
		105	user => $CFG->{user},
		106	pass => $CFG->{password};
		107	}
		108
		109	sub stop_game {
		110	remove Glib::Source $SDL_TIMER;
		111
		112	undef $SDL_APP;
		113	SDL::Quit;
		114	}
		115
		116
		117	sub force_refresh {
		118	glViewport 0, 0, $WIDTH, $HEIGHT;
		119	glClear GL_COLOR_BUFFER_BIT;
		120
		121	$_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS;
		122
		123	SDL::GLSwapBuffers;
		124	}
		125
		126	my $refresh_handler;
59		127
60	sub refresh {	128	sub refresh {
61	glClearColor 0, 0, 0, 0;	129	$refresh_handler \|\|= add Glib::Idle sub {
62	glClear GL_COLOR_BUFFER_BIT;	130	force_refresh;
		131	undef $refresh_handler;
		132	0
		133	};
		134	}
63		135
64	my $map = $conn->{map};	136	%SDL_CB = (
65		137	SDL_QUIT() => sub {
66	for my $x (0 .. $conn->{mapw} - 1) {	138	main_quit Gtk2;
67	for my $y (0 .. $conn->{maph} - 1) {	139	},
68		140	SDL_VIDEORESIZE() => sub {
69	my $cell = $map->[$x][$y]	141	},
70	or next;	142	SDL_VIDEOEXPOSE() => sub {
71		143	refresh;
72	my $darkness = $cell->[3] * (1 / 255);	144	},
73	my $darkness = 0.8 + 0.2*rand;	145	SDL_KEYDOWN() => sub {
74	glColor $darkness, $darkness, $darkness;	146	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
75		147	# alt-enter
76	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {	148	$FULLSCREEN = !$FULLSCREEN;
77	my $tex = $conn->{face}[$num]{texture} \|\| 0;	149	init_screen;
78		150	} else {
79	glBindTexture GL_TEXTURE_2D, $tex;	151	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
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	}
88	}	152	}
89	}	153	},
90		154	SDL_KEYUP() => sub {
91	SDL::GLSwapBuffers;	155	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
92	}	156	},
93		157	SDL_MOUSEMOTION() => sub {
94	my $ev = new SDL::Event;	158	warn "sdl motion\n";#d#
95	my %ev_cb;	159	},
96		160	SDL_MOUSEBUTTONDOWN() => sub {
97	sub event(&$) {	161	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
98	$ev_cb{$_[0]->()} = $_[1];	162	},
99	}	163	SDL_MOUSEBUTTONUP() => sub {
100		164	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
101	sub does(&) { shift }	165	},
102		166	SDL_ACTIVEEVENT() => sub {
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;
113	};
114
115	event {SDL_KEYDOWN} does {
116	print "keypress\n";
117	};
118
119	event {SDL_KEYUP} does {
120	print "keyup\n";#d#
121	};
122
123	event {SDL_MOUSEMOTION} does {
124	print "motion\n";
125	};
126
127	event {SDL_MOUSEBUTTONDOWN} does {
128	print "button\n";
129	};
130
131	event {SDL_MOUSEBUTTONUP} does {
132	print "buttup\n";
133	};
134
135	event {SDL_ACTIVEEVENT} does {
136	print "active\n";	167	warn "active\n";#d#
137	};	168	},
138		169	);
139	package Crossfire::Client;
140		170
141	@conn::ISA = Crossfire::Protocol::;	171	@conn::ISA = Crossfire::Protocol::;
142		172
143	sub conn::map_update {	173	sub conn::map_update {
144	my ($self, $dirty) = @_;	174	my ($self, $dirty) = @_;
156	my ($self) = @_;	186	my ($self) = @_;
157		187
158	refresh;	188	refresh;
159	}	189	}
160		190
		191	sub conn::face_find {
		192	my ($self, $face) = @_;
		193
		194	$FACECACHE->{"$face->{chksum},$face->{name}"}
		195	}
		196
161	sub conn::face_update {	197	sub conn::face_update {
162	my ($self, $num, $face) = @_;	198	my ($self, $face) = @_;
163		199
164	warn "up face $self,$num,$face\n";#d#	200	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
165	use Gtk2;
166		201
167	my $pb = new Gtk2::Gdk::PixbufLoader;	202	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
168	$pb->write ($face->{image});	203	}
169	$pb->close;
170		204
171	$pb = $pb->get_pixbuf;	205	sub gtk_add_cfg_field {
172	$pb = $pb->add_alpha (0, 0, 0, 0);	206	my ($tbl, $cfg, $klbl, $key, $value) = @_;
		207	my $i = $cfg->{_i}++;
		208	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
		209	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
		210	if ($key eq 'password') {
		211	$ent->set_invisible_char ("*");
		212	$ent->set (visibility => 0)
		213	}
		214	$ent->set_text ($value);
		215	$ent->signal_connect (changed => sub {
		216	my ($ent) = @_;
		217	$cfg->{$key} = $ent->get_text;
		218	});
		219	}
173		220
174	glGetError();	221	sub run_config_dialog {
175	my ($tex) = @{glGenTextures 1};	222	my (%events) = @_;
176		223
177	$face->{texture} = $tex;	224	my $w = Gtk2::Window->new;
		225
		226	my @cfg = (
		227	[qw/Host host/],
		228	[qw/Port port/],
		229	[qw/Username user/],
		230	[qw/Password password/],
178		231	);
179	glBindTexture GL_TEXTURE_2D, $tex;	232
180	my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;	233	my $cfg = {};
		234
		235	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
		236	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
		237
		238	$w->add (my $vb = Gtk2::VBox->new);
		239	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
		240	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
		241	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
		242	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
		243	my $i = 0;
		244	my $act = 0;
		245	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
		246	if ($_ eq $selmode) { $act = $i }
		247	$cb->append_text ($_);
		248	$i++;
		249	}
		250	$cb->set_active ($act);
		251	$cb->signal_connect (changed => sub {
		252	my ($cb) = @_;
		253	my $txt = $cb->get_active_text;
		254	if ($txt =~ m/(\d+)x(\d+)/) {
		255	$::CFG->{width} = $1;
		256	$::CFG->{height} = $2;
181		257	}
182	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;	258	});
183	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;	259
184	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	260	$cfg->{_i} = 1;
185	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	261	for (@cfg) {
186		262	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
187	glTexImage2D GL_TEXTURE_2D, 0,	263	}
188	GL_RGBA8,	264
189	$pb->get_width, $pb->get_height,	265	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
		266	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
		267	$cb->signal_connect (clicked => sub {
		268	for (keys %$cfg) {
		269	$::CFG->{$_} = $cfg->{$_}
		270	if $_ ne '_i';
190	0,	271	}
		272	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
		273	});
		274	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
		275	$cb->signal_connect (clicked => sub {
		276	for (keys %$cfg) {
		277	$::CFG->{$_} = $cfg->{$_}
		278	if $_ ne '_i';
191	GL_RGBA,	279	}
192	GL_UNSIGNED_BYTE,	280	my $cb = $events{login} \|\| sub {};
193	$pb->get_pixels;	281	$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;	282	});
		283	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
		284	$cb->signal_connect (clicked => sub {
		285	my $cb = $events{login} \|\| sub {};
		286	$cb->();
		287	});
		288	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
		289	$cb->signal_connect (clicked => sub { $w->destroy });
		290
		291	$w->show_all;
		292
		293	$w->signal_connect (destroy => sub { Gtk2->main_quit });
195	}	294	}
		295
196		296
197	#############################################################################	297	#############################################################################
198		298
199	use Event;	299	SDL::Init SDL_INIT_EVERYTHING;
		300	SDL::TTFInit;
200		301
		302	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
		303
		304	$mapwidget->activate;
		305	$mapwidget->focus_in;
		306
201	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	307	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
202		308
203		309	$CFG \|\|= {
204	if ($ARGV[0] eq 'config') {	310	width => 640,
205	Client::Util::run_config_dialog;	311	height => 480,
206	}	312	fullscreen => 0,
207
208	glinit;
209
210	$conn = new conn
211	host => "cf.schmorp.de",	313	host => "crossfire.schmorp.de",
212	port => 13327;	314	port => 13327,
213
214	Event->timer (after => 0, interval => 1/20, hard => 1, cb => sub {
215	while ($ev->poll) {
216	($ev_cb{$ev->type} \|\| sub { warn "unhandled event ", $ev->type })->();
217	}
218	});	315	};
219		316
220	Event::loop;	317	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
221		318
		319	run_config_dialog
		320	login => sub { start_game },
		321	logout => sub { stop_game };
		322
		323	main Gtk2;
		324
		325	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.12 by elmex, Fri Apr 7 16:29:19 2006 UTC vs. Revision 1.31 by elmex, Sat Apr 8 16:34:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.12 by elmex, Fri Apr 7 16:29:19 2006 UTC vs.
Revision 1.31 by elmex, Sat Apr 8 16:34:47 2006 UTC