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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC vs.
Revision 1.49 by root, Sun Apr 9 22:26:51 2006 UTC

…		…
5	use Scalar::Util;	5	use Scalar::Util;
6		6
7	use SDL::OpenGL;	7	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;	8	use SDL::OpenGL::Constants;
9		9
10	our $FOCUS; # the widget with current focus	10	use Crossfire::Client;
11	#our @ACTIVE_WIDGETS;
12		11
13	# class methods for events	12	# class methods for events
14	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }	13	sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
15	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }	14	sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
16	sub feed_sdl_button_down_event { }	15	sub feed_sdl_button_down_event { }
17	sub feed_sdl_button_up_event { }	16	sub feed_sdl_button_up_event { }
18		17
19	sub new {	18	sub new {
20	my $class = shift;	19	my $class = shift;
21		20
22	bless { @_ }, $class	21	bless { @_ }, $class
23	}	22	}
24
25	#sub activate {
26	# push @ACTIVE_WIDGETS, $_[0];
27	# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28	#}
29
30	#sub deactivate {
31	# @ACTIVE_WIDGETS =
32	# sort { $a->{z} <=> $b->{z} }
33	# grep { $_ && $_ != $_[0] }
34	# @ACTIVE_WIDGETS;
35	#}
36		23
37	sub move {	24	sub move {
38	my ($self, $x, $y, $z) = @_;	25	my ($self, $x, $y, $z) = @_;
39	$self->{x} = $x;	26	$self->{x} = $x;
40	$self->{y} = $y;	27	$self->{y} = $y;
…		…
44	sub needs_redraw {	31	sub needs_redraw {
45	0	32	0
46	}	33	}
47		34
48	sub size_request {	35	sub size_request {
		36	require Carp;
49	die "size_request is abtract";	37	Carp::confess "size_request is abtract";
		38	}
		39
		40	sub size_allocate {
		41	my ($self, $w, $h) = @_;
		42
		43	$self->{w} = $w;
		44	$self->{h} = $h;
50	}	45	}
51		46
52	sub focus_in {	47	sub focus_in {
53	my ($widget) = @_;	48	my ($widget) = @_;
54	$FOCUS = $widget;	49	$::FOCUS = $widget;
55	}	50	}
56		51
57	sub focus_out {	52	sub focus_out {
58	my ($widget) = @_;	53	my ($widget) = @_;
59	}	54	}
…		…
72		67
73	sub button_up {	68	sub button_up {
74	my ($widget, $sdlev) = @_;	69	my ($widget, $sdlev) = @_;
75	}	70	}
76		71
77	sub w { $_[0]->{w} }	72	sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78	sub h { $_[0]->{h} }	73	sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	74	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	75	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	76	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82		77
83	sub draw {	78	sub draw {
84	my ($self) = @_;	79	my ($self) = @_;
85		80
86	glPushMatrix;	81	glPushMatrix;
87	glTranslate $self->{x}, $self->{y}, 0;	82	glTranslate $self->{x}, $self->{y}, 0;
88	$self->_draw;	83	$self->_draw;
		84	if ($self == $::HOVER) {
		85	glColor 1, 1, 1, 0.4;
		86	glBegin GL_QUADS;
		87	glVertex 0, 0;
		88	glVertex $self->{w} - 1, 0;
		89	glVertex $self->{w} - 1, $self->{h} - 1;
		90	glVertex 0, $self->{h} - 1;
		91	glEnd;
		92	}
89	glPopMatrix;	93	glPopMatrix;
90	}	94	}
91		95
92	sub _draw {	96	sub _draw {
93	my ($widget) = @_;	97	my ($self) = @_;
		98
		99	warn "no draw defined for $self\n";
94	}	100	}
95		101
96	sub bbox {	102	sub bbox {
97	my ($self) = @_;	103	my ($self) = @_;
98	my ($w, $h) = $self->size_request;	104	my ($w, $h) = $self->size_request;
…		…
102	$self->{x} = $w,	108	$self->{x} = $w,
103	$self->{y} = $h	109	$self->{y} = $h
104	)	110	)
105	}	111	}
106		112
		113	sub find_widget {
		114	my ($self, $x, $y) = @_;
		115
		116	return $self
		117	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		118	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		119
		120	()
		121	}
		122
