[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.16 by root, Fri Apr 7 23:16:29 2006 UTC vs.
Revision 1.34 by elmex, Sun Apr 9 02:44:51 2006 UTC

…		…
1	package Crossfire::Client::Widget;	1	package Crossfire::Client::Widget;
2		2
3	use strict;	3	use strict;
		4
		5	use Scalar::Util;
		6
4	use SDL::OpenGL;	7	use SDL::OpenGL;
5	use SDL::OpenGL::Constants;	8	use SDL::OpenGL::Constants;
6		9
7	our $FOCUS; # the widget with current focus	10	our $FOCUS; # the widget with current focus
8	our @ACTIVE_WIDGETS;	11	#our @ACTIVE_WIDGETS;
9		12
10	# class methods for events	13	# class methods for events
11	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }	14	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
12	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }	15	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
13	sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS }	16	sub feed_sdl_button_down_event { }
14	sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS }	17	sub feed_sdl_button_up_event { }
15		18
16	sub new {	19	sub new {
17	my $class = shift;	20	my $class = shift;
18		21
19	bless { @_ }, $class	22	bless { @_ }, $class
20	}	23	}
21		24
22	sub activate {	25	#sub activate {
23	push @ACTIVE_WIDGETS, $_[0];	26	# push @ACTIVE_WIDGETS, $_[0];
24	}	27	# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
		28	#}
25		29
26	sub deactivate {	30	#sub deactivate {
27	@ACTIVE_WIDGETS =	31	# @ACTIVE_WIDGETS =
28	sort { $a->{z} <=> $b->{z} }	32	# sort { $a->{z} <=> $b->{z} }
29	grep { $_ != $_[0] }	33	# grep { $_ && $_ != $_[0] }
30	@ACTIVE_WIDGETS;	34	# @ACTIVE_WIDGETS;
		35	#}
		36
		37	sub move {
		38	my ($self, $x, $y, $z) = @_;
		39	$self->{x} = $x;
		40	$self->{y} = $y;
		41	$self->{z} = $z if defined $z;
		42	}
		43
		44	sub needs_redraw {
		45	0
31	}	46	}
32		47
33	sub size_request {	48	sub size_request {
34	die "size_request is abtract";	49	die "size_request is abtract";
35	}	50	}
77	sub _draw {	92	sub _draw {
78	my ($widget) = @_;	93	my ($widget) = @_;
79	}	94	}
80		95
81	sub bbox {	96	sub bbox {
82	my ($widget) = @_;	97	my ($self) = @_;
		98	my ($w, $h) = $self->size_request;
		99	(
		100	$self->{x},
		101	$self->{y},
		102	$self->{x} = $w,
		103	$self->{y} = $h
		104	)
		105	}
		106
		107	sub del_parent { $_[0]->{parent} = undef }
		108
		109	sub set_parent {
		110	my ($self, $par) = @_;
		111
		112	$self->{parent} = $par;
		113	Scalar::Util::weaken $self->{parent};
		114	}
		115
		116	sub get_parent {
		117	$_[0]->{parent}
		118	}
		119
		120	sub update {
		121	my ($self) = @_;
		122
		123	$self->{parent}->update
		124	if $self->{parent};
		125	}
		126
		127	sub DESTROY {
		128	my ($self) = @_;
		129
		130	#$self->deactivate;
83	}	131	}
84		132
85	package Crossfire::Client::Widget::Container;	133	package Crossfire::Client::Widget::Container;
86		134
87	our @ISA = Crossfire::Client::Widget::;	135	our @ISA = Crossfire::Client::Widget::;
88		136
89	use SDL::OpenGL;	137	use SDL::OpenGL;
90		138
91	sub add { $_[0]->{child} = $_[1] }	139	sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
92	sub get { $_[0]->{child} }	140	sub get { $_[0]->{child} }
		141	sub remove {
		142	my ($self, $chld) = @_;
		143	delete $self->{child}
		144	if $self->{child} == $chld;
		145	}
