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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs.
Revision 1.65 by root, Tue Apr 11 14:04:27 2006 UTC

…		…
1	package Crossfire::Client::Widget;	1	package CFClient::Widget;
2		2
3	use strict;	3	use strict;
4		4
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 CFClient;
11	#our @ACTIVE_WIDGETS;	11
		12	our ($FOCUS, $HOVER, $GRAB); # various widgets
		13
		14	our $TOPLEVEL;
		15	our $BUTTON_STATE;
12		16
13	# class methods for events	17	# class methods for events
14	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }	18	sub feed_sdl_key_down_event {
15	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }	19	$FOCUS->key_down ($_[0]) if $FOCUS;
		20	}
		21
		22	sub feed_sdl_key_up_event {
		23	$FOCUS->key_up ($_[0]) if $FOCUS;
		24	}
		25
16	sub feed_sdl_button_down_event { }	26	sub feed_sdl_button_down_event {
		27	my ($ev) = @_;
		28	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		29
		30	if (!$BUTTON_STATE) {
		31	my $widget = $TOPLEVEL->find_widget ($x, $y);
		32
		33	$GRAB = $widget;
		34	$GRAB->update if $GRAB;
		35	}
		36
		37	$BUTTON_STATE \|= 1 << ($ev->button - 1);
		38
		39	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
		40	}
		41
17	sub feed_sdl_button_up_event { }	42	sub feed_sdl_button_up_event {
		43	my ($ev) = @_;
		44	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		45
		46	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);
		47
		48	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
		49
		50	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
		51
		52	if (!$BUTTON_STATE) {
		53	my $grab = $GRAB; undef $GRAB;
		54	$grab->update if $grab;
		55	$GRAB->update if $GRAB;
		56	}
		57	}
		58
		59	sub feed_sdl_motion_event {
		60	my ($ev) = @_;
		61	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		62
		63	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);
		64
		65	if ($widget != $HOVER) {
		66	my $hover = $HOVER; $HOVER = $widget;
		67
		68	$hover->update if $hover;
		69	$HOVER->update if $HOVER;
		70	}
		71
		72	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
		73	}
18		74
19	sub new {	75	sub new {
20	my $class = shift;	76	my $class = shift;
21		77
22	bless { @_ }, $class	78	bless {
		79	x => 0,
		80	y => 0,
		81	z => 0,
		82	@_
		83	}, $class
23	}	84	}
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		85
37	sub move {	86	sub move {
38	my ($self, $x, $y, $z) = @_;	87	my ($self, $x, $y, $z) = @_;
39	$self->{x} = $x;	88	$self->{x} = $x;
40	$self->{y} = $y;	89	$self->{y} = $y;
44	sub needs_redraw {	93	sub needs_redraw {
45	0	94	0
46	}	95	}
47		96
48	sub size_request {	97	sub size_request {
		98	require Carp;
49	die "size_request is abtract";	99	Carp::confess "size_request is abtract";
		100	}
		101
		102	sub size_allocate {
		103	my ($self, $w, $h) = @_;
		104
		105	$self->{w} = $w;
		106	$self->{h} = $h;
		107	}
		108
		109	# translate global koordinates to local coordinate system
		110	sub translate {
		111	my ($self, $x, $y) = @_;
		112
		113	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50	}	114	}
51		115
52	sub focus_in {	116	sub focus_in {
53	my ($widget) = @_;	117	my ($self) = @_;
54	$FOCUS = $widget;	118
		119	my $focus = $FOCUS; $FOCUS = $self;
		120	$focus->update if $focus;
		121	$FOCUS->update;
55	}	122	}
56		123
57	sub focus_out {	124	sub focus_out {
58	my ($widget) = @_;	125	my ($self) = @_;
59	}
60		126
61	sub key_down {	127	return unless $FOCUS == $self;
62	my ($widget, $sdlev) = @_;
63	}
64		128
65	sub key_up {	129	my $focus = $FOCUS; undef $FOCUS;
66	my ($widget, $sdlev) = @_;	130	$focus->update if $focus; #?
67	}	131	}
68		132
		133	sub mouse_motion { }
		134	sub button_up { }
69	sub button_down {	135	sub button_down { }
70	my ($widget, $sdlev) = @_;	136	sub key_down { }
71	}	137	sub key_up { }
72		138
73	sub button_up {	139	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74	my ($widget, $sdlev) = @_;	140	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75	}
76
77	sub w { $_[0]->{w} }
78	sub h { $_[0]->{h} }
79	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	141	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	142	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	143	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82		144
83	sub draw {	145	sub draw {
84	my ($self) = @_;	146	my ($self) = @_;
85		147
86	glPushMatrix;	148	glPushMatrix;
87	glTranslate $self->{x}, $self->{y}, 0;	149	glTranslate $self->{x}, $self->{y}, 0;
88	$self->_draw;	150	$self->_draw;
		151	if ($self == $HOVER) {
		152	glColor 1, 1, 1, 0.4;
		153	glEnable GL_BLEND;
		154	glBegin GL_QUADS;
		155	glVertex 0 , 0;
		156	glVertex $self->{w}, 0;
		157	glVertex $self->{w}, $self->{h};
		158	glVertex 0 , $self->{h};
		159	glEnd;
		160	glDisable GL_BLEND;
		161	}
89	glPopMatrix;	162	glPopMatrix;
90	}	163	}
91		164
92	sub _draw {	165	sub _draw {
93	my ($widget) = @_;	166	my ($self) = @_;
		167
		168	warn "no draw defined for $self\n";
94	}	169	}
95		170
96	sub bbox {	171	sub bbox {
97	my ($self) = @_;	172	my ($self) = @_;
98	my ($w, $h) = $self->size_request;	173	my ($w, $h) = $self->size_request;
…		…
102	$self->{x} = $w,	177	$self->{x} = $w,
103	$self->{y} = $h	178	$self->{y} = $h
104	)	179	)
105	}	180	}
106		181
		182	sub find_widget {
		183	my ($self, $x, $y) = @_;
		184
		185	return $self
		186	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		187	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		188
		189	()
		190	}
		191