107	sub del_parent { $_[0]->{parent} = undef }	123	sub del_parent { $_[0]->{parent} = undef }
108		124
109	sub set_parent {	125	sub set_parent {
110	my ($self, $par) = @_;	126	my ($self, $par) = @_;
111		127
…		…
128	my ($self) = @_;	144	my ($self) = @_;
129		145
130	#$self->deactivate;	146	#$self->deactivate;
131	}	147	}
132		148
		149	#############################################################################
		150
133	package Crossfire::Client::Widget::Container;	151	package Crossfire::Client::Widget::Container;
134		152
135	our @ISA = Crossfire::Client::Widget::;	153	our @ISA = Crossfire::Client::Widget::;
136		154
		155	sub new {
		156	my ($class, @widgets) = @_;
		157
		158	my $self = $class->SUPER::new (children => []);
		159	$self->add ($_) for @widgets;
		160
		161	$self
		162	}
		163
		164	sub add {
		165	my ($self, $chld, $expand) = @_;
		166
		167	$chld->{expand} = $expand;
		168	$chld->set_parent ($self);
		169
		170	@{$self->{children}} =
		171	sort { $a->{z} <=> $b->{z} }
		172	@{$self->{children}}, $chld;
		173
		174	$self->size_allocate ($self->{w}, $self->{h})
		175	if $self->{w}; #TODO: check for "realised state"
		176	}
		177
		178	sub remove {
		179	my ($self, $widget) = @_;
		180
		181	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
		182
		183	$self->size_allocate ($self->{w}, $self->{h});
		184	}
		185
		186	sub find_widget {
		187	my ($self, $x, $y) = @_;
		188
		189	$x -= $self->{x};
		190	$y -= $self->{y};
		191
		192	my $res;
		193
		194	for (reverse @{ $self->{children} }) {
		195	$res = $_->find_widget ($x, $y)
		196	and return $res;
		197	}
		198
		199	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		200	}
		201
		202	sub _draw {
		203	my ($self) = @_;
		204
		205	$_->draw for @{$self->{children}};
		206	}
		207
		208	#############################################################################
		209
		210	package Crossfire::Client::Widget::Bin;
		211
		212	our @ISA = Crossfire::Client::Widget::Container::;
		213
		214	sub child { $_[0]->{children}[0] }
		215
		216	sub size_request {
		217	$_[0]{children}[0]->size_request if $_[0]{children}[0];
		218	}
		219
		220	sub size_allocate {
		221	my ($self, $w, $h) = @_;
		222
		223	$self->SUPER::size_allocate ($w, $h);
		224	$self->{children}[0]->size_allocate ($w, $h)
		225	if $self->{children}[0]
		226	}
		227
		228	#############################################################################
		229
		230	package Crossfire::Client::Widget::Toplevel;
		231
		232	our @ISA = Crossfire::Client::Widget::Container::;
		233
		234	sub update {
		235	my ($self) = @_;
		236
		237	::refresh ();
		238	}
		239
		240	sub add {
		241	my ($self, $widget) = @_;
		242
		243	$self->SUPER::add ($widget);
		244
		245	$widget->size_allocate ($widget->size_request);
		246	}
		247
		248	#############################################################################
		249
		250	package Crossfire::Client::Widget::Window;
		251
		252	our @ISA = Crossfire::Client::Widget::Bin::;
		253