93		146
94	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	147	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
95		148
96	sub _draw { die "Containers can't be drawn!" }	149	sub _draw { die "Containers can't be drawn!" }
97		150
98	package Crossfire::Client::Widget::Frame;	151	package Crossfire::Client::Widget::Toplevel;
		152
		153	our @ISA = Crossfire::Client::Widget::;
		154
		155	use SDL::OpenGL;
		156
		157	sub add {
		158	my ($self, $chld) = @_;
		159
		160	push @{$self->{childs}}, $chld;
		161	@{$self->{childs}} =
		162	sort { $a->{z} <=> $b->{z} }
		163	@{$self->{childs}};
		164
		165	$chld->set_parent ($self);
		166	}
		167
		168	sub remove {
		169	my ($self, $chld) = @_;
		170	@{$self->{childs}} =
		171	sort { $a->{z} <=> $b->{z} }
		172	grep { $_ && $_ != $_[0] }
		173	@{$self->{childs}}
		174	}
		175
		176	sub update {
		177	my ($self) = @_;
		178	::refresh ();
		179	}
		180
		181	sub _draw {
		182	my ($self) = @_;
		183
		184	$_->draw for @{$self->{childs}};
		185	}
		186
		187	package Crossfire::Client::Widget::Window;
99		188
100	our @ISA = Crossfire::Client::Widget::Container::;	189	our @ISA = Crossfire::Client::Widget::Container::;
101		190
102	use SDL::OpenGL;	191	use SDL::OpenGL;
		192
		193	sub add {
		194	my ($self, $chld) = @_;
		195	$self->SUPER::add ($chld);
		196	$chld->set_parent ($self);
		197	$self->update; #TODO: Move this to the size_request event propably?
		198	}
		199
		200	sub remove {
		201	my ($self) = @_;
		202	# TODO FIXME: removing a child from a window will crash, see render_chld
		203	$self->update;
		204	}
		205
		206	sub update {
		207	my ($self) = @_;
		208	$self->render_chld;
		209	}
		210
		211	sub render_chld {
		212	my ($self) = @_;
		213	my $chld = $self->get;
		214	my ($w, $h) = $self->size_request;
		215
		216	$self->{texture} =
		217	Crossfire::Client::Texture->new_from_opengl (
		218	$w, $h, sub { $chld->draw }
		219	);
		220	$self->{texture}->upload;
		221	}