107	sub del_parent { $_[0]->{parent} = undef }	192	sub del_parent { $_[0]->{parent} = undef }
108		193
109	sub set_parent {	194	sub set_parent {
110	my ($self, $par) = @_;	195	my ($self, $par) = @_;
111		196
…		…
128	my ($self) = @_;	213	my ($self) = @_;
129		214
130	#$self->deactivate;	215	#$self->deactivate;
131	}	216	}
132		217
		218	#############################################################################
		219
133	package Crossfire::Client::Widget::Container;	220	package CFClient::Widget::Container;
134		221
135	our @ISA = Crossfire::Client::Widget::;	222	our @ISA = CFClient::Widget::;
		223
		224	sub new {
		225	my ($class, %arg) = @_;
		226
		227	my $children = delete $arg{children} \|\| [];
		228
		229	my $self = $class->SUPER::new (children => [], %arg);
		230	$self->add ($_) for @$children;
		231
		232	$self
		233	}
		234
		235	sub add {
		236	my ($self, $chld, $expand) = @_;
		237
		238	$chld->{expand} = $expand;
		239	$chld->set_parent ($self);
		240
		241	@{$self->{children}} =
		242	sort { $a->{z} <=> $b->{z} }
		243	@{$self->{children}}, $chld;
		244
		245	$self->size_allocate ($self->{w}, $self->{h})
		246	if $self->{w}; #TODO: check for "realised state"
		247	}
		248
		249	sub remove {
		250	my ($self, $widget) = @_;
		251
		252	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
		253
		254	$self->size_allocate ($self->{w}, $self->{h});
		255	}
		256
		257	sub find_widget {
		258	my ($self, $x, $y) = @_;
		259
		260	$x -= $self->{x};
		261	$y -= $self->{y};
		262
		263	my $res;
		264
		265	for (reverse @{ $self->{children} }) {
		266	$res = $_->find_widget ($x, $y)
		267	and return $res;
		268	}
		269
		270	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		271	}
		272
		273	sub _draw {
		274	my ($self) = @_;
		275
		276	$_->draw for @{$self->{children}};
		277	}
		278
		279	#############################################################################
		280
		281	package CFClient::Widget::Bin;
		282
		283	our @ISA = CFClient::Widget::Container::;
		284
		285	sub child { $_[0]->{children}[0] }
		286
		287	sub size_request {
		288	$_[0]{children}[0]->size_request if $_[0]{children}[0];
		289	}
		290
		291	sub size_allocate {
		292	my ($self, $w, $h) = @_;
		293
		294	$self->SUPER::size_allocate ($w, $h);
		295	$self->{children}[0]->size_allocate ($w, $h)
		296	if $self->{children}[0]
		297	}
		298
		299	#############################################################################
		300
		301	package CFClient::Widget::Window;
		302
		303	our @ISA = CFClient::Widget::Bin::;