137	use SDL::OpenGL;	254	use SDL::OpenGL;
138		255
139	sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }	256	sub new {
140	sub get { $_[0]->{child} }	257	my ($class, $x, $y, $z, $w, $h) = @_;
141	sub remove {
142	my ($self, $chld) = @_;
143	delete $self->{child}
144	if $self->{child} == $chld;
145	}
146		258
147	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	259	my $self = $class->SUPER::new;
148		260
149	sub _draw { die "Containers can't be drawn!" }	261	@$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
150
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	}	262	}
175		263
176	sub update {	264	sub update {
177	my ($self) = @_;	265	my ($self) = @_;
178	::refresh ();
179	}
180		266
181	sub _draw {
182	my ($self) = @_;
183
184	$_->draw for @{$self->{childs}};
185	}
186
187	package Crossfire::Client::Widget::Window;
188
189	our @ISA = Crossfire::Client::Widget::Container::;
190
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;	267	$self->render_chld;
		268	$self->SUPER::update;
209	}	269	}
210		270
211	sub render_chld {	271	sub render_chld {
212	my ($self) = @_;	272	my ($self) = @_;
213	my $chld = $self->get;
214	my ($w, $h) = $self->size_request;
215		273
216	$self->{texture} =	274	$self->{texture} =
217	Crossfire::Client::Texture->new_from_opengl (	275	Crossfire::Client::Texture->new_from_opengl (
218	$w, $h, sub { $chld->draw }	276	$self->{w}, $self->{h}, sub { $self->child->draw }
219	);	277	);
220	$self->{texture}->upload;
221	}	278	}
222		279
223	sub size_request {	280	sub size_allocate {
224	my ($self) = @_;	281	my ($self, $w, $h) = @_;
225	my $chld = $self->get	282
226	or return (0, 0);	283	$self->{w} = $w;
227	$chld->size_request	284	$self->{h} = $h;
		285
		286	$self->child->size_allocate ($w, $h);
		287
		288	$self->render_chld;
228	}	289	}
229		290
230	sub _draw {	291	sub _draw {
231	my ($self) = @_;	292	my ($self) = @_;
232		293
233	my ($w, $h) = $self->size_request;#TODO# use width/height of texture	294	my ($w, $h) = ($self->w, $self->h);
234		295
235	my $tex = $self->{texture}	296	my $tex = $self->{texture}
236	or return;	297	or return;
237		298
238	glEnable GL_BLEND;	299	glEnable GL_BLEND;
239	glEnable GL_TEXTURE_2D;	300	glEnable GL_TEXTURE_2D;
240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	301	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
241	glBindTexture GL_TEXTURE_2D, $tex->{name};	302	glBindTexture GL_TEXTURE_2D, $tex->{name};
242
243	glColor 1, 0, 1;
244		303
245	glBegin GL_QUADS;	304	glBegin GL_QUADS;
246	glTexCoord 0, 0; glVertex 0, 0;	305	glTexCoord 0, 0; glVertex 0, 0;
247	glTexCoord 0, 1; glVertex 0, $h;	306	glTexCoord 0, 1; glVertex 0, $h;
248	glTexCoord 1, 1; glVertex $w, $h;	307	glTexCoord 1, 1; glVertex $w, $h;
…		…
251		310
252	glDisable GL_BLEND;	311	glDisable GL_BLEND;
253	glDisable GL_TEXTURE_2D;	312	glDisable GL_TEXTURE_2D;
254	}	313	}
255		314
		315	#############################################################################
		316
256	package Crossfire::Client::Widget::Frame;	317	package Crossfire::Client::Widget::Frame;
257		318
258	our @ISA = Crossfire::Client::Widget::Container::;	319	our @ISA = Crossfire::Client::Widget::Bin::;
259		320
260	use SDL::OpenGL;	321	use SDL::OpenGL;
261		322
262	sub size_request {	323	sub size_request {
263	my ($self) = @_;	324	my ($self) = @_;
264	my $chld = $self->get	325	my $chld = $self->child
265	or return (0, 0);	326	or return (0, 0);
266		327
267	$chld->move (2, 2);	328	$chld->move (2, 2);
268		329
269	map { $_ + 4 } $chld->size_request;	330	map { $_ + 4 } $chld->size_request;
270	}	331	}
271		332
		333	sub size_allocate {
		334	my ($self, $w, $h) = @_;
		335
		336	$self->{w} = $w;
		337	$self->{h} = $h;
		338
		339	$self->child->size_allocate ($w - 4, $h - 4);
		340	$self->child->move (2, 2);
		341	}
		342
