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

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.40 by root, Sun Apr 9 21:41:11 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.40 by root, Sun Apr 9 21:41:11 2006 UTC