136		304
137	use SDL::OpenGL;	305	use SDL::OpenGL;
138		306
139	sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }	307	sub new {
140	sub get { $_[0]->{child} }	308	my ($class, %arg) = @_;
141	sub remove {
142	my ($self, $chld) = @_;
143	delete $self->{child}
144	if $self->{child} == $chld;
145	}
146		309
147	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	310	my $self = $class->SUPER::new (%arg);
148
149	sub _draw { die "Containers can't be drawn!" }
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	}	311	}
175		312
176	sub update {	313	sub update {
177	my ($self) = @_;	314	my ($self) = @_;
178	::refresh ();	315
		316	# we want to do this delayed...
		317	$self->render_chld;
		318	$self->SUPER::update;
		319	}
		320
		321	sub render_chld {
		322	my ($self) = @_;
		323
		324	$self->{texture} =
		325	CFClient::Texture->new_from_opengl (
		326	$self->{w}, $self->{h}, sub { $self->child->draw }
		327	);
		328	}
		329
		330	sub size_allocate {
		331	my ($self, $w, $h) = @_;
		332
		333	$self->{w} = $w;
		334	$self->{h} = $h;
		335
		336	$self->child->size_allocate ($w, $h);
		337
		338	$self->render_chld;
179	}	339	}
180		340
181	sub _draw {	341	sub _draw {
182	my ($self) = @_;	342	my ($self) = @_;
183		343
184	$_->draw for @{$self->{childs}};	344	my ($w, $h) = ($self->w, $self->h);
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;
209	}
210
211	sub render_chld {
212	my ($self) = @_;
213	my $chld = $self->get;
214	my ($w, $h) = $self->size_request;
215
216	$self->{texture} =
217	Crossfire::Client::Texture->new_from_opengl (
218	$w, $h, sub { $chld->draw }
219	);
220	$self->{texture}->upload;
221	}
222
223	sub size_request {
224	my ($self) = @_;
225	my $chld = $self->get
226	or return (0, 0);
227	$chld->size_request
228	}
229
230	sub _draw {
231	my ($self) = @_;
232
233	my ($w, $h) = $self->size_request;#TODO# use width/height of texture
234		345
235	my $tex = $self->{texture}	346	my $tex = $self->{texture}
236	or return;	347	or return;
237		348
238	glEnable GL_BLEND;	349	glEnable GL_BLEND;
239	glEnable GL_TEXTURE_2D;	350	glEnable GL_TEXTURE_2D;
240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	351	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
241	glBindTexture GL_TEXTURE_2D, $tex->{name};
242		352
243	glColor 1, 0, 1;	353	$tex->draw_quad (0, 0, $w, $h);
244
245	glBegin GL_QUADS;
246	glTexCoord 0, 0; glVertex 0, 0;
247	glTexCoord 0, 1; glVertex 0, $h;
248	glTexCoord 1, 1; glVertex $w, $h;
249	glTexCoord 1, 0; glVertex $w, 0;
250	glEnd;
251		354
252	glDisable GL_BLEND;	355	glDisable GL_BLEND;
253	glDisable GL_TEXTURE_2D;	356	glDisable GL_TEXTURE_2D;
254	}	357	}
255		358
		359	#############################################################################
		360
256	package Crossfire::Client::Widget::Frame;	361	package CFClient::Widget::Frame;
257		362
258	our @ISA = Crossfire::Client::Widget::Container::;	363	our @ISA = CFClient::Widget::Bin::;
259		364
260	use SDL::OpenGL;	365	use SDL::OpenGL;
261		366
262	sub size_request {	367	sub size_request {
263	my ($self) = @_;	368	my ($self) = @_;
264	my $chld = $self->get	369	my $chld = $self->child
265	or return (0, 0);	370	or return (0, 0);
266		371
267	$chld->move (2, 2);	372	$chld->move (2, 2);
268		373
269	map { $_ + 4 } $chld->size_request;	374	map { $_ + 4 } $chld->size_request;
270	}	375	}
271		376
		377	sub size_allocate {
		378	my ($self, $w, $h) = @_;
		379
		380	$self->{w} = $w;
		381	$self->{h} = $h;
		382
		383	$self->child->size_allocate ($w - 4, $h - 4);
		384	$self->child->move (2, 2);
		385	}
		386
272	sub _draw {	387	sub _draw {
273	my ($self) = @_;	388	my ($self) = @_;
274		389
275	my $chld = $self->get;	390	my $chld = $self->child;
276		391
277	my ($w, $h) = $chld->size_request;	392	my ($w, $h) = $chld->size_request;
278		393
279	glBegin GL_QUADS;	394	glBegin GL_QUADS;
280	glColor 0, 0, 0;	395	glColor 0, 0, 0;
281	glTexCoord 0, 0; glVertex 0 , 0;	396	glVertex 0 , 0;
282	glTexCoord 0, 1; glVertex 0 , $h + 4;	397	glVertex 0 , $h + 4;
283	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	398	glVertex $w + 4 , $h + 4;
284	glTexCoord 1, 0; glVertex $w + 4 , 0;	399	glVertex $w + 4 , 0;
285	glEnd;	400	glEnd;
286		401
287	$chld->draw;	402	$chld->draw;
288	}	403	}
289		404
		405	#############################################################################
		406
290	package Crossfire::Client::Widget::FancyFrame;	407	package CFClient::Widget::FancyFrame;
291		408
292	our @ISA = Crossfire::Client::Widget::Frame::;	409	our @ISA = CFClient::Widget::Bin::;
293		410
294	use SDL::OpenGL;	411	use SDL::OpenGL;
295		412
296	#TODO: implement themed frame	413	my @tex =
		414	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		415	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