272	sub _draw {	343	sub _draw {
273	my ($self) = @_;	344	my ($self) = @_;
274		345
275	my $chld = $self->get;	346	my $chld = $self->child;
276		347
277	my ($w, $h) = $chld->size_request;	348	my ($w, $h) = $chld->size_request;
278		349
279	glBegin GL_QUADS;	350	glBegin GL_QUADS;
280	glColor 0, 0, 0;	351	glColor 0, 0, 0;
…		…
285	glEnd;	356	glEnd;
286		357
287	$chld->draw;	358	$chld->draw;
288	}	359	}
289		360
		361	#############################################################################
		362
290	package Crossfire::Client::Widget::FancyFrame;	363	package Crossfire::Client::Widget::FancyFrame;
291		364
292	our @ISA = Crossfire::Client::Widget::Frame::;	365	our @ISA = Crossfire::Client::Widget::Bin::;
293		366
294	use SDL::OpenGL;	367	use SDL::OpenGL;
295		368
296	#TODO: implement themed frame	369	my @tex =
		370	map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
		371	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		372
		373	sub size_request {
		374	my ($self) = @_;
		375
		376	my ($w, $h) = $self->SUPER::size_request;
		377
		378	$h += $tex[1]->{height};
		379	$h += $tex[4]->{height};
		380	$w += $tex[2]->{width};
		381	$w += $tex[3]->{width};
		382
		383	($w, $h)
		384	}
		385
		386	sub size_allocate {
		387	my ($self, $w, $h) = @_;
		388
		389	$self->SUPER::size_allocate ($w, $h);
		390
		391	$h -= $tex[1]->{height};
		392	$h -= $tex[4]->{height};
		393	$w -= $tex[2]->{width};
		394	$w -= $tex[3]->{width};
		395
		396	$h = $h < 0 ? 0 : $h;
		397	$w = $w < 0 ? 0 : $w;
		398
		399	$self->child->size_allocate ($w, $h);
		400	$self->child->move ($tex[3]->{width}, $tex[1]->{height});
		401	}
		402
		403	sub _draw {
		404	my ($self) = @_;
		405
		406	my ($w, $h) = ($self->{w}, $self->{h});
		407	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
		408
		409	glEnable GL_BLEND;
		410	glEnable GL_TEXTURE_2D;
		411	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		412	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		413
		414	my $top = $tex[1];
		415	glBindTexture GL_TEXTURE_2D, $top->{name};
		416
		417	glBegin GL_QUADS;
		418	glTexCoord 0, 0; glVertex 0 , 0;
		419	glTexCoord 0, 1; glVertex 0 , $top->{height};
		420	glTexCoord 1, 1; glVertex $w , $top->{height};
		421	glTexCoord 1, 0; glVertex $w , 0;
		422	glEnd;
		423
		424	my $left = $tex[3];
		425	glBindTexture GL_TEXTURE_2D, $left->{name};
		426
		427	glBegin GL_QUADS;
		428	glTexCoord 0, 0; glVertex 0 , $top->{height};
		429	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
		430	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
		431	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
		432	glEnd;
		433
		434	my $right = $tex[2];
		435	glBindTexture GL_TEXTURE_2D, $right->{name};
		436
		437	glBegin GL_QUADS;
		438	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
		439	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
		440	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
		441	glTexCoord 1, 0; glVertex $w , $top->{height};
		442	glEnd;
		443
		444	my $bottom = $tex[4];
		445	glBindTexture GL_TEXTURE_2D, $bottom->{name};
		446
		447	glBegin GL_QUADS;
		448	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
		449	glTexCoord 0, 1; glVertex 0 , $h;
		450	glTexCoord 1, 1; glVertex $w , $h;
		451	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
		452	glEnd;
		453
		454	my $bg = $tex[0];
		455	glBindTexture GL_TEXTURE_2D, $bg->{name};
		456	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		457	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
		458	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
		459
		460	my $rep_x = $cw / $bg->{width};
		461	my $rep_y = $ch / $bg->{height};
		462
		463	glBegin GL_QUADS;
		464	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
		465	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
		466	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
		467	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
		468	glEnd;
		469
		470	glDisable GL_BLEND;
		471	glDisable GL_TEXTURE_2D;
		472
		473	$self->child->draw;
		474
		475	}
		476
		477	#############################################################################
