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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.28 by root, Sun Apr 9 00:06:10 2006 UTC vs. Revision 1.42 by root, Sun Apr 9 22:00:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.28 by root, Sun Apr 9 00:06:10 2006 UTC vs.
Revision 1.42 by root, Sun Apr 9 22:00:58 2006 UTC