103		222
104	sub size_request {	223	sub size_request {
105	my ($self) = @_;	224	my ($self) = @_;
106	my $chld = $self->get	225	my $chld = $self->get
107	or return (0, 0);	226	or return (0, 0);
		227	$chld->size_request
		228	}
		229
		230	sub _draw {
		231	my ($self) = @_;
		232
		233	my ($w, $h) = $self->size_request;#TODO# use width/height of texture
		234
		235	my $tex = $self->{texture}
		236	or return;
		237
		238	glEnable GL_BLEND;
		239	glEnable GL_TEXTURE_2D;
		240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		241	glBindTexture GL_TEXTURE_2D, $tex->{name};
		242
		243	glColor 1, 0, 1;
		244
		245	glBegin GL_QUADS;
		246	glTexCoord 0, 0; glVertex 0, 0;
		247	glTexCoord 0, 1; glVertex 0, $h;
		248	glTexCoord 1, 1; glVertex $w, $h;
		249	glTexCoord 1, 0; glVertex $w, 0;
		250	glEnd;
		251
		252	glDisable GL_BLEND;
		253	glDisable GL_TEXTURE_2D;
		254	}
		255
		256	package Crossfire::Client::Widget::Frame;
		257
		258	our @ISA = Crossfire::Client::Widget::Container::;
		259
		260	use SDL::OpenGL;
		261
		262	sub size_request {
		263	my ($self) = @_;
		264	my $chld = $self->get
		265	or return (0, 0);
		266
		267	$chld->move (2, 2);
		268
108	map { $_ + 4 } $chld->size_request;	269	map { $_ + 4 } $chld->size_request;
109	}	270	}
110		271
111	sub _draw {	272	sub _draw {
112	my ($self) = @_;	273	my ($self) = @_;
113		274
114	my $chld = $self->get;	275	my $chld = $self->get;
115		276
116	my ($w, $h) = $chld->size_request;	277	my ($w, $h) = $chld->size_request;
117		278
118	glColor 1, 0, 0;
119	glBegin GL_QUADS;	279	glBegin GL_QUADS;
		280	glColor 0, 0, 0;
120	glTexCoord 0, 0; glVertex 0 , 0;	281	glTexCoord 0, 0; glVertex 0 , 0;
121	glTexCoord 0, 1; glVertex 0 , $h + 4;	282	glTexCoord 0, 1; glVertex 0 , $h + 4;
122	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	283	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
123	glTexCoord 1, 0; glVertex $w + 4 , 0;	284	glTexCoord 1, 0; glVertex $w + 4 , 0;
124	glEnd;	285	glEnd;
125		286
126	glPushMatrix;
127	glTranslate (2, 2, 0);
128	$chld->_draw;	287	$chld->draw;
129	glPopMatrix;	288	}
		289
		290	package Crossfire::Client::Widget::FancyFrame;
		291
		292	our @ISA = Crossfire::Client::Widget::Frame::;
		293
		294	use SDL::OpenGL;
		295
		296	sub new {
		297	my ($self, $theme) = @_;
		298	$self = $self->SUPER::new;
		299
		300	$self->{txts} = [
		301	map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
		302	qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
		303	];
		304	$self
		305
		306	}
		307
		308	sub size_request {
		309	my ($self) = @_;
		310	my ($w, $h) = $self->get->size_request;
		311
		312	$h += $self->{txts}->[1]->{height};
		313	$h += $self->{txts}->[4]->{height};
		314	$w += $self->{txts}->[2]->{width};
		315	$w += $self->{txts}->[3]->{width};
		316
		317	$self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
		318
		319	($w, $h)
		320	}
		321
		322	sub _draw {
		323	my ($self) = @_;
		324
		325	my ($w, $h) = $self->size_request;
		326	my ($cw, $ch) = $self->get->size_request;
		327
		328	glEnable GL_BLEND;
		329	glEnable GL_TEXTURE_2D;
		330	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		331	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		332
		333
		334	my $top = $self->{txts}->[1];
		335	glBindTexture GL_TEXTURE_2D, $top->{name};
		336
		337	glColor 1, 1, 1, 0.8;
		338
		339	glBegin GL_QUADS;
		340	glTexCoord 0, 0; glVertex 0 , 0;
		341	glTexCoord 0, 1; glVertex 0 , $top->{height};
		342	glTexCoord 1, 1; glVertex $w , $top->{height};
		343	glTexCoord 1, 0; glVertex $w , 0;
		344	glEnd;
		345
		346	my $left = $self->{txts}->[3];
		347	glBindTexture GL_TEXTURE_2D, $left->{name};
		348
		349	glColor 1, 1, 1, 0.8;
		350
		351	glBegin GL_QUADS;
		352	glTexCoord 0, 0; glVertex 0 , $top->{height};
		353	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
		354	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
		355	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
		356	glEnd;
		357
		358	my $right = $self->{txts}->[2];
		359	glBindTexture GL_TEXTURE_2D, $right->{name};
		360
		361	glColor 1, 1, 1, 0.8;
		362
		363	glBegin GL_QUADS;
		364	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
		365	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
		366	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
		367	glTexCoord 1, 0; glVertex $w , $top->{height};
		368	glEnd;
		369
		370	my $bottom = $self->{txts}->[4];
		371	glBindTexture GL_TEXTURE_2D, $bottom->{name};
		372
		373	glColor 1, 1, 1, 0.8;
		374
		375	glBegin GL_QUADS;
		376	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
		377	glTexCoord 0, 1; glVertex 0 , $h;
		378	glTexCoord 1, 1; glVertex $w , $h;
		379	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
		380	glEnd;
		381
		382	my $bg = $self->{txts}->[0];
		383	glBindTexture GL_TEXTURE_2D, $bg->{name};
		384	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
		385	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
		386
		387	glColor 1, 1, 1, 0.8;
		388
		389	my $rep_x = $cw / $bg->{width};
		390	my $rep_y = $ch / $bg->{height};
		391
		392	glBegin GL_QUADS;
		393	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
		394	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
		395	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
		396	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
		397	glEnd;
		398
		399	$self->get->draw;
		400
		401	glDisable GL_BLEND;
		402	glDisable GL_TEXTURE_2D;
130	}	403	}
131		404
132	package Crossfire::Client::Widget::Table;	405	package Crossfire::Client::Widget::Table;
133		406
134	our @ISA = Crossfire::Client::Widget::Container::;	407	our @ISA = Crossfire::Client::Widget::Container::;
135		408
136	use SDL::OpenGL;	409	use SDL::OpenGL;
137		410
138	sub add {	411	sub add {
139	my ($self, $x, $y, $chld) = @_;	412	my ($self, $x, $y, $chld) = @_;
		413	my $old_chld = $self->{childs}[$y][$x];
		414
140	$self->{childs}[$y][$x] = $chld;	415	$self->{childs}[$y][$x] = $chld;
		416	$chld->set_parent ($self);
		417	$self->update;
141	}	418	}
142		419
143	sub max_row_height {	420	sub max_row_height {
144	my ($self, $row) = @_;	421	my ($self, $row) = @_;
145		422
146	my $hs = 0;	423	my $hs = 0;
147	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {	424	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {
148	my $c = $self->{childs}->[$row]->[$xi];	425	my $c = $self->{childs}->[$row]->[$xi];
		426	if ($c) {
149	my ($w, $h) = $c->size_request if $c;	427	my ($w, $h) = $c->size_request;
150	if ($hs < $h) { $hs = $h }	428	if ($hs < $h) { $hs = $h }
		429	}
151	}	430	}
152	return $hs;	431	return $hs;
153	}	432	}
154		433
155	sub max_col_width {	434	sub max_col_width {
156	my ($self, $col) = @_;	435	my ($self, $col) = @_;
157		436
158	my $ws = 0;	437	my $ws = 0;
159	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {	438	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {
160	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];	439	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];
		440	if ($c) {
161	my ($w, $h) = $c->size_request if $c;	441	my ($w, $h) = $c->size_request;
162	if ($ws < $w) { $ws = $w }	442	if ($ws < $w) { $ws = $w }
		443	}
163	}	444	}
164	return $ws;	445	return $ws;
165	}	446	}
166		447
167	sub size_request {	448	sub size_request {
…		…
191	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	472	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
192	my $x = 0;	473	my $x = 0;
193		474
194	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	475	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
195		476
196	glPushMatrix;
197	glTranslate ($x, $y, 0);
198	my $c = $self->{childs}->[$yi]->[$xi];	477	my $c = $self->{childs}->[$yi]->[$xi];
		478	if ($c) {
		479	$c->move ($x, $y, 0); #TODO: Move to size_request
199	$c->_draw if $c;	480	$c->draw if $c;
200	glPopMatrix;	481	}
201		482
202	$x += $self->max_col_width ($xi);	483	$x += $self->max_col_width ($xi);
203	}	484	}
204		485
205	$y += $self->max_row_height ($yi);	486	$y += $self->max_row_height ($yi);
…		…
213	use SDL::OpenGL;	494	use SDL::OpenGL;
214		495
215	sub add {	496	sub add {
216	my ($self, $chld) = @_;	497	my ($self, $chld) = @_;
217	push @{$self->{childs}}, $chld;	498	push @{$self->{childs}}, $chld;
		499	$chld->set_parent ($self);
		500	$self->update;
218	}	501	}
219		502
220	sub size_request {	503	sub size_request {
221	my ($self) = @_;	504	my ($self) = @_;
222		505
…		…
233	sub _draw {	516	sub _draw {
234	my ($self) = @_;	517	my ($self) = @_;
235		518
236	my ($x, $y);	519	my ($x, $y);
237	for (@{$self->{childs} \|\| []}) {	520	for (@{$self->{childs} \|\| []}) {
238	glPushMatrix;	521	$_->move (0, $y, 0); #TODO: move to size_request
239	glTranslate (0, $y, 0);
240	$_->_draw;	522	$_->draw;
241	glPopMatrix;
242	my ($w, $h) = $_->size_request;	523	my ($w, $h) = $_->size_request;
243	$y += $h;	524	$y += $h;
244	}	525	}
245	}	526	}
246		527
…		…
249	our @ISA = Crossfire::Client::Widget::;	530	our @ISA = Crossfire::Client::Widget::;
250		531
251	use SDL::OpenGL;	532	use SDL::OpenGL;
252		533
253	sub new {	534	sub new {
254	my ($class, $x, $y, $z, $ttf, $text) = @_;	535	my ($class, $x, $y, $z, $height, $text) = @_;
255		536
		537	# TODO: color, and make height, xyz etc. optional
256	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf);	538	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
257		539
258	$self->set_text ($text);	540	$self->set_text ($text);
259		541
260	$self	542	$self
261	}	543	}
262		544
263	sub set_text {	545	sub set_text {
264	my ($self, $text) = @_;	546	my ($self, $text) = @_;
		547
		548	$self->{text} = $text;
265	$self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text;	549	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
		550
		551	$self->update;
266	}	552	}
267		553
268	sub get_text {	554	sub get_text {
269	my ($self, $text) = @_;	555	my ($self, $text) = @_;
		556
270	$self->{text}	557	$self->{text}
271	}	558	}
272		559
273	sub size_request {	560	sub size_request {
274	my ($self) = @_;	561	my ($self) = @_;
…		…
282	sub _draw {	569	sub _draw {
283	my ($self) = @_;	570	my ($self) = @_;
284		571
285	my $tex = $self->{texture};	572	my $tex = $self->{texture};
286		573
287	$self->{x}--;
288
289	glEnable GL_BLEND;	574	glEnable GL_BLEND;
290	glEnable GL_TEXTURE_2D;	575	glEnable GL_TEXTURE_2D;
		576	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
291	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	577	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
292	glBindTexture GL_TEXTURE_2D, $tex->{name};	578	glBindTexture GL_TEXTURE_2D, $tex->{name};
293		579
294	glColor 1, 1, 1;	580	glColor 1, 1, 1, 0.6; # TODO color
295		581
296	glBegin GL_QUADS;	582	glBegin GL_QUADS;
297	glTexCoord 0, 0; glVertex 0 , 0;	583	glTexCoord 0, 0; glVertex 0 , 0;
298	glTexCoord 0, 1; glVertex 0 , $tex->{height};	584	glTexCoord 0, 1; glVertex 0 , $tex->{height};
299	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	585	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
…		…
302		588
303	glDisable GL_BLEND;	589	glDisable GL_BLEND;
304	glDisable GL_TEXTURE_2D;	590	glDisable GL_TEXTURE_2D;
305	}	591	}
306		592
		593	package Crossfire::Client::Widget::TextEntry;
		594
		595	our @ISA = Crossfire::Client::Widget::Label::;
		596
		597	use SDL;
		598	use SDL::OpenGL;
		599
		600	sub key_down {
		601	my ($self, $ev) = @_;
		602
		603	my $mod = $ev->key_mod;
		604	my $sym = $ev->key_sym;
		605
		606	$ev->set_unicode (1);
		607	my $uni = $ev->key_unicode;
		608
		609	my $text = $self->get_text;
		610
		611	if ($sym == SDLK_BACKSPACE) {
		612	substr $text, -1, 1, '';
		613
		614	} elsif ($uni) {
		615	$text .= chr $uni;
		616	}
		617	$self->set_text ($text);
		618	}
		619
		620
		621	# XXX: TextView isn't neccessary with pango multiline text rendering
307	package Crossfire::Client::Widget::TextView;	622	package Crossfire::Client::Widget::TextView;
308		623
309	use strict;	624	use strict;
310		625
311	our @ISA = qw/Crossfire::Client::Widget/;	626	our @ISA = qw/Crossfire::Client::Widget/;
312		627
313	use SDL::OpenGL;	628	use SDL::OpenGL;
314	use SDL::OpenGL::Constants;	629	use SDL::OpenGL::Constants;
		630
		631	sub new {
		632	my ($class, $text, $h) = @_;
		633	my $self = $class->SUPER::new ();
		634
		635	$self->{txt_height} = $h;
		636	@{$self->{lines}} = split /\r?\n/, $text;
		637
		638	for (split /\r?\n/, $text) {
		639	$self->add_line ($_);
		640	}
		641	$self
		642	}
		643
		644	#sub render_lines {
		645	# my ($self) = @_;
		646	#
		647	# $self->{txt_lines} = [];
		648	#
		649	# for (@{$self->{lines}}) {
		650	# push @{$self->{txt_lines}},
		651	# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
		652	# }
		653	#}
315		654
316	sub add_line {	655	sub add_line {
317	my ($self, $line) = @_;	656	my ($self, $line) = @_;
318	push @{$self->{lines}}, $line;	657	push @{$self->{lines}}, $line;
319	}
320		658
		659	push @{$self->{txt_lines}},
		660	new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
		661	}
		662
		663	sub size_request {
		664	my ($self) = @_;
		665
		666	my $w = 0;
		667	my $h = 0;
		668
		669	for (@{$self->{txt_lines}}) {
		670	if ($w < $_->{width}) { $w = $_->{width} }
		671	$h += $_->{height};
		672	}
		673
		674	return ($w, $h);
		675	}
		676
321	sub _draw {	677	sub draw_line {
322	my ($self) = @_;	678	my ($self, $tex, $y) = @_;
323		679
		680	glBindTexture GL_TEXTURE_2D, $tex->{name};
		681
		682	glColor 1, 0, 1;
		683
		684	glBegin GL_QUADS;
		685	glTexCoord 0, 0; glVertex 0 , $y;
		686	glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
		687	glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
		688	glTexCoord 1, 0; glVertex $tex->{width}, $y;
		689	glEnd;
		690	}
		691
		692	sub _draw {
		693	my ($self) = @_;
		694
		695	glEnable GL_BLEND;
		696	glEnable GL_TEXTURE_2D;
		697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
		698
		699	my $l = 0;
		700	for (@{$self->{txt_lines}}) {
		701	$self->draw_line ($_, $l);
		702	$l += $_->{height};
		703	}
		704
		705	glDisable GL_BLEND;
		706	glDisable GL_TEXTURE_2D;
324	}	707	}
325		708
326	package Crossfire::Client::Widget::MapWidget;	709	package Crossfire::Client::Widget::MapWidget;
327		710
328	use strict;	711	use strict;
329		712
330	our @ISA = qw/Crossfire::Client::Widget/;	713	use List::Util qw(min max);
331		714
332	use SDL;	715	use SDL;
333	use SDL::OpenGL;	716	use SDL::OpenGL;
334	use SDL::OpenGL::Constants;	717	use SDL::OpenGL::Constants;
		718
		719	our @ISA = Crossfire::Client::Widget::;
335		720
336	sub key_down {	721	sub key_down {
337	print "MAPKEYDOWN\n";	722	print "MAPKEYDOWN\n";
338	}	723	}
339		724
340	sub key_up {	725	sub key_up {
341	}	726	}
342		727
343	sub _draw {	728	sub _draw {
		729	my ($self) = @_;
		730
		731	my $mx = $::CONN->{mapx};
		732	my $my = $::CONN->{mapy};
		733
		734	my $map = $::CONN->{map};
		735
		736	my ($xofs, $yofs);
		737
		738	my $sw = 1 + int $::WIDTH / 32;
		739	my $sh = 1 + int $::HEIGHT / 32;
		740
		741	if ($::CONN->{mapw} > $sw) {
		742	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
		743	} else {
		744	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
		745	}
		746
		747	if ($::CONN->{maph} > $sh) {
		748	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
		749	} else {
		750	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
		751	}
		752
344	glEnable GL_TEXTURE_2D;	753	glEnable GL_TEXTURE_2D;
345	glEnable GL_BLEND;	754	glEnable GL_BLEND;
346	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	755	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
347		756
348	my $map = $::CONN->{map};	757	for my $x (0 .. $sw - 1) {
349
350	for my $x (0 .. $::CONN->{mapw} - 1) {
351	for my $y (0 .. $::CONN->{maph} - 1) {	758	for my $y (0 .. $sh - 1) {
352		759
353	my $cell = $map->[$x][$y]	760	my $cell = $map->[$x + $xofs][$y + $yofs]
354	or next;	761	or next;
355		762
356	my $darkness = $cell->[3] * (1 / 255);	763	my $darkness = $cell->[0] * (1 / 255);
		764	if ($darkness < 0) {
		765	glColor 0.3, 0.3, 0.3;
		766	} else {
357	glColor $darkness, $darkness, $darkness;	767	glColor $darkness, $darkness, $darkness;
		768	}
358		769
359	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {	770	for my $num (grep $_, @$cell[1,2,3]) {
360	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	771	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
361		772
362	glBindTexture GL_TEXTURE_2D, $tex->{name};	773	glBindTexture GL_TEXTURE_2D, $tex->{name};
363		774
		775	my $w = $tex->{width};
		776	my $h = $tex->{height};
		777
		778	my $px = ($x + 1) * 32 - $w;
		779	my $py = ($y + 1) * 32 - $h;
		780
364	glBegin GL_QUADS;	781	glBegin GL_QUADS;
365	glTexCoord 0, 0; glVertex $x * 32 , $y * 32;	782	glTexCoord 0, 0; glVertex $px , $py;
366	glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32;	783	glTexCoord 0, 1; glVertex $px , $py + $h;
367	glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32;	784	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
368	glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32;	785	glTexCoord 1, 0; glVertex $px + $w, $py;
369	glEnd;	786	glEnd;
370	}	787	}
371	}	788	}
372	}	789	}
373		790
…		…
375	glDisable GL_BLEND;	792	glDisable GL_BLEND;
376	}	793	}
377		794
378	my %DIR = (	795	my %DIR = (
379	SDLK_KP8, [1, "north"],	796	SDLK_KP8, [1, "north"],
380	SDLK_KP9, [2, "northest"],	797	SDLK_KP9, [2, "northeast"],
381	SDLK_KP6, [3, "east"],	798	SDLK_KP6, [3, "east"],
382	SDLK_KP3, [4, "southeast"],	799	SDLK_KP3, [4, "southeast"],
383	SDLK_KP2, [5, "south"],	800	SDLK_KP2, [5, "south"],
384	SDLK_KP1, [6, "southwest"],	801	SDLK_KP1, [6, "southwest"],
385	SDLK_KP4, [7, "west"],	802	SDLK_KP4, [7, "west"],
386	SDLK_KP7, [8, "northwest"],	803	SDLK_KP7, [8, "northwest"],
		804
		805	SDLK_UP, [1, "north"],
		806	SDLK_RIGHT, [3, "east"],
		807	SDLK_DOWN, [5, "south"],
		808	SDLK_LEFT, [7, "west"],
387	);	809	);
388		810
389	sub key_down {	811	sub key_down {
390	my ($self, $ev) = @_;	812	my ($self, $ev) = @_;
391		813
…		…
394		816
395	if ($sym == SDLK_KP5) {	817	if ($sym == SDLK_KP5) {
396	$::CONN->send ("command stay fire");	818	$::CONN->send ("command stay fire");
397	} elsif (exists $DIR{$sym}) {	819	} elsif (exists $DIR{$sym}) {
398	if ($mod & KMOD_SHIFT) {	820	if ($mod & KMOD_SHIFT) {
		821	$self->{shft}++;
399	$::CONN->send ("command fire $DIR{$sym}[0]");	822	$::CONN->send ("command fire $DIR{$sym}[0]");
400	} elsif ($mod & KMOD_CTRL) {	823	} elsif ($mod & KMOD_CTRL) {
		824	$self->{ctrl}++;
401	$::CONN->send ("command run $DIR{$sym}[0]");	825	$::CONN->send ("command run $DIR{$sym}[0]");
402	} else {	826	} else {
		827	$::CONN->send ("command $DIR{$sym}[1]");
403	}	828	}
404	}	829	}
405	}	830	}
406		831
407	sub key_up {	832	sub key_up {
408	my ($self, $ev) = @_;	833	my ($self, $ev) = @_;
409		834
410	my $mod = $ev->key_mod;	835	my $mod = $ev->key_mod;
411	my $sym = $ev->key_sym;	836	my $sym = $ev->key_sym;
412		837
413	if (exists $DIR{$sym}) {	838	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
414	if ($mod & KMOD_SHIFT) {
415	$::CONN->send ("command fire_stop");	839	$::CONN->send ("command fire_stop");
416	} else {	840	}
		841	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
417	$::CONN->send ("command run_stop");	842	$::CONN->send ("command run_stop");
418	}
419	}	843	}
420	}	844	}
421		845
422	1;	846	1;
423		847

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.16 by root, Fri Apr 7 23:16:29 2006 UTC vs. Revision 1.34 by elmex, Sun Apr 9 02:44:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.16 by root, Fri Apr 7 23:16:29 2006 UTC vs.
Revision 1.34 by elmex, Sun Apr 9 02:44:51 2006 UTC