297		478
298	package Crossfire::Client::Widget::Table;	479	package Crossfire::Client::Widget::Table;
299		480
300	our @ISA = Crossfire::Client::Widget::Container::;	481	our @ISA = Crossfire::Client::Widget::Bin::;
301		482
302	use SDL::OpenGL;	483	use SDL::OpenGL;
303		484
304	sub add {	485	sub add {
305	my ($self, $x, $y, $chld) = @_;	486	my ($self, $x, $y, $chld) = @_;
306	my $old_chld = $self->{childs}[$y][$x];	487	my $old_chld = $self->{children}[$y][$x];
307		488
308	$self->{childs}[$y][$x] = $chld;	489	$self->{children}[$y][$x] = $chld;
309	$chld->set_parent ($self);	490	$chld->set_parent ($self);
310	$self->update;	491	$self->update;
311	}	492	}
312		493
313	sub max_row_height {	494	sub max_row_height {
314	my ($self, $row) = @_;	495	my ($self, $row) = @_;
315		496
316	my $hs = 0;	497	my $hs = 0;
317	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {	498	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] \|\| []}; $xi++) {
318	my $c = $self->{childs}->[$row]->[$xi];	499	my $c = $self->{children}->[$row]->[$xi];
319	if ($c) {	500	if ($c) {
320	my ($w, $h) = $c->size_request;	501	my ($w, $h) = $c->size_request;
321	if ($hs < $h) { $hs = $h }	502	if ($hs < $h) { $hs = $h }
322	}	503	}
323	}	504	}
…		…
326		507
327	sub max_col_width {	508	sub max_col_width {
328	my ($self, $col) = @_;	509	my ($self, $col) = @_;
329		510
330	my $ws = 0;	511	my $ws = 0;
331	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {	512	for (my $yi = 0; $yi <= $#{$self->{children} \|\| []}; $yi++) {
332	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];	513	my $c = ($self->{children}->[$yi] \|\| [])->[$col];
333	if ($c) {	514	if ($c) {
334	my ($w, $h) = $c->size_request;	515	my ($w, $h) = $c->size_request;
335	if ($ws < $w) { $ws = $w }	516	if ($ws < $w) { $ws = $w }
336	}	517	}
337	}	518	}
…		…
341	sub size_request {	522	sub size_request {
342	my ($self) = @_;	523	my ($self) = @_;
343		524
344	my ($hs, $ws) = (0, 0);	525	my ($hs, $ws) = (0, 0);
345		526
346	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	527	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
347	$hs += $self->max_row_height ($yi);	528	$hs += $self->max_row_height ($yi);
348	}	529	}
349		530
350	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	531	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
351	my $wm = 0;	532	my $wm = 0;
352	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	533	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
353	$wm += $self->max_col_width ($xi)	534	$wm += $self->max_col_width ($xi)
354	}	535	}
355	if ($ws < $wm) { $ws = $wm }	536	if ($ws < $wm) { $ws = $wm }
356	}	537	}
357		538
…		…
360		541
361	sub _draw {	542	sub _draw {
362	my ($self) = @_;	543	my ($self) = @_;
363		544
364	my $y = 0;	545	my $y = 0;
365	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	546	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
366	my $x = 0;	547	my $x = 0;
367		548
368	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	549	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
369		550
370	my $c = $self->{childs}->[$yi]->[$xi];	551	my $c = $self->{children}->[$yi]->[$xi];
371	if ($c) {	552	if ($c) {
372	$c->move ($x, $y, 0); #TODO: Move to size_request	553	$c->move ($x, $y, 0); #TODO: Move to size_request
373	$c->draw if $c;	554	$c->draw if $c;
374	}	555	}
375		556
…		…
378		559
379	$y += $self->max_row_height ($yi);	560	$y += $self->max_row_height ($yi);
380	}	561	}
381	}	562	}
382		563
		564	#############################################################################
		565
