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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.21 by root, Fri Apr 7 20:08:57 2006 UTC vs.
Revision 1.37 by root, Sat Apr 8 22:25:37 2006 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
2	use strict;	3	use strict;
		4	use utf8;
3		5
4	use Glib;	6	use Glib;
5	use Gtk2 -init;	7	use Gtk2 -init;
6		8
7	use SDL;	9	use SDL;
13		15
14	use Crossfire;	16	use Crossfire;
15	use Crossfire::Client;	17	use Crossfire::Client;
16	use Crossfire::Protocol;	18	use Crossfire::Protocol;
17		19
18	use Crossfire::Client::Util;
19	use Crossfire::Client::Widget;	20	use Crossfire::Client::Widget;
20		21
21	our $FACECACHE;	22	our $FACECACHE;
22		23
23	our $VERSION = '0.1';	24	our $VERSION = '0.1';
		25
		26	our %GL_EXT;
24		27
25	our $CFG;	28	our $CFG;
26	our $CONN;	29	our $CONN;
		30
		31	our $WIDTH;
		32	our $HEIGHT;
		33	our $FULLSCREEN;
		34
		35	our $UIFONT;
27		36
28	our $SDL_TIMER;	37	our $SDL_TIMER;
29	our $SDL_APP;	38	our $SDL_APP;
30	our $SDL_EV = new SDL::Event;	39	our $SDL_EV = new SDL::Event;
31	our %SDL_CB;	40	our %SDL_CB;
32		41
33	our @GL_INIT; # hooks called on every gl init	42	our @GL_INIT; # hooks called on every gl init
34		43
		44	our $ALT_ENTER_MESSAGE;
		45
		46	our $tw; # Test widget #d#
		47