297		416
		417	sub size_request {
		418	my ($self) = @_;
		419
		420	my ($w, $h) = $self->SUPER::size_request;
		421
		422	$h += $tex[1]->{height};
		423	$h += $tex[4]->{height};
		424	$w += $tex[2]->{width};
		425	$w += $tex[3]->{width};
		426
		427	($w, $h)
		428	}
		429
		430	sub size_allocate {
		431	my ($self, $w, $h) = @_;
		432
		433	$self->SUPER::size_allocate ($w, $h);
		434
		435	$h -= $tex[1]->{height};
		436	$h -= $tex[4]->{height};
		437	$w -= $tex[2]->{width};
		438	$w -= $tex[3]->{width};
		439
		440	$h = $h < 0 ? 0 : $h;
		441	$w = $w < 0 ? 0 : $w;
		442
		443	$self->child->size_allocate ($w, $h);
		444	$self->child->move ($tex[3]->{width}, $tex[1]->{height});
		445	}
		446
		447	sub _draw {
		448	my ($self) = @_;
		449
		450	my ($w, $h) = ($self->{w}, $self->{h});
		451	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
		452
		453	glEnable GL_BLEND;
		454	glEnable GL_TEXTURE_2D;
		455	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		456	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		457
		458	my $top = $tex[1];
		459	$top->draw_quad (0, 0, $w, $top->{height});
		460
		461	my $left = $tex[3];
		462	$left->draw_quad (0, $top->{height}, $left->{width}, $ch);
		463
		464	my $right = $tex[2];
		465	$right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
		466
		467	my $bottom = $tex[4];
		468	$bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
		469
		470	my $bg = $tex[0];
		471	glBindTexture GL_TEXTURE_2D, $bg->{name};
		472	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		473	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
		474	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
		475
		476	my $rep_x = $cw / $bg->{width};
		477	my $rep_y = $ch / $bg->{height};
		478
		479	$bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
		480
		481	glDisable GL_BLEND;
		482	glDisable GL_TEXTURE_2D;
		483
		484	$self->child->draw;
		485
		486	}
		487
		488	#############################################################################
		489
298	package Crossfire::Client::Widget::Table;	490	package CFClient::Widget::Table;
299		491
300	our @ISA = Crossfire::Client::Widget::Container::;	492	our @ISA = CFClient::Widget::Bin::;
301		493
302	use SDL::OpenGL;	494	use SDL::OpenGL;
303		495
304	sub add {	496	sub add {
305	my ($self, $x, $y, $chld) = @_;	497	my ($self, $x, $y, $chld) = @_;
306	my $old_chld = $self->{childs}[$y][$x];	498	my $old_chld = $self->{children}[$y][$x];
307		499
308	$self->{childs}[$y][$x] = $chld;	500	$self->{children}[$y][$x] = $chld;
309	$chld->set_parent ($self);	501	$chld->set_parent ($self);
310	$self->update;	502	$self->update;
311	}	503	}
312		504
313	sub max_row_height {	505	sub max_row_height {
314	my ($self, $row) = @_;	506	my ($self, $row) = @_;
315		507
316	my $hs = 0;	508	my $hs = 0;
317	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {	509	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] \|\| []}; $xi++) {
318	my $c = $self->{childs}->[$row]->[$xi];	510	my $c = $self->{children}->[$row]->[$xi];
319	if ($c) {	511	if ($c) {
320	my ($w, $h) = $c->size_request;	512	my ($w, $h) = $c->size_request;
321	if ($hs < $h) { $hs = $h }	513	if ($hs < $h) { $hs = $h }
322	}	514	}
323	}	515	}
…		…
326		518
327	sub max_col_width {	519	sub max_col_width {
328	my ($self, $col) = @_;	520	my ($self, $col) = @_;
329		521
330	my $ws = 0;	522	my $ws = 0;
331	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {	523	for (my $yi = 0; $yi <= $#{$self->{children} \|\| []}; $yi++) {
332	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];	524	my $c = ($self->{children}->[$yi] \|\| [])->[$col];
333	if ($c) {	525	if ($c) {
334	my ($w, $h) = $c->size_request;	526	my ($w, $h) = $c->size_request;
335	if ($ws < $w) { $ws = $w }	527	if ($ws < $w) { $ws = $w }
336	}	528	}
337	}	529	}
…		…
341	sub size_request {	533	sub size_request {
342	my ($self) = @_;	534	my ($self) = @_;
343		535
344	my ($hs, $ws) = (0, 0);	536	my ($hs, $ws) = (0, 0);
345		537
346	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	538	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
347	$hs += $self->max_row_height ($yi);	539	$hs += $self->max_row_height ($yi);
348	}	540	}
349		541
350	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	542	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
351	my $wm = 0;	543	my $wm = 0;
352	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	544	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
353	$wm += $self->max_col_width ($xi)	545	$wm += $self->max_col_width ($xi)
354	}	546	}
355	if ($ws < $wm) { $ws = $wm }	547	if ($ws < $wm) { $ws = $wm }
356	}	548	}
357		549
…		…
360		552
361	sub _draw {	553	sub _draw {
362	my ($self) = @_;	554	my ($self) = @_;
363		555
364	my $y = 0;	556	my $y = 0;
365	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	557	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
366	my $x = 0;	558	my $x = 0;
367		559
368	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	560	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
369		561
370	my $c = $self->{childs}->[$yi]->[$xi];	562	my $c = $self->{children}->[$yi]->[$xi];
371	if ($c) {	563	if ($c) {
372	$c->move ($x, $y, 0); #TODO: Move to size_request	564	$c->move ($x, $y, 0); #TODO: Move to size_request
373	$c->draw if $c;	565	$c->draw if $c;
374	}	566	}
375		567
…		…
378		570
379	$y += $self->max_row_height ($yi);	571	$y += $self->max_row_height ($yi);
380	}	572	}
381	}	573	}
382		574
		575	#############################################################################
		576
