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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.24 by root, Sat Apr 8 20:25:26 2006 UTC vs.
Revision 1.38 by root, Sun Apr 9 21:34:49 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.24 by root, Sat Apr 8 20:25:26 2006 UTC vs. Revision 1.38 by root, Sun Apr 9 21:34:49 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.24 by root, Sat Apr 8 20:25:26 2006 UTC vs.
Revision 1.38 by root, Sun Apr 9 21:34:49 2006 UTC