35	sub init_screen {	48	sub init_screen {
36	$SDL_APP = new SDL::App	49	$SDL_APP = new SDL::App
37	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	50	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
38	-title => "Crossfire+ Client",	51	-title => "Crossfire+ Client",
39	-width => $CFG->{width},	52	-width => $WIDTH,
40	-height => $CFG->{height},	53	-height => $HEIGHT,
41	-opengl => 1,	54	-opengl => 1,
42	-red_size => 8,	55	-red_size => 8,
43	-green_size => 8,	56	-green_size => 8,
44	-blue_size => 8,	57	-blue_size => 8,
45	-double_buffer => 1,	58	-double_buffer => 1,
46	-fullscreen => $CFG->{fullscreen},	59	-fullscreen => $FULLSCREEN,
47	-resizeable => 0;	60	-resizeable => 0;
48		61
		62	%GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
		63
		64	$GL_EXT{GL_ARB_texture_non_power_of_two}
		65	or warn "WARNING: non-power-of-two opengl extension required";
		66
		67	$UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $HEIGHT / 40
		68	or die "TTFOpenFont: $!";
		69
		70	$ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Alt-Enter toggles fullscreen mode";
		71	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
		72	$ALT_ENTER_MESSAGE->activate;
		73
		74	# Test code #d#
		75	my $frm = new Crossfire::Client::Widget::Frame;
		76	$tw = new Crossfire::Client::Widget::Window;
		77	$frm->add (new Crossfire::Client::Widget::Label 0, 0, 10, $UIFONT, "Foo in the garden!");
		78	$tw->add ($frm);
		79
		80	$tw->move (0, $HEIGHT - 120);
		81	$tw->activate;
		82	# Test code end #d#
		83
49	glClearColor 0, 0, 0, 0;	84	glClearColor 0, 0, 0, 0;
50		85
51	glEnable GL_TEXTURE_2D;	86	glEnable GL_TEXTURE_2D;
52	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	87	glEnable GL_COLOR_MATERIAL;
53	glShadeModel GL_FLAT;	88	glShadeModel GL_FLAT;
54	glDisable GL_DEPTH_TEST;	89	glDisable GL_DEPTH_TEST;
55	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	90	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
56	glEnable GL_BLEND;	91
		92	$_->() for @GL_INIT;
		93	}
		94
		95	sub start_game {
		96	$SDL_TIMER = add Glib::Timeout 1000/100, sub {
		97	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		98	while $SDL_EV->poll;
		99
		100	1
		101	};
		102
		103	$WIDTH = $CFG->{width};
		104	$HEIGHT = $CFG->{height};
		105	$FULLSCREEN = 0;
		106
		107	init_screen;
		108
		109	$CONN = new conn
		110	host => $CFG->{host},
		111	port => $CFG->{port},
		112	user => $CFG->{user},
		113	pass => $CFG->{password},
		114	mapw => 50,
		115	maph => 37,
		116	;
		117	}
		118
		119	sub stop_game {
		120	remove Glib::Source $SDL_TIMER;
		121
		122	undef $SDL_APP;
		123	SDL::Quit;
		124	}
		125
		126
		127	sub force_refresh {
		128	glViewport 0, 0, $WIDTH, $HEIGHT;
57		129
58	glMatrixMode GL_PROJECTION;	130	glMatrixMode GL_PROJECTION;
59	glLoadIdentity;	131	glLoadIdentity;
60	glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -100 , 100;	132	glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;
61
62	glMatrixMode GL_MODELVIEW;	133	glMatrixMode GL_MODELVIEW;
63		134
64	$_->() for @GL_INIT;	135	glClear GL_COLOR_BUFFER_BIT;
65	}
66		136
67	sub start_game {	137	$_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS;
68	$SDL_TIMER = add Glib::Timeout 1000/20, sub {	138
69	while ($SDL_EV->poll) {	139	SDL::GLSwapBuffers;
70	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();	140	}
		141
		142	my $refresh_handler;
		143
		144	sub refresh {
		145	$refresh_handler \|\|= add Glib::Idle sub {
		146	force_refresh;
		147	undef $refresh_handler;
71	}	148	0
72
73	1
74	};	149	};
75
76	init_screen;
77
78	$CONN = new conn
79	host => $CFG->{host},
80	port => $CFG->{port};
81	}
82
83	sub stop_game {
84	remove Glib::Source $SDL_TIMER;
85
86	undef $SDL_APP;
87	SDL::Quit;
88	}
89
90	sub refresh {
91	glClear GL_COLOR_BUFFER_BIT;
92
93	for (values %Client::Widget::ACTIVE_WIDGETS) {
94	$_->draw
95	}
96
97	SDL::GLSwapBuffers;
98	}	150	}
99		151
100	%SDL_CB = (	152	%SDL_CB = (
101	SDL_QUIT() => sub {	153	SDL_QUIT() => sub {
102	main_quit Gtk2;	154	main_quit Gtk2;
…		…
107	refresh;	159	refresh;
108	},	160	},
109	SDL_KEYDOWN() => sub {	161	SDL_KEYDOWN() => sub {
110	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	162	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
111	# alt-enter	163	# alt-enter
112	$CFG->{fullscreen} = !$CFG->{fullscreen};	164	$FULLSCREEN = !$FULLSCREEN;
113	init_screen;	165	init_screen;
114	} else {	166	} else {
115	Client::Widget::feed_sdl_key_down_event ($SDL_EV);	167	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
116	}	168	}
117	},	169	},
118	SDL_KEYUP() => sub {	170	SDL_KEYUP() => sub {
119	Client::Widget::feed_sdl_key_up_event ($SDL_EV);	171	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
120	},	172	},
121	SDL_MOUSEMOTION() => sub {	173	SDL_MOUSEMOTION() => sub {
122	warn "sdl motion\n";#d#	174	warn "sdl motion\n";#d#
123	},	175	},
124	SDL_MOUSEBUTTONDOWN() => sub {	176	SDL_MOUSEBUTTONDOWN() => sub {
125	Client::Widget::feed_sdl_button_down_event ($SDL_EV);	177	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
126	},	178	},
127	SDL_MOUSEBUTTONUP() => sub {	179	SDL_MOUSEBUTTONUP() => sub {
128	Client::Widget::feed_sdl_button_up_event ($SDL_EV);	180	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
129	},	181	},
130	SDL_ACTIVEEVENT() => sub {	182	SDL_ACTIVEEVENT() => sub {
131	warn "active\n";#d#	183	warn "active\n";#d#
132	},	184	},
133	);	185	);
…		…
164	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	216	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
165		217
166	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};	218	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
167	}	219	}
168		220
		221	sub conn::query {
		222	my ($self, $flags, $prompt) = @_;
		223
		224	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		225	}
		226
		227	sub gtk_add_cfg_field {
		228	my ($tbl, $cfg, $klbl, $key, $value) = @_;
		229	my $i = $cfg->{_i}++;
		230	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
		231	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
		232	if ($key eq 'password') {
		233	$ent->set_invisible_char ("*");
		234	$ent->set (visibility => 0)
		235	}
		236	$ent->set_text ($value);
		237	$ent->signal_connect (changed => sub {
		238	my ($ent) = @_;
		239	$cfg->{$key} = $ent->get_text;
		240	});
		241	}
		242
		243	sub run_config_dialog {
		244	my (%events) = @_;
		245
		246	my $w = Gtk2::Window->new;
		247
		248	my @cfg = (
		249	[qw/Host host/],
		250	[qw/Port port/],
		251	[qw/Username user/],
		252	[qw/Password password/],
		253	);
		254
		255	my $cfg = {};
		256
		257	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
		258	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
		259
		260	$w->add (my $vb = Gtk2::VBox->new);
		261	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
		262	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
		263	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
		264	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
		265	my $i = 0;
		266	my $act = 0;
		267	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
		268	if ($_ eq $selmode) { $act = $i }
		269	$cb->append_text ($_);
		270	$i++;
		271	}
		272	$cb->set_active ($act);
		273	$cb->signal_connect (changed => sub {
		274	my ($cb) = @_;
		275	my $txt = $cb->get_active_text;
		276	if ($txt =~ m/(\d+)x(\d+)/) {
		277	$::CFG->{width} = $1;
		278	$::CFG->{height} = $2;
		279	}
		280	});
		281
		282	$cfg->{_i} = 1;
		283	for (@cfg) {
		284	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
		285	}
		286
		287	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
		288	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
		289	$cb->signal_connect (clicked => sub {
		290	for (keys %$cfg) {
		291	$::CFG->{$_} = $cfg->{$_}
		292	if $_ ne '_i';
		293	}
		294	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
		295	});
		296	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
		297	$cb->signal_connect (clicked => sub {
		298	for (keys %$cfg) {
		299	$::CFG->{$_} = $cfg->{$_}
		300	if $_ ne '_i';
		301	}
		302	my $cb = $events{login} \|\| sub {};
		303	$cb->($::CFG->{user}, $::CFG->{password});
		304	});
		305	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
		306	$cb->signal_connect (clicked => sub {
		307	my $cb = $events{login} \|\| sub {};
		308	$cb->();
		309	});
		310	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
		311	$cb->signal_connect (clicked => sub { $w->destroy });
		312
		313	$w->show_all;
		314
		315	$w->signal_connect (destroy => sub { Gtk2->main_quit });
		316	}
		317
		318