383	package Crossfire::Client::Widget::VBox;	577	package CFClient::Widget::VBox;
384		578
385	our @ISA = Crossfire::Client::Widget::Container::;	579	our @ISA = CFClient::Widget::Container::;
386		580
387	use SDL::OpenGL;	581	use SDL::OpenGL;
388		582
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 {	583	sub size_request {
397	my ($self) = @_;	584	my ($self) = @_;
398		585
399	my ($hs, $ws) = (0, 0);	586	my @alloc = map [$_->size_request], @{$self->{children}};
		587
		588	(
		589	(List::Util::max map $_->[0], @alloc),
		590	(List::Util::sum map $_->[1], @alloc),
		591	)
		592	}
		593
		594	sub size_allocate {
		595	my ($self, $w, $h) = @_;
		596
		597	$self->w ($w);
		598	$self->h ($h);
		599
		600	my $exp;
		601	my @oth;
		602	# find expand widget
400	for (@{$self->{childs} \|\| []}) {	603	for (@{$self->{children}}) {
		604	if ($_->{expand}) {
		605	$exp = $_;
		606	last;
		607	}
		608	push @oth, $_;
		609	}
		610
		611	my ($ow, $oh);
		612
		613	# get sizes of other widgets
		614	for (@oth) {
401	my ($w, $h) = $_->size_request;	615	my ($w, $h) = $_->size_request;
402	$hs += $h;	616	$oh += $h;
403	if ($ws < $w) { $ws = $w }	617	if ($ow < $w) { $ow = $w }
404	}	618	}
405		619
406	return ($ws, $hs);	620	my $y = 0;
407	}
408
409	sub _draw {
410	my ($self) = @_;
411
412	my ($x, $y);
413	for (@{$self->{childs} \|\| []}) {	621	for (@{$self->{children}}) {
414	$_->move (0, $y, 0); #TODO: move to size_request	622	$_->move (0, $y);
415	$_->draw;	623
		624	if ($_ == $exp) {
		625	$_->size_allocate ($w, $h - $oh);
		626	$y += $h - $oh;
		627	} else {
416	my ($w, $h) = $_->size_request;	628	my ($cw, $h) = $_->size_request;
		629	$_->size_allocate ($w, $h);
417	$y += $h;	630	$y += $h;
		631	}
418	}	632	}
419	}	633	}
420		634
		635	#############################################################################
		636