383	package Crossfire::Client::Widget::VBox;	566	package Crossfire::Client::Widget::VBox;
384		567
385	our @ISA = Crossfire::Client::Widget::Container::;	568	our @ISA = Crossfire::Client::Widget::Container::;
386		569
387	use SDL::OpenGL;	570	use SDL::OpenGL;
388		571
389	sub add {
390	my ($self, $chld) = @_;
391	push @{$self->{childs}}, $chld;
392	$chld->set_parent ($self);
393	$self->update;
394	}
395
396	sub size_request {	572	sub size_request {
397	my ($self) = @_;	573	my ($self) = @_;
398		574
399	my ($hs, $ws) = (0, 0);	575	my @alloc = map [$_->size_request], @{$self->{children}};
		576
		577	(
		578	(List::Util::max map $_->[0], @alloc),
		579	(List::Util::sum map $_->[1], @alloc),
		580	)
		581	}
		582
		583	sub size_allocate {
		584	my ($self, $w, $h) = @_;
		585
		586	$self->w ($w);
		587	$self->h ($h);
		588
		589	my $exp;
		590	my @oth;
		591	# find expand widget
400	for (@{$self->{childs} \|\| []}) {	592	for (@{$self->{children}}) {
		593	if ($_->{expand}) {
		594	$exp = $_;
		595	last;
		596	}
		597	push @oth, $_;
		598	}
		599
		600	my ($ow, $oh);
		601
		602	# get sizes of other widgets
		603	for (@oth) {
401	my ($w, $h) = $_->size_request;	604	my ($w, $h) = $_->size_request;
402	$hs += $h;	605	$oh += $h;
403	if ($ws < $w) { $ws = $w }	606	if ($ow < $w) { $ow = $w }
404	}	607	}
405		608
406	return ($ws, $hs);	609	my $y = 0;
407	}
408
409	sub _draw {
410	my ($self) = @_;
411
412	my ($x, $y);
413	for (@{$self->{childs} \|\| []}) {	610	for (@{$self->{children}}) {
414	$_->move (0, $y, 0); #TODO: move to size_request	611	$_->move (0, $y);
415	$_->draw;	612
		613	if ($_ == $exp) {
		614	$_->size_allocate ($w, $h - $oh);
		615	$y += $h - $oh;
		616	} else {
416	my ($w, $h) = $_->size_request;	617	my ($cw, $h) = $_->size_request;
		618	$_->size_allocate ($w, $h);
417	$y += $h;	619	$y += $h;
		620	}
418	}	621	}
419	}	622	}
		623
		624	#############################################################################
420		625
421	package Crossfire::Client::Widget::Label;	626	package Crossfire::Client::Widget::Label;
422		627
423	our @ISA = Crossfire::Client::Widget::;	628	our @ISA = Crossfire::Client::Widget::;
424		629
…		…
468	glEnable GL_TEXTURE_2D;	673	glEnable GL_TEXTURE_2D;
469	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	674	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
471	glBindTexture GL_TEXTURE_2D, $tex->{name};	676	glBindTexture GL_TEXTURE_2D, $tex->{name};
472		677
473	glColor 1, 1, 1, 0.6; # TODO color	678	glColor 1, 0, 0, 1; # TODO color
474		679
475	glBegin GL_QUADS;	680	glBegin GL_QUADS;
476	glTexCoord 0, 0; glVertex 0 , 0;	681	glTexCoord 0, 0; glVertex 0 , 0;
477	glTexCoord 0, 1; glVertex 0 , $tex->{height};	682	glTexCoord 0, 1; glVertex 0 , $tex->{height};
478	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	683	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
…		…
481		686
482	glDisable GL_BLEND;	687	glDisable GL_BLEND;
483	glDisable GL_TEXTURE_2D;	688	glDisable GL_TEXTURE_2D;
484	}	689	}
485		690
		691	#############################################################################
		692
