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

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

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.4 by root, Thu Apr 6 20:34:15 2006 UTC vs.
Revision 1.42 by root, Sun Apr 9 01:35:40 2006 UTC