421	package Crossfire::Client::Widget::Label;	637	package CFClient::Widget::Label;
422		638
423	our @ISA = Crossfire::Client::Widget::;	639	our @ISA = CFClient::Widget::;
424		640
425	use SDL::OpenGL;	641	use SDL::OpenGL;
426		642
427	sub new {	643	sub new {
428	my ($class, $x, $y, $z, $height, $text) = @_;	644	my ($class, %arg) = @_;
429		645
430	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);	646	# TODO: color, and make height, xyz etc. optional
		647	my $self = $class->SUPER::new (
		648	color => [1, 1, 1],
		649	height => $::FONTSIZE,
		650	text => "",
		651	layout => new CFClient::Layout,
		652	%arg
		653	);
431		654
432	$self->set_text ($text);	655	$self->set_text ($self->{text});
433		656
434	$self	657	$self
435	}	658	}
436		659
437	sub set_text {	660	sub set_text {
438	my ($self, $text) = @_;	661	my ($self, $text) = @_;
439		662
440	$self->{text} = $text;	663	$self->{text} = $text;
441	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};	664	$self->{layout}->set_markup ($text);
442		665
443	$self->update;	666	delete $self->{texture};
444	}	667	}
445		668
446	sub get_text {	669	sub get_text {
447	my ($self, $text) = @_;	670	my ($self, $text) = @_;
448		671
…		…
450	}	673	}
451		674
452	sub size_request {	675	sub size_request {
453	my ($self) = @_;	676	my ($self) = @_;
454		677
455	(	678	$self->{layout}->set_width;
		679	$self->{layout}->set_height ($self->{height});
		680	$self->{layout}->size
		681	# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
		682	# (
456	$self->{texture}{width},	683	# $self->{texture}{width},
457	$self->{texture}{height},	684	# $self->{texture}{height},
458	)	685	# )
		686	# } else {
		687	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
		688	#
		689	# ($w, $h)
		690	# }
		691	}
		692
		693	sub size_allocate {
		694	my ($self, $w, $h) = @_;
		695
		696	$self->SUPER::size_allocate ($w, $h);
		697	delete $self->{texture};
459	}	698	}
460		699
461	sub _draw {	700	sub _draw {
462	my ($self) = @_;	701	my ($self) = @_;
463		702
464	my $tex = $self->{texture};	703	my $tex = $self->{texture} \|\|= do {
		704	$self->{layout}->set_width ($self->{w});
		705	new_from_layout CFClient::Texture $self->{layout};
		706	};
465		707
466	glEnable GL_BLEND;	708	glEnable GL_BLEND;
467	glEnable GL_TEXTURE_2D;	709	glEnable GL_TEXTURE_2D;
468	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	710	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	711	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
470	glBindTexture GL_TEXTURE_2D, $tex->{name};
471		712
472	glColor 1, 1, 1, 0.8;	713	glColor @{$self->{color}};
473		714
474	glBegin GL_QUADS;	715	$tex->draw_quad (0, 0);
475	glTexCoord 0, 0; glVertex 0 , 0;
476	glTexCoord 0, 1; glVertex 0 , $tex->{height};
477	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
478	glTexCoord 1, 0; glVertex $tex->{width}, 0;
479	glEnd;
480		716
481	glDisable GL_BLEND;	717	glDisable GL_BLEND;
482	glDisable GL_TEXTURE_2D;	718	glDisable GL_TEXTURE_2D;
483	}	719	}
484		720
		721	#############################################################################
		722
485	package Crossfire::Client::Widget::TextEntry;	723	package CFClient::Widget::Entry;
486		724
487	our @ISA = Crossfire::Client::Widget::Label::;	725	our @ISA = CFClient::Widget::Label::;
488		726
489	use SDL;	727	use SDL;
490	use SDL::OpenGL;	728	use SDL::OpenGL;
491		729
492	sub key_down {	730	sub key_down {
493	my ($self, $ev) = @_;	731	my ($self, $ev) = @_;
494		732
495	my $mod = $ev->key_mod;	733	my $mod = $ev->key_mod;
496	my $sym = $ev->key_sym;	734	my $sym = $ev->key_sym;
497		735
498	$ev->set_unicode (1);
499	my $uni = $ev->key_unicode;	736	my $uni = $ev->key_unicode;
500		737
501	my $text = $self->get_text;	738	my $text = $self->get_text;
502		739
503	if ($sym == SDLK_BACKSPACE) {	740	if ($sym == SDLK_BACKSPACE) {
504	substr $text, -1, 1, '';	741	substr $text, -1, 1, '';
505
506	} elsif ($uni) {	742	} elsif ($uni) {
507	$text .= chr $uni;	743	$text .= chr $uni;
508	}	744	}
		745
509	$self->set_text ($text);	746	$self->set_text ($text);
510	}	747	}
511		748
		749	sub button_down {
		750	my ($self, $ev) = @_;
512		751
513	# XXX: TextView isn't neccessary with pango multiline text rendering	752	$self->focus_in;
514	package Crossfire::Client::Widget::TextView;	753	}
515		754
516	use strict;	755	sub mouse_motion {
517
518	our @ISA = qw/Crossfire::Client::Widget/;
519
520	use SDL::OpenGL;
521	use SDL::OpenGL::Constants;
522
523	sub new {
524	my ($class, $text, $h) = @_;	756	my ($self, $ev, $x, $y) = @_;
525	my $self = $class->SUPER::new ();	757	printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
526
527	$self->{txt_height} = $h;
528	@{$self->{lines}} = split /\r?\n/, $text;
529
530	for (split /\r?\n/, $text) {
531	$self->add_line ($_);
532	}
533	$self
534	}	758	}
535		759
536	#sub render_lines {	760	sub _draw {
537	# my ($self) = @_;	761	my ($self) = @_;
538	#	762
539	# $self->{txt_lines} = [];	763	if ($FOCUS == $self) {
540	#	764	glColor 1, 1, 1;
541	# for (@{$self->{lines}}) {	765	} else {
542	# push @{$self->{txt_lines}},	766	glColor 0.7, 0.7, 0.7;
543	# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
544	# }	767	}
545	#}
546
547	sub add_line {
548	my ($self, $line) = @_;
549	push @{$self->{lines}}, $line;
550
551	push @{$self->{txt_lines}},
552	new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
553	}
554
555	sub size_request {
556	my ($self) = @_;
557
558	my $w = 0;
559	my $h = 0;
560
561	for (@{$self->{txt_lines}}) {
562	if ($w < $_->{width}) { $w = $_->{width} }
563	$h += $_->{height};
564	}
565
566	return ($w, $h);
567	}
568
569	sub draw_line {
570	my ($self, $tex, $y) = @_;
571
572	glBindTexture GL_TEXTURE_2D, $tex->{name};
573
574	glColor 1, 0, 1;
575		768
576	glBegin GL_QUADS;	769	glBegin GL_QUADS;
577	glTexCoord 0, 0; glVertex 0 , $y;	770	glVertex 0 , 0;
578	glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};	771	glVertex 0 , $self->{h} - 1;
579	glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};	772	glVertex $self->{w} - 1, $self->{h} - 1;
580	glTexCoord 1, 0; glVertex $tex->{width}, $y;	773	glVertex $self->{w} - 1, 0;
581	glEnd;	774	glEnd;
582	}
583		775
584	sub _draw {	776	$self->SUPER::_draw;
585	my ($self) = @_;
586
587	glEnable GL_BLEND;
588	glEnable GL_TEXTURE_2D;
589	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
590
591	my $l = 0;
592	for (@{$self->{txt_lines}}) {
593	$self->draw_line ($_, $l);
594	$l += $_->{height};
595	}
596
597	glDisable GL_BLEND;
598	glDisable GL_TEXTURE_2D;
599	}	777	}
600		778
		779	#############################################################################
		780