486	package Crossfire::Client::Widget::TextEntry;	693	package Crossfire::Client::Widget::TextEntry;
487		694
488	our @ISA = Crossfire::Client::Widget::Label::;	695	our @ISA = Crossfire::Client::Widget::Label::;
489		696
490	use SDL;	697	use SDL;
…		…
508	$text .= chr $uni;	715	$text .= chr $uni;
509	}	716	}
510	$self->set_text ($text);	717	$self->set_text ($text);
511	}	718	}
512		719
513		720	#############################################################################
514	# XXX: TextView isn't neccessary with pango multiline text rendering
515	package Crossfire::Client::Widget::TextView;
516
517	use strict;
518
519	our @ISA = qw/Crossfire::Client::Widget/;
520
521	use SDL::OpenGL;
522	use SDL::OpenGL::Constants;
523
524	sub new {
525	my ($class, $text, $h) = @_;
526	my $self = $class->SUPER::new ();
527
528	$self->{txt_height} = $h;
529	@{$self->{lines}} = split /\r?\n/, $text;
530
531	for (split /\r?\n/, $text) {
532	$self->add_line ($_);
533	}
534	$self
535	}
536
537	#sub render_lines {
538	# my ($self) = @_;
539	#
540	# $self->{txt_lines} = [];
541	#
542	# for (@{$self->{lines}}) {
543	# push @{$self->{txt_lines}},
544	# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
545	# }
546	#}
547
548	sub add_line {
549	my ($self, $line) = @_;
550	push @{$self->{lines}}, $line;
551
552	push @{$self->{txt_lines}},
553	new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
554	}
555
556	sub size_request {
557	my ($self) = @_;
558
559	my $w = 0;
560	my $h = 0;
561
562	for (@{$self->{txt_lines}}) {
563	if ($w < $_->{width}) { $w = $_->{width} }
564	$h += $_->{height};
565	}
566
567	return ($w, $h);
568	}
569
570	sub draw_line {
571	my ($self, $tex, $y) = @_;
572
573	glBindTexture GL_TEXTURE_2D, $tex->{name};
574
575	glColor 1, 0, 1;
576
577	glBegin GL_QUADS;
578	glTexCoord 0, 0; glVertex 0 , $y;
579	glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
580	glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
581	glTexCoord 1, 0; glVertex $tex->{width}, $y;
582	glEnd;
583	}
584
585	sub _draw {
586	my ($self) = @_;
587
588	glEnable GL_BLEND;
589	glEnable GL_TEXTURE_2D;
590	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
591
592	my $l = 0;
593	for (@{$self->{txt_lines}}) {
594	$self->draw_line ($_, $l);
595	$l += $_->{height};
596	}
597
598	glDisable GL_BLEND;
599	glDisable GL_TEXTURE_2D;
600	}
601		721
602	package Crossfire::Client::Widget::MapWidget;	722	package Crossfire::Client::Widget::MapWidget;
603		723
604	use strict;	724	use strict;
605		725
…		…
614	sub key_down {	734	sub key_down {
615	print "MAPKEYDOWN\n";	735	print "MAPKEYDOWN\n";
616	}	736	}
617		737
618	sub key_up {	738	sub key_up {
		739	}
		740
		741	sub size_request {
		742
		743	}
		744
		745	sub size_allocate {
619	}	746	}
620		747
621	sub _draw {	748	sub _draw {
622	my ($self) = @_;	749	my ($self) = @_;
623		750
…		…
643	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	770	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
644	}	771	}
645		772
646	glEnable GL_TEXTURE_2D;	773	glEnable GL_TEXTURE_2D;
647	glEnable GL_BLEND;	774	glEnable GL_BLEND;
648	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	775	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		776
		777	my $sw4 = ($sw + 3) & ~3;
		778	my $lighting = "\x00" x ($sw4 * $sh);