169	#############################################################################	319	#############################################################################
170		320
171	SDL::Init(SDL_INIT_EVERYTHING());	321	SDL::Init SDL_INIT_EVERYTHING;
		322	SDL::TTFInit;
172		323
173	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;	324	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
174
175	#find_rcfile "uifont.ttf";
176		325
177	$mapwidget->activate;	326	$mapwidget->activate;
178	$mapwidget->focus_in;	327	$mapwidget->focus_in;
179		328
180	read_cfg "$Crossfire::VARDIR/pclientrc";	329	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
181
182	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
183		330
184	$CFG \|\|= {	331	$CFG \|\|= {
185	width => 640,	332	width => 640,
186	height => 480,	333	height => 480,
187	fullscreen => 0,	334	fullscreen => 0,
188	host => "crossfire.schmorp.de",	335	host => "crossfire.schmorp.de",
189	port => 13327,	336	port => 13327,
190	};	337	};
191		338
192	Crossfire::Client::Util::run_config_dialog	339	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
		340
		341	run_config_dialog
193	login => sub { start_game },	342	login => sub { start_game },
194	logout => sub { stop_game };	343	logout => sub { stop_game };
195		344
196	main Gtk2;	345	main Gtk2;
197		346

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.21 by root, Fri Apr 7 20:08:57 2006 UTC vs. Revision 1.37 by root, Sat Apr 8 22:25:37 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.21 by root, Fri Apr 7 20:08:57 2006 UTC vs.
Revision 1.37 by root, Sat Apr 8 22:25:37 2006 UTC