601	package Crossfire::Client::Widget::MapWidget;	781	package CFClient::Widget::MapWidget;
602		782
603	use strict;	783	use strict;
604		784
605	use List::Util qw(min max);	785	use List::Util qw(min max);
606		786
607	use SDL;	787	use SDL;
608	use SDL::OpenGL;	788	use SDL::OpenGL;
609	use SDL::OpenGL::Constants;	789	use SDL::OpenGL::Constants;
610		790
611	our @ISA = Crossfire::Client::Widget::;	791	our @ISA = CFClient::Widget::;
		792
		793	sub new {
		794	my $class = shift;
		795
		796	$class->SUPER::new (
		797	z => -1,
		798	list => (glGenLists 1),
		799	@_
		800	)
		801	}
612		802
613	sub key_down {	803	sub key_down {
614	print "MAPKEYDOWN\n";	804	print "MAPKEYDOWN\n";
615	}	805	}
616		806
617	sub key_up {	807	sub key_up {
618	}	808	}
619		809
		810	sub size_request {
		811	(
		812	1 + int $::WIDTH / 32,
		813	1 + int $::HEIGHT / 32,
		814	)
		815	}
		816
		817	sub update {
		818	my ($self) = @_;
		819
		820	$self->{need_update} = 1;
		821	}
		822