649		779
650	for my $x (0 .. $sw - 1) {	780	for my $x (0 .. $sw - 1) {
651	for my $y (0 .. $sh - 1) {	781	for my $y (0 .. $sh - 1) {
652		782
653	my $cell = $map->[$x + $xofs][$y + $yofs]	783	my $cell = $map->[$x + $xofs][$y + $yofs]
654	or next;	784	or next;
655		785
656	my $darkness = $cell->[0] * (1 / 255);	786	my $darkness = $cell->[0] * (1 / 255);
657	if ($darkness < 0) {	787	if ($darkness < 0) {
658	glColor 0.3, 0.3, 0.3;	788	$darkness = 0.15;
659	} else {
660	glColor $darkness, $darkness, $darkness;
661	}	789	}
		790	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
662		791
663	for my $num (grep $_, @$cell[1,2,3]) {	792	for my $num (grep $_, @$cell[1,2,3]) {
664	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	793	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
665		794
666	glBindTexture GL_TEXTURE_2D, $tex->{name};	795	glBindTexture GL_TEXTURE_2D, $tex->{name};
…		…
678	glTexCoord 1, 0; glVertex $px + $w, $py;	807	glTexCoord 1, 0; glVertex $px + $w, $py;
679	glEnd;	808	glEnd;
680	}	809	}
681	}	810	}
682	}	811	}
		812
		813	# if (1) { # higher quality darkness
		814	# $lighting =~ s/(.)/$1$1$1/gs;
		815	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
		816	#
		817	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
		818	#
		819	# $lighting = $pb->get_pixels;
		820	# $lighting =~ s/(.)../$1/gs;
		821	# }
		822
		823	$lighting = new Crossfire::Client::Texture
		824	width => $sw4,
		825	height => $sh,
		826	data => $lighting,
		827	internalformat => GL_ALPHA4,
		828	format => GL_ALPHA;
		829
		830	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		831	glColor 0, 0, 0, 0.75;
		832	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		833	glBindTexture GL_TEXTURE_2D, $lighting->{name};
		834	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		835	glBegin GL_QUADS;
		836	glTexCoord 0, 0; glVertex 0 , 0;
		837	glTexCoord 0, 1; glVertex 0 , $sh * 32;
		838	glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
		839	glTexCoord 1, 0; glVertex $sw4 * 32, 0;
		840	glEnd;
683		841
684	glDisable GL_TEXTURE_2D;	842	glDisable GL_TEXTURE_2D;
685	glDisable GL_BLEND;	843	glDisable GL_BLEND;
686	}	844	}
687		845
…		…
734	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	892	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
735	$::CONN->send ("command run_stop");	893	$::CONN->send ("command run_stop");
736	}	894	}
737	}	895	}
738		896
		897	#############################################################################
		898
		899	package Crossfire::Client::Widget::Animator;
		900
		901	use SDL::OpenGL;
		902
		903	our @ISA = Crossfire::Client::Widget::Bin::;
		904
		905	sub moveto {
		906	my ($self, $x, $y) = @_;
		907
		908	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
		909	$self->{speed} = 0.2;
		910	$self->{time} = 1;
		911
		912	::animation_start $self;
		913	}
		914
		915	sub animate {
		916	my ($self, $interval) = @_;
		917
		918	$self->{time} -= $interval * $self->{speed};
		919	if ($self->{time} <= 0) {
		920	$self->{time} = 0;
		921	::animation_stop $self;
		922	}
		923
		924	my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
		925
		926	$self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
		927	$self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
		928	}
		929
		930	sub _draw {
		931	my ($self) = @_;
		932
		933	glPushMatrix;
		934	glRotate $self->{time} * 10000, 0, 1, 0;
		935	$self->{children}[0]->draw;
		936	glPopMatrix;
		937	}
		938
739	1;	939	1;
740		940

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC vs. Revision 1.49 by root, Sun Apr 9 22:26:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC vs.
Revision 1.49 by root, Sun Apr 9 22:26:51 2006 UTC