620	sub _draw {	823	sub _draw {
621	my ($self) = @_;	824	my ($self) = @_;
622		825
		826	if (delete $self->{need_update}) {
		827	glNewList $self->{list}, GL_COMPILE;
		828
623	my $mx = $::CONN->{mapx};	829	my $mx = $::CONN->{mapx};
624	my $my = $::CONN->{mapy};	830	my $my = $::CONN->{mapy};
625		831
626	my $map = $::CONN->{map};	832	my $map = $::CONN->{map};
627		833
628	my ($xofs, $yofs);	834	my ($xofs, $yofs);
629		835
630	my $sw = 1 + int $::WIDTH / 32;	836	my $sw = 1 + int $::WIDTH / 32;
631	my $sh = 1 + int $::HEIGHT / 32;	837	my $sh = 1 + int $::HEIGHT / 32;
632		838
633	if ($::CONN->{mapw} > $sw) {	839	if ($::CONN->{mapw} > $sw) {
634	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	840	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
635	} else {	841	} else {
636	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	842	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
637	}	843	}
638		844
639	if ($::CONN->{maph} > $sh) {	845	if ($::CONN->{maph} > $sh) {
640	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	846	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
641	} else {	847	} else {
642	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	848	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
643	}	849	}
644		850
645	glEnable GL_TEXTURE_2D;	851	glEnable GL_TEXTURE_2D;
646	glEnable GL_BLEND;	852	glEnable GL_BLEND;
647	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	853	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
648		854
		855	my $sw4 = ($sw + 3) & ~3;
		856	my $darkness = "\x00" x ($sw4 * $sh);
		857
649	for my $x (0 .. $sw - 1) {	858	for my $x (0 .. $sw - 1) {
		859	my $row = $map->[$x + $xofs];
650	for my $y (0 .. $sh - 1) {	860	for my $y (0 .. $sh - 1) {
651		861
652	my $cell = $map->[$x + $xofs][$y + $yofs]	862	my $cell = $row->[$y + $yofs]
653	or next;	863	or next;
654		864
655	my $darkness = $cell->[0] * (1 / 255);	865	my $dark = $cell->[0];
656	if ($darkness < 0) {	866	if ($dark < 0) {
657	glColor 0.3, 0.3, 0.3;	867	substr $darkness, $y * $sw4 + $x, 1, chr 224;
658	} else {	868	} else {
659	glColor $darkness, $darkness, $darkness;	869	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
660	}	870	}
661		871
662	for my $num (grep $_, @$cell[1,2,3]) {	872	for my $num (grep $_, @$cell[1,2,3]) {
663	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	873	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
664		874
665	glBindTexture GL_TEXTURE_2D, $tex->{name};
666
667	my $w = $tex->{width};	875	my $w = $tex->{width};
668	my $h = $tex->{height};	876	my $h = $tex->{height};
669		877
670	my $px = ($x + 1) * 32 - $w;	878	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
671	my $py = ($y + 1) * 32 - $h;
672
673	glBegin GL_QUADS;
674	glTexCoord 0, 0; glVertex $px , $py;
675	glTexCoord 0, 1; glVertex $px , $py + $h;
676	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
677	glTexCoord 1, 0; glVertex $px + $w, $py;
678	glEnd;	879	}
679	}	880	}
680	}	881	}
		882
		883	# if (1) { # higher quality darkness
		884	# $lighting =~ s/(.)/$1$1$1/gs;
		885	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
		886	#
		887	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
		888	#
		889	# $lighting = $pb->get_pixels;
		890	# $lighting =~ s/(.)../$1/gs;
681	}	891	# }
682		892
		893	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		894	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		895
		896	$darkness = new CFClient::Texture
		897	width => $sw4,
		898	height => $sh,
		899	data => $darkness,
		900	internalformat => GL_ALPHA,
		901	format => GL_ALPHA;
		902
		903	glColor 0.45, 0.45, 0.45, 1;
		904	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
		905
683	glDisable GL_TEXTURE_2D;	906	glDisable GL_TEXTURE_2D;
684	glDisable GL_BLEND;	907	glDisable GL_BLEND;
		908
		909	glEndList;
		910	}
		911
		912	glCallList $self->{list};
685	}	913	}
686		914
687	my %DIR = (	915	my %DIR = (
688	SDLK_KP8, [1, "north"],	916	SDLK_KP8, [1, "north"],
689	SDLK_KP9, [2, "northeast"],	917	SDLK_KP9, [2, "northeast"],
…		…
733	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	961	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
734	$::CONN->send ("command run_stop");	962	$::CONN->send ("command run_stop");
735	}	963	}
736	}	964	}
737		965
738	1;	966	#############################################################################
739		967
		968	package CFClient::Widget::Animator;
		969
		970	use SDL::OpenGL;
		971
		972	our @ISA = CFClient::Widget::Bin::;
		973
		974	sub moveto {
		975	my ($self, $x, $y) = @_;
		976
		977	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
		978	$self->{speed} = 0.001;
		979	$self->{time} = 1;
		980
		981	::animation_start $self;
		982	}
		983
		984	sub animate {
		985	my ($self, $interval) = @_;
		986
		987	$self->{time} -= $interval * $self->{speed};
		988	if ($self->{time} <= 0) {
		989	$self->{time} = 0;
		990	::animation_stop $self;
		991	}
		992
		993	my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
		994
		995	$self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
		996	$self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
		997	}
		998
		999	sub _draw {
		1000	my ($self) = @_;
		1001
		1002	glPushMatrix;
		1003	glRotate $self->{time} * 1000, 0, 1, 0;
		1004	$self->{children}[0]->draw;
		1005	glPopMatrix;
		1006	}
		1007
		1008	#############################################################################
		1009
		1010	package CFClient::Widget::Toplevel;
		1011
		1012	our @ISA = CFClient::Widget::Container::;
		1013
		1014	sub size_request {
		1015	($::WIDTH, $::HEIGHT)
		1016	}
		1017
		1018	sub size_allocate {
		1019	my ($self, $w, $h) = @_;
		1020
		1021	$self->SUPER::size_allocate ($w, $h);
		1022
		1023	$_->size_allocate ($_->size_request)
		1024	for @{$self->{children}};
		1025	}
		1026
		1027	sub translate {
		1028	my ($self, $x, $y) = @_;
		1029
		1030	($x, $y)
		1031	}
		1032
		1033	sub update {
		1034	my ($self) = @_;
		1035
		1036	$self->size_allocate ($self->size_request);
		1037	::refresh ();
		1038	}
		1039
		1040	sub add {
		1041	my ($self, $widget) = @_;
		1042
		1043	$self->SUPER::add ($widget);
		1044
		1045	$widget->size_allocate ($widget->size_request);
		1046	}
		1047
		1048	sub draw {
		1049	my ($self) = @_;
		1050
		1051	$self->_draw;
		1052	}
		1053
		1054	#############################################################################
		1055
		1056	package CFClient::Widget;
		1057
		1058	$TOPLEVEL = new CFClient::Widget::Toplevel;
		1059
		1060	1
		1061

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs. Revision 1.65 by root, Tue Apr 11 14:04:27 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs.
Revision 1.65 by root, Tue Apr 11 14:04:27 2006 UTC