ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.118 by root, Sat Apr 15 23:25:00 2006 UTC vs.
Revision 1.149 by root, Sat Apr 22 23:11:32 2006 UTC

…		…
21	$FOCUS->key_up ($_[0]) if $FOCUS;	21	$FOCUS->key_up ($_[0]) if $FOCUS;
22	}	22	}
23		23
24	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	25	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->{x}, $ev->{y});
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
30		30
31	$GRAB = $widget;	31	$GRAB = $widget;
32	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
33	}	33	}
34		34
35	$BUTTON_STATE |= 1 << ($ev->button - 1);	35	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
36		36
37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	38	}
39		39
40	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	41	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->{x}, $ev->{y});
43		43
44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45		45
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47		47
48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
…		…
54	}	54	}
55	}	55	}
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->{x}, $ev->{y});
60		60
61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
…		…
87		87
88	package CFClient::UI::Base;	88	package CFClient::UI::Base;
89		89
90	use strict;	90	use strict;
91		91
92	use SDL::OpenGL;	92	use CFClient::OpenGL;
93		93
94	sub new {	94	sub new {
95	my $class = shift;	95	my $class = shift;
96		96
97	my $self = bless {	97	my $self = bless {
98	x => 0,	98	x => 0,
99	y => 0,	99	y => 0,
100	z => 0,	100	z => 0,
101	w => -1,
102	h => -1,
103	@_	101	@_
104	}, $class;	102	}, $class;
105		103
106	for (keys %$self) {	104	for (keys %$self) {
107	if (/^connect_(.*)$/) {	105	if (/^connect_(.*)$/) {
…		…
110	}	108	}
111		109
112	$self	110	$self
113	}	111	}
114		112
		113	sub show {
		114	my ($self) = @_;
		115
		116	return if $self->{parent};
		117
		118	$CFClient::UI::ROOT->add ($self);
		119	}
		120
		121	sub hide {
		122	my ($self) = @_;
		123
		124	return unless $self->{parent};
		125
		126	$self->{parent}->remove ($self);
		127	}
		128
115	sub move {	129	sub move {
116	my ($self, $x, $y, $z) = @_;	130	my ($self, $x, $y, $z) = @_;
		131
117	$self->{x} = int $x;	132	$self->{x} = int $x;
118	$self->{y} = int $y;	133	$self->{y} = int $y;
119	$self->{z} = $z if defined $z;	134	$self->{z} = $z if defined $z;
		135
		136	$self->update;
120	}	137	}
121		138
122	sub needs_redraw {	139	sub needs_redraw {
123	0	140	0
124	}	141	}
125		142
126	sub size_request {	143	sub size_request {
127	require Carp;	144	require Carp;
128	Carp::confess "size_request is abtract";	145	Carp::confess "size_request is abstract";
129	}	146	}
130		147
131	sub _size_allocate {	148	sub configure {
132	my ($self, $x, $y, $w, $h) = @_;	149	my ($self, $x, $y, $w, $h) = @_;
133		150
		151	if ($self->{aspect}) {
		152	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		153	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		154
		155	# use alignment to adjust x, y
		156
		157	$x += int +($w - $w2) * 0.5;
		158	$y += int +($h - $h2) * 0.5;
		159
		160	($w, $h) = ($w2, $h2);
		161	}
		162
		163	if ($self->{x} != $x || $self->{y} != $y) {
134	$self->{x} = $x;	164	$self->{x} = $x;
135	$self->{y} = $y;	165	$self->{y} = $y;
		166	$self->update;
		167	}
136		168
137	return unless $self->{w} != $w || $self->{h} != $h;	169	if ($self->{w} != $w || $self->{h} != $h) {
138
139	$self->{w} = $w;	170	$self->{w} = $w;
140	$self->{h} = $h;	171	$self->{h} = $h;
141		172
		173	$self->size_allocate ($w, $h);
		174	$self->update;
142	1	175	}
143	}	176	}
144		177
145	sub size_allocate {	178	sub size_allocate {
146	my ($self, $x, $y, $w, $h) = @_;	179	# nothing to be done
147
148	$self->_size_allocate ($x, $y, $w, $h);
149	}	180	}
150		181
151	# return top left coordinates	182	# return top left coordinates
152	sub _topleft {	183	sub _topleft {
153	my ($self, $x, $y) = @_;	184	my ($self, $x, $y) = @_;
…		…
176		207
177	return if $FOCUS == $self;	208	return if $FOCUS == $self;
178	return unless $self->{can_focus};	209	return unless $self->{can_focus};
179		210
180	my $focus = $FOCUS; $FOCUS = $self;	211	my $focus = $FOCUS; $FOCUS = $self;
		212
		213	$self->emit (focus_in => $focus);
		214
181	$focus->update if $focus;	215	$focus->update if $focus;
182	$FOCUS->update;	216	$FOCUS->update;
183	}	217	}
184		218
185	sub focus_out {	219	sub focus_out {
186	my ($self) = @_;	220	my ($self) = @_;
187		221
188	return unless $FOCUS == $self;	222	return unless $FOCUS == $self;
189		223
190	my $focus = $FOCUS; undef $FOCUS;	224	my $focus = $FOCUS; undef $FOCUS;
		225
		226	$self->emit (focus_out => $focus);
		227
191	$focus->update if $focus; #?	228	$focus->update if $focus; #?
192	}	229	}
193		230
194	sub mouse_motion { }	231	sub mouse_motion { }
195	sub button_up { }	232	sub button_up { }
…		…
219	glPopMatrix;	256	glPopMatrix;
220		257
221	if ($self == $HOVER && $self->{can_hover}) {	258	if ($self == $HOVER && $self->{can_hover}) {
222	my ($x, $y) = @$self{qw(x y)};	259	my ($x, $y) = @$self{qw(x y)};
223		260
224	glColor 0, 0, 1, 0.2;	261	glColor 1, 0.8, 0.5, 0.2;
225	glEnable GL_BLEND;	262	glEnable GL_BLEND;
226	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	263	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
227	glBegin GL_QUADS;	264	glBegin GL_QUADS;
228	glVertex $x , $y;	265	glVertex $x , $y;
229	glVertex $x + $self->{w}, $y;	266	glVertex $x + $self->{w}, $y;
…		…
254	my ($self, $parent) = @_;	291	my ($self, $parent) = @_;
255		292
256	Scalar::Util::weaken ($self->{parent} = $parent);	293	Scalar::Util::weaken ($self->{parent} = $parent);
257	}	294	}
258		295
		296	sub check_size {
		297	my ($self) = @_;
		298
		299	return unless $self->{parent};
		300
		301	my ($w, $h) = $self->size_request;
		302
		303	if ($w != $self->{req_w} || $h != $self->{req_h}) {
		304	$self->{req_w} = $w;
		305	$self->{req_h} = $h;
		306
		307	$self->{parent}->check_size;
		308	}
		309	}
		310
259	sub update {	311	sub update {
260	my ($self) = @_;	312	my ($self) = @_;
261		313
262	$self->{parent}->update	314	$self->{parent}->update
263	if $self->{parent};	315	if $self->{parent};
264	}	316	}
265		317
266	sub connect {	318	sub connect {
267	my ($self, $signal, $cb) = @_;	319	my ($self, $signal, $cb) = @_;
268		320
269	push @{ $self->{cb}{$signal} }, $cb;	321	push @{ $self->{signal_cb}{$signal} }, $cb;
270	}	322	}
271		323
272	sub emit {	324	sub emit {
273	my ($self, $signal, @args) = @_;	325	my ($self, $signal, @args) = @_;
274		326
		327	for my $cb (@{$self->{signal_cb}{$signal} || []}) {
275	$_->($self, @args)	328	$cb->($self, @args);
276	for @{$self->{cb}{$signal} || []};	329	}
277	}	330	}
278		331
279	sub DESTROY {	332	sub DESTROY {
280	my ($self) = @_;	333	my ($self) = @_;
281		334
…		…
287	package CFClient::UI::DrawBG;	340	package CFClient::UI::DrawBG;
288		341
289	our @ISA = CFClient::UI::Base::;	342	our @ISA = CFClient::UI::Base::;
290		343
291	use strict;	344	use strict;
292	use SDL::OpenGL;	345	use CFClient::OpenGL;
293		346
294	sub new {	347	sub new {
295	my $class = shift;	348	my $class = shift;
296		349
297	# range [value, low, high, page]	350	# range [value, low, high, page]
…		…
361	$self->{children} = [	414	$self->{children} = [
362	sort { $a->{z} <=> $b->{z} }	415	sort { $a->{z} <=> $b->{z} }
363	@{$self->{children}}, $child	416	@{$self->{children}}, $child
364	];	417	];
365		418
366	$self->{w} = $self->{h} = -1;	419	$child->check_size;
367	$self->update;
368	}	420	}
369		421
370	sub remove {	422	sub remove {
371	my ($self, $widget) = @_;	423	my ($self, $child) = @_;
372		424
		425	delete $child->{parent};
		426
373	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	427	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
374		428
375	$self->size_allocate (0, 0, $self->{w}, $self->{h});	429	$self->check_size;
376	}	430	}
377		431
378	sub find_widget {	432	sub find_widget {
379	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
380		434
…		…
410		464
411	$class->SUPER::new (children => [$child], %arg)	465	$class->SUPER::new (children => [$child], %arg)
412	}	466	}
413		467
414	sub add {	468	sub add {
415	my ($self, $widget) = @_;	469	my ($self, $child) = @_;
416		470
417	$self->{children} = [];	471	$self->{children} = [];
418		472
419	$self->SUPER::add ($widget);	473	$self->SUPER::add ($child);
420	}	474	}
421		475
422	sub remove {	476	sub remove {
423	my ($self, $widget) = @_;	477	my ($self, $widget) = @_;
424		478
…		…
433	sub size_request {	487	sub size_request {
434	$_[0]{children}[0]->size_request	488	$_[0]{children}[0]->size_request
435	}	489	}
436		490
437	sub size_allocate {	491	sub size_allocate {
438	my ($self, $x, $y, $w, $h) = @_;	492	my ($self, $w, $h) = @_;
439		493
440	$self->_size_allocate ($x, $y, $w, $h) or return;
441
442	$self->{children}[0]->size_allocate (0, 0, $w, $h);	494	$self->{children}[0]->configure (0, 0, $w, $h);
443	}	495	}
444		496
445	#############################################################################	497	#############################################################################
446		498
447	package CFClient::UI::Window;	499	package CFClient::UI::Window;
448		500
449	our @ISA = CFClient::UI::Bin::;	501	our @ISA = CFClient::UI::Bin::;
450		502
451	use SDL::OpenGL;	503	use CFClient::OpenGL;
452		504
453	sub new {	505	sub new {
454	my ($class, %arg) = @_;	506	my ($class, %arg) = @_;
455		507
456	my $self = $class->SUPER::new (%arg);	508	my $self = $class->SUPER::new (%arg);
…		…
473	$self->child->draw;	525	$self->child->draw;
474	};	526	};
475	}	527	}
476		528
477	sub size_allocate {	529	sub size_allocate {
478	my ($self, $x, $y, $w, $h) = @_;	530	my ($self, $w, $h) = @_;
479		531
480	$self->_size_allocate ($x, $y, $w, $h) or return;
481
482	$self->child->size_allocate (0, 0, $w, $h);	532	$self->child->configure (0, 0, $w, $h);
483		533
484	$self->render_chld;	534	$self->render_chld;
485	}	535	}
486		536
487	sub _draw {	537	sub _draw {
…		…
503	glDisable GL_TEXTURE_2D;	553	glDisable GL_TEXTURE_2D;
504	}	554	}
505		555
506	#############################################################################	556	#############################################################################
507		557
		558	package CFClient::UI::ViewPort;
		559
		560	our @ISA = CFClient::UI::Window::;
		561
		562	sub new { die }
		563
		564	sub size_request {
		565	my ($self) = @_;
		566
		567	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
		568	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		569
		570	@$self{qw(child_w child_h)}
		571	}
		572
		573	sub _draw {
		574	my ($self) = @_;
		575
		576	$self->{children}[1]->draw;
		577	}
		578
		579
		580	#############################################################################
		581
508	package CFClient::UI::Frame;	582	package CFClient::UI::Frame;
509		583
510	our @ISA = CFClient::UI::Bin::;	584	our @ISA = CFClient::UI::Bin::;
511		585
512	use SDL::OpenGL;	586	use CFClient::OpenGL;
513
514	sub size_request {
515	my ($self) = @_;
516	my $chld = $self->child
517	or return (0, 0);
518
519	$chld->move (2, 2);
520
521	map { $_ + 4 } $chld->size_request;
522	}
523
524	sub size_allocate {
525	my ($self, $x, $y, $w, $h) = @_;
526
527	$self->_size_allocate ($x, $y, $w, $h) or return;
528
529	$self->child->size_allocate (2, 2, $w - 4, $h - 4);
530	}
531
532	sub _draw {
533	my ($self) = @_;
534
535	my $chld = $self->child;
536
537	my ($w, $h) = $chld->size_request;
538
539	glBegin GL_QUADS;
540	glColor 0, 0, 0;
541	glVertex 0 , 0;
542	glVertex 0 , $h + 4;
543	glVertex $w + 4 , $h + 4;
544	glVertex $w + 4 , 0;
545	glEnd;
546
547	$chld->draw;
548	}
549
550	#############################################################################
551
552	package CFClient::UI::FancyFrame;
553
554	our @ISA = CFClient::UI::Bin::;
555
556	use SDL::OpenGL;
557
558	my @tex =
559	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
560	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
561		587
562	sub new {	588	sub new {
563	my $class = shift;	589	my $class = shift;
564		590
565	# TODO: user_x, user_y, overwrite moveto?
566
567	$class->SUPER::new (	591	my $self = $class->SUPER::new (
568	bg => [1, 1, 1, 1],	592	bg => [1, 1, 1, 1],
569	border_bg => [1, 1, 1, 1],	593	border_bg => [1, 1, 1, 1],
570	border => int $::FONTSIZE * 0.8,	594	border => 0.8,
571	@_	595	@_
		596	);
		597
		598	$self
		599	}
		600
		601	sub set_size {
		602	my ($self, $w, $h) = @_;
		603	$self->{req_w} = $w;
		604	$self->{req_h} = $h;
		605	$self->check_size;
		606	}
		607
		608	sub size_request {
		609	my ($self) = @_;
		610	($self->{req_w}, $self->{req_h})
		611	}
		612
		613	sub size_allocate {
		614	my ($self, $w, $h) = @_;
		615	$self->{w} = $w;
		616	$self->{h} = $h;
		617	$self->child->configure (0, 0, $w, $h);
		618	}
		619
		620	sub _draw {
		621	my ($self) = @_;
		622
		623	my ($w, $h) = ($self->{w}, $self->{h});
		624
		625	glEnable GL_BLEND;
		626	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		627	glEnable GL_TEXTURE_2D;
		628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		629
		630	# glBegin GL_QUADS;
		631	# glColor 0, 0, 0, 0;
		632	# glVertex 0 , 0;
		633	# glVertex 0 , $h;
		634	# glVertex $w, $h;
		635	# glVertex $w, 0;
		636	# glEnd;
		637
		638
		639	$self->child->draw;
		640	glDisable GL_BLEND;
		641	glDisable GL_TEXTURE_2D;
		642	}
		643
		644	#############################################################################
		645
		646	package CFClient::UI::FancyFrame;
		647
		648	our @ISA = CFClient::UI::Bin::;
		649
		650	use CFClient::OpenGL;
		651
		652	my @tex =
		653	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		654	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		655
		656	sub new {
		657	my $class = shift;
		658
		659	# TODO: user_x, user_y, overwrite moveto?
		660
		661	my $self = $class->SUPER::new (
		662	bg => [1, 1, 1, 1],
		663	border_bg => [1, 1, 1, 1],
		664	border => 0.8,
		665	@_
		666	);
		667
		668	$self->{title} &&= new CFClient::UI::Label
		669	align => 0,
		670	valign => 1,
		671	text => $self->{title},
		672	fontsize => 1;
		673
		674	$self
		675	}
		676
		677	sub border {
		678	int $_[0]{border} * $::FONTSIZE
		679	}
		680
		681	sub size_request {
		682	my ($self) = @_;
		683
		684	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		685
		686	my ($w, $h) = $self->SUPER::size_request;
		687
		688	(
		689	$w + $self->border * 2,
		690	$h + $self->border * 2,
572	)	691	)
573	}	692	}
574		693
575	sub size_request {
576	my ($self) = @_;
577
578	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
579
580	my ($w, $h) = $self->SUPER::size_request;
581
582	(
583	$w + $self->{border} * 2,
584	$h + $self->{border} * 2,
585	)
586	}
587
588	sub size_allocate {	694	sub size_allocate {
589	my ($self, $x, $y, $w, $h) = @_;	695	my ($self, $w, $h) = @_;
590		696
591	$self->_size_allocate ($x, $y, $w, $h) or return;
592
593	$h -= List::Util::max 0, $self->{border} * 2;	697	$h -= List::Util::max 0, $self->border * 2;
594	$w -= List::Util::max 0, $self->{border} * 2;	698	$w -= List::Util::max 0, $self->border * 2;
595		699
		700	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		701	if $self->{title};
		702
596	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);	703	$self->child->configure ($self->border, $self->border, $w, $h);
597	}	704	}
598		705
599	sub button_down {	706	sub button_down {
600	my ($self, $ev, $x, $y) = @_;	707	my ($self, $ev, $x, $y) = @_;
601		708
		709	my $border = $self->border;
		710
602	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	711	if ($x < $self->{w} && $x >= $self->{w} - $border
603	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	712	&& $y < $self->{h} && $y >= $self->{h} - $border) {
604		713
605	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	714	my ($ox, $oy) = ($ev->{x}, $ev->{y});
606	my ($bw, $bh) = ($self->{w}, $self->{h});	715	my ($bw, $bh) = ($self->{w}, $self->{h});
607		716
608	$self->{motion} = sub {	717	$self->{motion} = sub {
609	my ($ev, $x, $y) = @_;	718	my ($ev, $x, $y) = @_;
610		719
611	($x, $y) = ($ev->motion_x, $ev->motion_y);	720	($x, $y) = ($ev->{x}, $ev->{y});
612		721
613	$self->{user_w} = $bw + $x - $ox;	722	$self->{user_w} = $bw + $x - $ox;
614	$self->{user_h} = $bh + $y - $oy;	723	$self->{user_h} = $bh + $y - $oy;
615	$self->update;	724	$self->check_size;
616	};	725	};
617		726
618	} elsif ($x >= 0 && $x < $self->{w}	727	} elsif ($x >= 0 && $x < $self->{w}
619	&& $y >= 0 && $y < $self->{border}) {	728	&& $y >= 0 && $y < $border) {
620		729
621	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	730	my ($ox, $oy) = ($ev->{x}, $ev->{y});
622	my ($bx, $by) = ($self->{x}, $self->{y});	731	my ($bx, $by) = ($self->{x}, $self->{y});
623		732
624	$self->{motion} = sub {	733	$self->{motion} = sub {
625	my ($ev, $x, $y) = @_;	734	my ($ev, $x, $y) = @_;
626		735
627	($x, $y) = ($ev->motion_x, $ev->motion_y);	736	($x, $y) = ($ev->{x}, $ev->{y});
628		737
629	$self->move ($bx + $x - $ox, $by + $y - $oy);	738	$self->move ($bx + $x - $ox, $by + $y - $oy);
630	$self->update;	739	$self->update;
631	};	740	};
632	}	741	}
…		…
653	glEnable GL_BLEND;	762	glEnable GL_BLEND;
654	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	763	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
655	glEnable GL_TEXTURE_2D;	764	glEnable GL_TEXTURE_2D;
656	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	765	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
657		766
		767	my $border = $self->border;
		768
658	glColor @{ $self->{border_bg} };	769	glColor @{ $self->{border_bg} };
659	$tex[1]->draw_quad (0, 0, $w, $self->{border});	770	$tex[1]->draw_quad (0, 0, $w, $border);
660	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	771	$tex[3]->draw_quad (0, $border, $border, $ch);
661	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	772	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
662	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	773	$tex[4]->draw_quad (0, $h - $border, $w, $border);
663		774
664	my $bg = $tex[0];	775	my $bg = $tex[0];
665		776
666	# TODO: repeat texture not scale	777	# TODO: repeat texture not scale
667	my $rep_x = $cw / $bg->{w};	778	my $rep_x = $cw / $bg->{w};
…		…
670	glColor @{ $self->{bg} };	781	glColor @{ $self->{bg} };
671		782
672	$bg->{s} = $rep_x;	783	$bg->{s} = $rep_x;
673	$bg->{t} = $rep_y;	784	$bg->{t} = $rep_y;
674	$bg->{wrap_mode} = 1;	785	$bg->{wrap_mode} = 1;
675	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	786	$bg->draw_quad ($border, $border, $cw, $ch);
676		787
677	glDisable GL_TEXTURE_2D;	788	glDisable GL_TEXTURE_2D;
678	glDisable GL_BLEND;	789	glDisable GL_BLEND;
679		790
		791	$self->{title}->draw if $self->{title};
680	$self->child->draw;	792	$self->child->draw;
681	}	793	}
682		794
683	#############################################################################	795	#############################################################################
684		796
…		…
686		798
687	our @ISA = CFClient::UI::Base::;	799	our @ISA = CFClient::UI::Base::;
688		800
689	use List::Util qw(max sum);	801	use List::Util qw(max sum);
690		802
691	use SDL::OpenGL;	803	use CFClient::OpenGL;
692		804
693	sub new {	805	sub new {
694	my $class = shift;	806	my $class = shift;
695		807
696	$class->SUPER::new (	808	$class->SUPER::new (
…		…
703	my ($self, $x, $y, $child) = @_;	815	my ($self, $x, $y, $child) = @_;
704		816
705	$child->set_parent ($self);	817	$child->set_parent ($self);
706	$self->{children}[$y][$x] = $child;	818	$self->{children}[$y][$x] = $child;
707		819
708	$self->{w} = $self->{h} = -1;	820	$child->check_size;
709	$self->update;
710	}	821	}
711		822
712	# TODO: move to container class maybe? send childs a signal on removal?	823	# TODO: move to container class maybe? send childs a signal on removal?
713	sub clear {	824	sub clear {
714	my ($self) = @_;	825	my ($self) = @_;
…		…
727	or next;	838	or next;
728		839
729	for my $x (0 .. $#$row) {	840	for my $x (0 .. $#$row) {
730	my $widget = $row->[$x]	841	my $widget = $row->[$x]
731	or next;	842	or next;
732	my ($w, $h) = $widget->size_request;	843	my ($w, $h) = @$widget{qw(req_w req_h)};
733		844
734	$w[$x] = max $w[$x], $w;	845	$w[$x] = max $w[$x], $w;
735	$h[$y] = max $h[$y], $h;	846	$h[$y] = max $h[$y], $h;
736	}	847	}
737	}	848	}
…		…
749	(sum @$hs),	860	(sum @$hs),
750	)	861	)
751	}	862	}
752		863
753	sub size_allocate {	864	sub size_allocate {
754	my ($self, $x, $y, $w, $h) = @_;	865	my ($self, $w, $h) = @_;
755
756	$self->_size_allocate ($x, $y, $w, $h) or return;
757		866
758	my ($ws, $hs) = $self->get_wh;	867	my ($ws, $hs) = $self->get_wh;
759		868
760	my $req_w = sum @$ws;	869	my $req_w = sum @$ws;
761	my $req_h = sum @$hs;	870	my $req_h = sum @$hs;
…		…
783		892
784	for my $c (0 .. $#$row) {	893	for my $c (0 .. $#$row) {
785	my $col_w = $ws->[$c];	894	my $col_w = $ws->[$c];
786		895
787	if (my $widget = $row->[$c]) {	896	if (my $widget = $row->[$c]) {
788	$widget->size_allocate ($x, $y, $col_w, $row_h);	897	$widget->configure ($x, $y, $col_w, $row_h);
789	}	898	}
790		899
791	$x += $col_w;	900	$x += $col_w;
792	}	901	}
793		902
…		…
838	(List::Util::max map $_->[1], @alloc),	947	(List::Util::max map $_->[1], @alloc),
839	)	948	)
840	}	949	}
841		950
842	sub size_allocate {	951	sub size_allocate {
843	my ($self, $x, $y, $w, $h) = @_;	952	my ($self, $w, $h) = @_;
844
845	$self->_size_allocate ($x, $y, $w, $h);
846		953
847	($h, $w) = ($w, $h);	954	($h, $w) = ($w, $h);
848		955
849	my $children = $self->{children};	956	my $children = $self->{children};
850		957
851	my @h = map +($_->size_request)[0], @$children;	958	my @h = map $_->{req_w}, @$children;
852		959
853	my $req_h = List::Util::sum @h;	960	my $req_h = List::Util::sum @h;
854		961
855	if ($req_h > $h) {	962	if ($req_h > $h) {
856	# ah well, not enough space	963	# ah well, not enough space
…		…
872		979
873	my $y = 0;	980	my $y = 0;
874	for (0 .. $#$children) {	981	for (0 .. $#$children) {
875	my $child = $children->[$_];	982	my $child = $children->[$_];
876	my $h = $h[$_];	983	my $h = $h[$_];
877	$child->size_allocate ($y, 0, $h, $w);	984	$child->configure ($y, 0, $h, $w);
878		985
879	$y += $h;	986	$y += $h;
880	}	987	}
		988
		989	1
881	}	990	}
882		991
883	#############################################################################	992	#############################################################################
884		993
885	package CFClient::UI::VBox;	994	package CFClient::UI::VBox;
…		…
898	(List::Util::sum map $_->[1], @alloc),	1007	(List::Util::sum map $_->[1], @alloc),
899	)	1008	)
900	}	1009	}
901		1010
902	sub size_allocate {	1011	sub size_allocate {
903	my ($self, $x, $y, $w, $h) = @_;	1012	my ($self, $w, $h) = @_;
904
905	$self->_size_allocate ($x, $y, $w, $h);
906		1013
907	my $children = $self->{children};	1014	my $children = $self->{children};
908		1015
909	my @h = map +($_->size_request)[1], @$children;	1016	my @h = map $_->{req_h}, @$children;
910		1017
911	my $req_h = List::Util::sum @h;	1018	my $req_h = List::Util::sum @h;
912		1019
913	if ($req_h > $h) {	1020	if ($req_h > $h) {
914	# ah well, not enough space	1021	# ah well, not enough space
…		…
928		1035
929	my $y = 0;	1036	my $y = 0;
930	for (0 .. $#$children) {	1037	for (0 .. $#$children) {
931	my $child = $children->[$_];	1038	my $child = $children->[$_];
932	my $h = $h[$_];	1039	my $h = $h[$_];
933	$child->size_allocate (0, $y, $w, $h);	1040	$child->configure (0, $y, $w, $h);
934		1041
935	$y += $h;	1042	$y += $h;
936	}	1043	}
		1044
		1045	1
937	}	1046	}
938		1047
939	#############################################################################	1048	#############################################################################
940		1049
941	package CFClient::UI::Label;	1050	package CFClient::UI::Label;
942		1051
943	our @ISA = CFClient::UI::Base::;	1052	our @ISA = CFClient::UI::Base::;
944		1053
945	use SDL::OpenGL;	1054	use CFClient::OpenGL;
946		1055
947	sub new {	1056	sub new {
948	my ($class, %arg) = @_;	1057	my ($class, %arg) = @_;
949		1058
950	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
951	fg => [1, 1, 1],	1060	fg => [1, 1, 1],
952	fontsize => $::FONTSIZE,	1061	fontsize => 1,
953	text => "",	1062	text => "",
954	align => -1,	1063	align => -1,
955	valign => -1,	1064	valign => -1,
956	padding => 2,	1065	padding => 2,
957	layout => new CFClient::Layout,	1066	layout => new CFClient::Layout,
958	%arg	1067	%arg
959	);	1068	);
960		1069
961	$self->set_text ($self->{text});	1070	if (exists $self->{template}) {
		1071	my $layout = new CFClient::Layout;
		1072	$layout->set_text (delete $self->{template});
		1073	$self->{template} = $layout;
		1074	}
		1075
		1076	$self->set_text (delete $self->{text}) if exists $self->{text};
		1077	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
962		1078
963	$self	1079	$self
964	}	1080	}
965		1081
966	sub escape_text {	1082	sub escape_text {
…		…
974	}	1090	}
975		1091
976	sub set_text {	1092	sub set_text {
977	my ($self, $text) = @_;	1093	my ($self, $text) = @_;
978		1094
979	$self->{text} = $text;
980	$self->{layout}->set_markup ($text);	1095	$self->{layout}->set_text ($text);
981		1096
982	delete $self->{texture};	1097	delete $self->{texture};
983	# $self->{w} = $self->{h} = -1;	1098	$self->check_size;
984	$self->update;	1099	$self->update;
985	}	1100	}
986		1101
987	sub get_text {	1102	sub set_markup {
988	my ($self, $text) = @_;	1103	my ($self, $markup) = @_;
989		1104
990	$self->{text}	1105	$self->{layout}->set_markup ($markup);
		1106
		1107	delete $self->{texture};
		1108	$self->check_size;
		1109	$self->update;
991	}	1110	}
992		1111
993	sub size_request {	1112	sub size_request {
994	my ($self) = @_;	1113	my ($self) = @_;
995		1114
996	$self->{layout}->set_width;	1115	$self->{layout}->set_width;
997	$self->{layout}->set_height ($self->{fontsize});	1116	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1117
998	my ($w, $h) = $self->{layout}->size;	1118	my ($w, $h) = $self->{layout}->size;
		1119
		1120	if (exists $self->{template}) {
		1121	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1122
		1123	my ($w2, $h2) = $self->{template}->size;
		1124
		1125	$w = List::Util::max $w, $w2;
		1126	$h = List::Util::max $h, $h2;
		1127	}
999		1128
1000	(	1129	(
1001	$w + $self->{padding} * 2,	1130	$w + $self->{padding} * 2,
1002	$h + $self->{padding} * 2,	1131	$h + $self->{padding} * 2,
1003	)	1132	)
1004	}	1133	}
1005		1134
1006	sub size_allocate {	1135	sub size_allocate {
1007	my ($self, $x, $y, $w, $h) = @_;	1136	my ($self, $w, $h) = @_;
1008
1009	$self->_size_allocate ($x, $y, $w, $h) or return;
1010		1137
1011	delete $self->{texture};	1138	delete $self->{texture};
1012	}	1139	}
1013		1140
1014	sub update {	1141	sub set_fontsize {
1015	my ($self) = @_;	1142	my ($self, $fontsize) = @_;
1016		1143
1017	delete $self->{texture};	1144	$self->{fontsize} = $fontsize;
1018	$self->SUPER::update;	1145	$self->check_size;
1019	}	1146	}
1020		1147
1021	sub _draw {	1148	sub _draw {
1022	my ($self) = @_;	1149	my ($self) = @_;
1023		1150
1024	my $tex = $self->{texture} ||= do {	1151	my $tex = $self->{texture} ||= do {
1025	$self->{layout}->set_width ($self->{w});	1152	$self->{layout}->set_width ($self->{w});
1026	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});	1153	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1027	new_from_layout CFClient::Texture $self->{layout}	1154	new_from_layout CFClient::Texture $self->{layout}
1028	};	1155	};
1029		1156
1030	glEnable GL_BLEND;	1157	glEnable GL_BLEND;
1031	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1158	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1032	glEnable GL_TEXTURE_2D;	1159	glEnable GL_TEXTURE_2D;
1033	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1160	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1034		1161
1035	glColor @{$self->{fg}};	1162	glColor @{$self->{fg}};
1036		1163
1037	my $x =	1164	$self->{ox} = int (
1038	$self->{align} < 0 ? $self->{padding}	1165	$self->{align} < 0 ? $self->{padding}
1039	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1166	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1040	: ($self->{w} - $tex->{w}) * 0.5;	1167	: ($self->{w} - $tex->{w}) * 0.5
		1168	);
1041		1169
1042	my $y =	1170	$self->{oy} = int (
1043	$self->{valign} < 0 ? $self->{padding}	1171	$self->{valign} < 0 ? $self->{padding}
1044	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1172	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1045	: ($self->{h} - $tex->{h}) * 0.5;	1173	: ($self->{h} - $tex->{h}) * 0.5
		1174	);
1046		1175
1047	$tex->draw_quad (int $x, int $y);	1176	$tex->draw_quad ($self->{ox}, $self->{oy});
1048		1177
1049	glDisable GL_TEXTURE_2D;	1178	glDisable GL_TEXTURE_2D;
1050	glDisable GL_BLEND;	1179	glDisable GL_BLEND;
1051	}	1180	}
1052		1181
1053	#############################################################################	1182	#############################################################################
1054		1183
1055	package CFClient::UI::Entry;	1184	package CFClient::UI::EntryBase;
1056		1185
1057	our @ISA = CFClient::UI::Label::;	1186	our @ISA = CFClient::UI::Label::;
1058		1187
1059	use SDL;	1188	use CFClient::OpenGL;
1060	use SDL::OpenGL;
1061		1189
1062	sub new {	1190	sub new {
1063	my $class = shift;	1191	my $class = shift;
1064		1192
1065	$class->SUPER::new (	1193	$class->SUPER::new (
…		…
1075	}	1203	}
1076		1204
1077	sub _set_text {	1205	sub _set_text {
1078	my ($self, $text) = @_;	1206	my ($self, $text) = @_;
1079		1207
1080	my $old_text = $self->{text};	1208	delete $self->{cur_h};
		1209
		1210	return if $self->{text} eq $text;
		1211
		1212	delete $self->{texture};
1081		1213
1082	$self->{last_activity} = $::NOW;	1214	$self->{last_activity} = $::NOW;
1083
1084	$self->{text} = $text;	1215	$self->{text} = $text;
1085	$self->{layout}->set_width ($self->{w});
1086	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1087		1216
1088	$text =~ s/./*/g if $self->{hidden};	1217	$text =~ s/./*/g if $self->{hidden};
		1218	$self->{layout}->set_text ("$text ");
1089		1219
1090	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1220	$self->emit (changed => $self->{text});
		1221	}
1091		1222
1092	$text = substr $text, 0, $self->{cursor};	1223	sub get_text {
1093	utf8::encode $text;	1224	$_[0]{text}
1094
1095	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1096
1097	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1098	if $old_text ne $self->{text};
1099	}	1225	}
1100		1226
1101	sub size_request {	1227	sub size_request {
1102	my ($self) = @_;	1228	my ($self) = @_;
1103		1229
…		…
1105		1231
1106	($w + 1, $h) # add 1 for cursor	1232	($w + 1, $h) # add 1 for cursor
1107	}	1233	}
1108		1234
1109	sub size_allocate {	1235	sub size_allocate {
1110	my ($self, $x, $y, $w, $h) = @_;	1236	my ($self, $w, $h) = @_;
1111		1237
1112	$self->SUPER::size_allocate ($x, $y, $w, $h);	1238	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1113
1114	$self->_set_text ($self->{text});
1115	}	1239	}
1116		1240
1117	sub set_text {	1241	sub set_text {
1118	my ($self, $text) = @_;	1242	my ($self, $text) = @_;
1119		1243
…		…
1123	}	1247	}
1124		1248
1125	sub key_down {	1249	sub key_down {
1126	my ($self, $ev) = @_;	1250	my ($self, $ev) = @_;
1127		1251
1128	my $mod = $ev->key_mod;	1252	my $mod = $ev->{mod};
1129	my $sym = $ev->key_sym;	1253	my $sym = $ev->{sym};
1130
1131	my $uni = $ev->key_unicode;	1254	my $uni = $ev->{unicode};
1132		1255
1133	my $text = $self->get_text;	1256	my $text = $self->get_text;
1134		1257
1135	if ($sym == SDLK_BACKSPACE) {	1258	if ($sym == 8) {
1136	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1259	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1137	} elsif ($sym == SDLK_DELETE) {	1260	} elsif ($sym == 127) {
1138	substr $text, $self->{cursor}, 1, "";	1261	substr $text, $self->{cursor}, 1, "";
1139	} elsif ($sym == SDLK_LEFT) {	1262	} elsif ($sym == CFClient::SDLK_LEFT) {
1140	--$self->{cursor} if $self->{cursor};	1263	--$self->{cursor} if $self->{cursor};
1141	} elsif ($sym == SDLK_RIGHT) {	1264	} elsif ($sym == CFClient::SDLK_RIGHT) {
1142	++$self->{cursor} if $self->{cursor} < length $self->{text};	1265	++$self->{cursor} if $self->{cursor} < length $self->{text};
1143	} elsif ($sym == SDLK_HOME) {	1266	} elsif ($sym == CFClient::SDLK_HOME) {
1144	$self->{cursor} = 0;	1267	$self->{cursor} = 0;
1145	} elsif ($sym == SDLK_END) {	1268	} elsif ($sym == CFClient::SDLK_END) {
1146	$self->{cursor} = length $text;	1269	$self->{cursor} = length $text;
1147	} elsif ($sym == SDLK_ESCAPE) {	1270	} elsif ($sym == 27) {
1148	$self->emit ('escape');	1271	$self->emit ('escape');
1149	} elsif ($uni) {	1272	} elsif ($uni) {
1150	substr $text, $self->{cursor}++, 0, chr $uni;	1273	substr $text, $self->{cursor}++, 0, chr $uni;
1151	}	1274	}
1152		1275
…		…
1207		1330
1208	$self->SUPER::_draw;	1331	$self->SUPER::_draw;
1209		1332
1210	#TODO: force update every cursor change :(	1333	#TODO: force update every cursor change :(
1211	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1334	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1335
		1336	unless (exists $self->{cur_h}) {
		1337	my $text = substr $self->{text}, 0, $self->{cursor};
		1338	utf8::encode $text;
		1339
		1340	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1341	}
		1342
1212	glColor @{$self->{fg}};	1343	glColor @{$self->{fg}};
1213	glBegin GL_LINES;	1344	glBegin GL_LINES;
1214	glVertex $self->{cur_x}, $self->{cur_y};
1215	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1345	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1346	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1216	glEnd;	1347	glEnd;
1217	}	1348	}
1218	}	1349	}
1219		1350
1220	package CFClient::UI::LineEntry;	1351	package CFClient::UI::Entry;
1221		1352
1222	our @ISA = CFClient::UI::Entry::;	1353	our @ISA = CFClient::UI::EntryBase::;
1223		1354
1224	use SDL;	1355	use CFClient::OpenGL;
1225	use SDL::OpenGL;
1226		1356
1227	sub key_down {	1357	sub key_down {
1228	my ($self, $ev) = @_;	1358	my ($self, $ev) = @_;
1229		1359
1230	my $sym = $ev->key_sym;	1360	my $sym = $ev->{sym};
1231		1361
1232	if ($sym == SDLK_RETURN) {	1362	if ($sym == 13) {
1233	$self->emit (activate => $self->get_text);	1363	$self->emit (activate => $self->get_text);
1234	$self->update;	1364	$self->update;
1235		1365
1236	} else {	1366	} else {
1237	$self->SUPER::key_down ($ev);	1367	$self->SUPER::key_down ($ev);
…		…
1243		1373
1244	package CFClient::UI::Button;	1374	package CFClient::UI::Button;
1245		1375
1246	our @ISA = CFClient::UI::Label::;	1376	our @ISA = CFClient::UI::Label::;
1247		1377
1248	use SDL;	1378	use CFClient::OpenGL;
1249	use SDL::OpenGL;
1250		1379
1251	my @tex =	1380	my @tex =
1252	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1381	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1253	qw(b1_button_active.png);	1382	qw(b1_button_active.png);
1254		1383
1255	sub new {	1384	sub new {
1256	my $class = shift;	1385	my $class = shift;
1257		1386
1258	$class->SUPER::new (	1387	$class->SUPER::new (
1259	padding => 4,	1388	padding => 4,
1260	fg => [1, 1, 1],	1389	fg => [1, 1, 1],
1261	bg => [1, 1, 1, 0.2],	1390	bg => [1, 1, 1, 0.2],
1262	active_fg => [1, 1, 0],	1391	active_fg => [0, 0, 1],
1263	can_hover => 1,	1392	can_hover => 1,
		1393	align => 0,
		1394	valign => 0,
1264	@_	1395	@_
1265	)	1396	)
1266	}	1397	}
1267		1398
1268	sub button_up {	1399	sub button_up {
…		…
1276		1407
1277	sub _draw {	1408	sub _draw {
1278	my ($self) = @_;	1409	my ($self) = @_;
1279		1410
1280	local $self->{fg} = $self->{fg};	1411	local $self->{fg} = $self->{fg};
1281	my $tex = $tex[0];
1282
1283	glEnable GL_BLEND;
1284	glEnable GL_TEXTURE_2D;
1285	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1286		1412
1287	if ($GRAB == $self) {	1413	if ($GRAB == $self) {
1288	$self->{fg} = $self->{active_fg};	1414	$self->{fg} = $self->{active_fg};
1289	}	1415	}
1290		1416
1291	glBindTexture GL_TEXTURE_2D, $tex->{name};	1417	glEnable GL_BLEND;
		1418	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1419	glEnable GL_TEXTURE_2D;
1292	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1420	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1421	glColor 0, 0, 0, 1;
1293		1422
1294	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1423	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1295		1424
1296	glDisable GL_TEXTURE_2D;	1425	glDisable GL_TEXTURE_2D;
1297	glDisable GL_BLEND;	1426	glDisable GL_BLEND;
1298		1427
1299	$self->SUPER::_draw;	1428	$self->SUPER::_draw;
…		…
1304	package CFClient::UI::CheckBox;	1433	package CFClient::UI::CheckBox;
1305		1434
1306	our @ISA = CFClient::UI::DrawBG::;	1435	our @ISA = CFClient::UI::DrawBG::;
1307		1436
1308	my @tex =	1437	my @tex =
1309	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1438	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1310	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1439	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1311		1440
1312	use SDL;	1441	use CFClient::OpenGL;
1313	use SDL::OpenGL;
1314		1442
1315	sub new {	1443	sub new {
1316	my $class = shift;	1444	my $class = shift;
1317		1445
1318	$class->SUPER::new (	1446	$class->SUPER::new (
…		…
1329	my ($self) = @_;	1457	my ($self) = @_;
1330		1458
1331	($self->{padding} * 2 + 6) x 2	1459	($self->{padding} * 2 + 6) x 2
1332	}	1460	}
1333		1461
1334	sub size_allocate {
1335	my ($self, $x, $y, $w, $h) = @_;
1336
1337	$self->_size_allocate ($x, $y, $w, $h);
1338	}
1339
1340	sub button_down {	1462	sub button_down {
1341	my ($self, $ev, $x, $y) = @_;	1463	my ($self, $ev, $x, $y) = @_;
1342		1464
1343	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1465	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1344	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1466	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
…		…
1370	glDisable GL_BLEND;	1492	glDisable GL_BLEND;
1371	}	1493	}
1372		1494
1373	#############################################################################	1495	#############################################################################
1374		1496
		1497	package CFClient::UI::Image;
		1498
		1499	our @ISA = CFClient::UI::Base::;
		1500
		1501	use CFClient::OpenGL;
		1502	use Carp qw/confess/;
		1503
		1504	our %loaded_images;
		1505
		1506	sub new {
		1507	my $class = shift;
		1508
		1509	my $self = $class->SUPER::new (@_);
		1510
		1511	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1512
		1513	$loaded_images{$self->{image}} ||=
		1514	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1515
		1516	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1517
		1518	Scalar::Util::weaken $loaded_images{$self->{image}};
		1519
		1520	$self->{aspect} = $tex->{w} / $tex->{h};
		1521
		1522	$self
		1523	}
		1524
		1525	sub size_request {
		1526	my ($self) = @_;
		1527
		1528	($self->{tex}->{w}, $self->{tex}->{h})
		1529	}
		1530
		1531	sub _draw {
		1532	my ($self) = @_;
		1533
		1534	my $tex = $self->{tex};
		1535
		1536	my ($w, $h) = ($self->{w}, $self->{h});
		1537
		1538	if ($self->{rot90}) {
		1539	glRotate 90, 0, 0, 1;
		1540	glTranslate 0, -$self->{w}, 0;
		1541
		1542	($w, $h) = ($h, $w);
		1543	}
		1544
		1545	glEnable GL_BLEND;
		1546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1547	glEnable GL_TEXTURE_2D;
		1548	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1549
		1550	$tex->draw_quad (0, 0, $w, $h);
		1551
		1552	glDisable GL_BLEND;
		1553	glDisable GL_TEXTURE_2D;
		1554	}
		1555
		1556	#############################################################################
		1557
		1558	package CFClient::UI::VGauge;
		1559
		1560	our @ISA = CFClient::UI::Base::;
		1561
		1562	use CFClient::OpenGL;
		1563
		1564	my %tex = (
		1565	food => [
		1566	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1567	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1568	],
		1569	grace => [
		1570	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1571	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1572	],
		1573	hp => [
		1574	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1575	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1576	],
		1577	mana => [
		1578	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1579	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1580	],
		1581	);
		1582
		1583	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1584	sub new {
		1585	my $class = shift;
		1586
		1587	my $self = $class->SUPER::new (
		1588	type => 'food',
		1589	@_
		1590	);
		1591
		1592	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1593
		1594	$self
		1595	}
		1596
		1597	sub size_request {
		1598	my ($self) = @_;
		1599
		1600	#my $tex = $tex{$self->{type}}[0];
		1601	#@$tex{qw(w h)}
		1602	(0, 0)
		1603	}
		1604
		1605	sub set_max {
		1606	my ($self, $max) = @_;
		1607
		1608	$self->{max_val} = $max;
		1609	}
		1610
		1611	sub set_value {
		1612	my ($self, $val, $max) = @_;
		1613
		1614	$self->set_max ($max)
		1615	if defined $max;
		1616
		1617	$max = $self->{max_val};
		1618	$self->{val} = $val;
		1619
		1620	$self->update;
		1621	}
		1622
		1623	sub _draw {
		1624	my ($self) = @_;
		1625
		1626	my $tex = $tex{$self->{type}};
		1627
		1628	my ($w, $h) = ($self->{w}, $self->{h});
		1629
		1630	if ($self->{vertical}) {
		1631	glRotate 90, 0, 0, 1;
		1632	glTranslate 0, -$self->{w}, 0;
		1633
		1634	($w, $h) = ($h, $w);
		1635	}
		1636
		1637	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1638	$ycut = 1 if $self->{val} > $self->{max_val};
		1639
		1640	my $t1 = $tex->[0];
		1641	my $t2 = $tex->[1];
		1642
		1643	glEnable GL_BLEND;
		1644	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1645	glEnable GL_TEXTURE_2D;
		1646	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1647
		1648	my $h1 = $self->{h} - $ycut * $self->{h};
		1649	my $h2 = $ycut * $self->{h};
		1650
		1651	glBindTexture GL_TEXTURE_2D, $t1->{name};
		1652	glBegin GL_QUADS;
		1653	glTexCoord 0 , 0; glVertex 0 , 0;
		1654	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
		1655	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
		1656	glTexCoord $t1->{s}, 0; glVertex $w, 0;
		1657	glEnd;
		1658
		1659	glBindTexture GL_TEXTURE_2D, $t2->{name};
		1660	glBegin GL_QUADS;
		1661	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
		1662	glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
		1663	glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
		1664	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
		1665	glEnd;
		1666
		1667	glDisable GL_BLEND;
		1668	glDisable GL_TEXTURE_2D;
		1669	}
		1670
		1671	#############################################################################
		1672
		1673	package CFClient::UI::Gauge;
		1674
		1675	our @ISA = CFClient::UI::VBox::;
		1676
		1677	sub new {
		1678	my ($class, %arg) = shift;
		1679
		1680	my $self = $class->SUPER::new (
		1681	@_,
		1682	);
		1683
		1684	$self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
		1685	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
		1686	$self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
		1687
		1688	$self
		1689	}
		1690
		1691	sub set_fontsize {
		1692	my ($self, $fsize) = @_;
		1693
		1694	$self->{value}->set_fontsize ($fsize);
		1695	$self->{max} ->set_fontsize ($fsize);
		1696	}
		1697
		1698	sub set_value {
		1699	my ($self, $val, $max) = @_;
		1700
		1701	$self->set_max ($max)
		1702	if defined $max;
		1703
		1704	$self->{gauge}->set_value ($val, $max);
		1705	$self->{value}->set_text ($val);
		1706	}
		1707
		1708	sub set_max {
		1709	my ($self, $max) = @_;
		1710
		1711	$self->{gauge}->set_max ($max);
		1712	$self->{max}->set_text ($max);
		1713	}
		1714
		1715	#############################################################################
		1716
1375	package CFClient::UI::Slider;	1717	package CFClient::UI::Slider;
1376		1718
1377	use strict;	1719	use strict;
1378		1720
1379	use SDL::OpenGL;	1721	use CFClient::OpenGL;
1380		1722
1381	our @ISA = CFClient::UI::DrawBG::;	1723	our @ISA = CFClient::UI::DrawBG::;
1382		1724
1383	my @tex =	1725	my @tex =
1384	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1726	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1394	# TODO: calculations are off	1736	# TODO: calculations are off
1395	my $self = $class->SUPER::new (	1737	my $self = $class->SUPER::new (
1396	fg => [1, 1, 1],	1738	fg => [1, 1, 1],
1397	active_fg => [0, 0, 0],	1739	active_fg => [0, 0, 0],
1398	range => [0, 0, 100, 10],	1740	range => [0, 0, 100, 10],
1399	req_w => 40,	1741	req_w => 20,
1400	req_h => 13,	1742	req_h => 20,
1401	vertical => 0,	1743	vertical => 0,
1402	can_hover => 1,	1744	can_hover => 1,
1403	inner_pad => 5,	1745	inner_pad => 5,
1404	@_	1746	@_
1405	);	1747	);
…		…
1509		1851
1510	package CFClient::UI::TextView;	1852	package CFClient::UI::TextView;
1511		1853
1512	our @ISA = CFClient::UI::HBox::;	1854	our @ISA = CFClient::UI::HBox::;
1513		1855
1514	use SDL::OpenGL;	1856	use CFClient::OpenGL;
1515		1857
1516	sub new {	1858	sub new {
1517	my $class = shift;	1859	my $class = shift;
1518		1860
1519	my $self = $class->SUPER::new (	1861	my $self = $class->SUPER::new (
1520	req_w => $::WIDTH / 6,
1521	req_h => $::HEIGHT / 6,
1522	fontsize => $::FONTSIZE,	1862	fontsize => 1,
1523	@_,	1863	@_,
1524		1864
1525	layout => (new CFClient::Layout),	1865	layout => (new CFClient::Layout),
1526	par => [],	1866	par => [],
1527	height => 0,	1867	height => 0,
…		…
1548	sub text_height {	1888	sub text_height {
1549	my ($self, $text) = @_;	1889	my ($self, $text) = @_;
1550		1890
1551	my $layout = $self->{layout};	1891	my $layout = $self->{layout};
1552		1892
1553	$layout->set_height ($self->{fontsize});	1893	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1554	$layout->set_width ($self->{w});	1894	$layout->set_width ($self->{w});
1555	$layout->set_text ($text);	1895	$layout->set_text ($text);
1556		1896
1557	($layout->size)[1]	1897	($layout->size)[1]
1558	}	1898	}
…		…
1562		1902
1563	$self->{need_reflow}++;	1903	$self->{need_reflow}++;
1564	$self->update;	1904	$self->update;
1565	}	1905	}
1566		1906
1567	sub size_request {
1568	my ($self) = @_;
1569
1570	($self->{req_w}, $self->{req_h})
1571	}
1572
1573	sub size_allocate {	1907	sub size_allocate {
1574	my ($self, $x, $y, $w, $h) = @_;	1908	my ($self, $w, $h) = @_;
1575		1909
1576	$self->SUPER::size_allocate ($x, $y, $w, $h);	1910	$self->SUPER::size_allocate ($w, $h);
1577		1911
1578	$self->{layout}->set_height ($self->{fontsize});	1912	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579	$self->{layout}->set_width ($self->{w});	1913	$self->{layout}->set_width ($self->{children}[0]{w});
1580		1914
1581	$self->reflow;	1915	$self->reflow;
1582	}	1916	}
1583		1917
1584	sub add_paragraph {	1918	sub add_paragraph {
…		…
1671		2005
1672	}	2006	}
1673		2007
1674	#############################################################################	2008	#############################################################################
1675		2009
1676	package CFClient::UI::MapWidget;
1677
1678	use strict;
1679
1680	use List::Util qw(min max);
1681
1682	use SDL;
1683	use SDL::OpenGL;
1684
1685	our @ISA = CFClient::UI::Base::;
1686
1687	sub new {
1688	my $class = shift;
1689
1690	$class->SUPER::new (
1691	z => -1,
1692	can_focus => 1,
1693	list => (glGenLists 1),
1694	@_
1695	)
1696	}
1697
1698	sub key_down {
1699	print "MAPKEYDOWN\n";
1700	}
1701
1702	sub key_up {
1703	}
1704
1705	sub button_down {
1706	my ($self, $ev, $x, $y) = @_;
1707
1708	$self->focus_in;
1709
1710	if ($ev->button == 2) {
1711	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1712	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1713
1714	$self->{motion} = sub {
1715	my ($ev, $x, $y) = @_;
1716
1717	($x, $y) = ($ev->motion_x, $ev->motion_y);
1718
1719	$::CFG->{map_shift_x} = $bw + $x - $ox;
1720	$::CFG->{map_shift_y} = $bh + $y - $oy;
1721
1722	$self->update;
1723	};
1724	}
1725	}
1726
1727	sub button_up {
1728	my ($self, $ev, $x, $y) = @_;
1729
1730	delete $self->{motion};
1731	}
1732
1733	sub mouse_motion {
1734	my ($self, $ev, $x, $y) = @_;
1735
1736	$self->{motion}->($ev, $x, $y) if $self->{motion};
1737	}
1738
1739	sub size_request {
1740	(
1741	1 + 32 * int $::WIDTH / 32,
1742	1 + 32 * int $::HEIGHT / 32,
1743	)
1744	}
1745
1746	sub update {
1747	my ($self) = @_;
1748
1749	$self->{need_update} = 1;
1750	$self->SUPER::update;
1751	}
1752
1753	sub draw {
1754	my ($self) = @_;
1755
1756	if (delete $self->{need_update}) {
1757	glNewList $self->{list}, GL_COMPILE;
1758
1759	if ($::MAP) {
1760	my $sw = int $::WIDTH / 32;
1761	my $sh = int $::HEIGHT / 32;
1762
1763	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1764	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1765
1766	glTranslate $sx0 - 32, $sy0 - 32, 0;
1767
1768	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1769
1770	if ($::CFG->{fow_enable}) {
1771	if ($::CFG->{fow_smooth}) { # smooth fog of war
1772	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1773	glConvolutionFilter2D
1774	GL_CONVOLUTION_2D,
1775	GL_ALPHA,
1776	3, 3,
1777	GL_ALPHA, GL_FLOAT,
1778	pack "f*",
1779	0.1, 0.1, 0.1,
1780	0.1, 0.2, 0.1,
1781	0.1, 0.1, 0.1,
1782	;
1783	glEnable GL_CONVOLUTION_2D;
1784	}
1785
1786	$self->{fow_texture} = new CFClient::Texture
1787	w => $w,
1788	h => $h,
1789	data => $data,
1790	internalformat => GL_ALPHA,
1791	format => GL_ALPHA;
1792
1793	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1794
1795	glEnable GL_BLEND;
1796	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797	glEnable GL_TEXTURE_2D;
1798	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1799
1800	glColor +($::CFG->{fow_intensity}) x 3, 1;
1801	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1802
1803	glDisable GL_TEXTURE_2D;
1804	glDisable GL_BLEND;
1805	}
1806
1807	# HACK BEGIN
1808	{
1809	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1810	my ($w, $h) = (250, 250);
1811
1812	glEnable GL_BLEND;
1813	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1814	glEnable GL_TEXTURE_2D;
1815	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1816
1817	$self->{mapmap_texture} =
1818	new CFClient::Texture
1819	w => $w,
1820	h => $h,
1821	data => $::MAP->mapmap ($w, $h),
1822	type => GL_UNSIGNED_INT_8_8_8_8_REV;
1823
1824	$self->{mapmap_texture}->draw_quad (100, 100);
1825
1826	glDisable GL_TEXTURE_2D;
1827	glDisable GL_BLEND;
1828	}
1829	# HACK END
1830	}
1831
1832	glEndList;
1833	}
1834
1835	glPushMatrix;
1836	glCallList $self->{list};
1837	glPopMatrix;
1838
1839	if ($FOCUS != $self) {
1840	glColor 64/255, 64/255, 64/255;
1841	glLogicOp GL_AND;
1842	glEnable GL_COLOR_LOGIC_OP;
1843	glBegin GL_QUADS;
1844	glVertex 0, 0;
1845	glVertex 0, $::HEIGHT;
1846	glVertex $::WIDTH, $::HEIGHT;
1847	glVertex $::WIDTH, 0;
1848	glEnd;
1849	glDisable GL_COLOR_LOGIC_OP;
1850	}
1851	}
1852
1853	my %DIR = (
1854	SDLK_KP8, [1, "north"],
1855	SDLK_KP9, [2, "northeast"],
1856	SDLK_KP6, [3, "east"],
1857	SDLK_KP3, [4, "southeast"],
1858	SDLK_KP2, [5, "south"],
1859	SDLK_KP1, [6, "southwest"],
1860	SDLK_KP4, [7, "west"],
1861	SDLK_KP7, [8, "northwest"],
1862
1863	SDLK_UP, [1, "north"],
1864	SDLK_RIGHT, [3, "east"],
1865	SDLK_DOWN, [5, "south"],
1866	SDLK_LEFT, [7, "west"],
1867	);
1868
1869	sub key_down {
1870	my ($self, $ev) = @_;
1871
1872	my $mod = $ev->key_mod;
1873	my $sym = $ev->key_sym;
1874
1875	if ($sym == SDLK_KP5) {
1876	$::CONN->user_send ("command stay fire");
1877	} elsif ($sym == SDLK_a) {
1878	$::CONN->user_send ("command apply");
1879	} elsif ($sym == SDLK_QUOTE) {
1880	$self->emit ('activate_console');
1881	} elsif ($sym == SDLK_SLASH) {
1882	$self->emit ('activate_console' => '/');
1883	} elsif (exists $DIR{$sym}) {
1884	if ($mod & KMOD_SHIFT) {
1885	$self->{shft}++;
1886	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1887	} elsif ($mod & KMOD_CTRL) {
1888	$self->{ctrl}++;
1889	$::CONN->user_send ("command run $DIR{$sym}[0]");
1890	} else {
1891	$::CONN->user_send ("command $DIR{$sym}[1]");
1892	}
1893	}
1894	}
1895
1896	sub key_up {
1897	my ($self, $ev) = @_;
1898
1899	my $mod = $ev->key_mod;
1900	my $sym = $ev->key_sym;
1901
1902	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1903	$::CONN->user_send ("command fire_stop");
1904	}
1905	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1906	$::CONN->user_send ("command run_stop");
1907	}
1908	}
1909
1910	#############################################################################
1911
1912	package CFClient::UI::Animator;	2010	package CFClient::UI::Animator;
1913		2011
1914	use SDL::OpenGL;	2012	use CFClient::OpenGL;
1915		2013
1916	our @ISA = CFClient::UI::Bin::;	2014	our @ISA = CFClient::UI::Bin::;
1917		2015
1918	sub moveto {	2016	sub moveto {
1919	my ($self, $x, $y) = @_;	2017	my ($self, $x, $y) = @_;
…		…
1992		2090
1993	package CFClient::UI::Root;	2091	package CFClient::UI::Root;
1994		2092
1995	our @ISA = CFClient::UI::Container::;	2093	our @ISA = CFClient::UI::Container::;
1996		2094
1997	use SDL::OpenGL;	2095	use CFClient::OpenGL;
		2096
		2097	sub check_size {
		2098	my ($self) = @_;
		2099
		2100	$self->configure (0, 0, $::WIDTH, $::HEIGHT);
		2101	}
1998		2102
1999	sub size_request {	2103	sub size_request {
2000	($::WIDTH, $::HEIGHT)	2104	($::WIDTH, $::HEIGHT)
2001	}	2105	}
2002		2106
2003	sub size_allocate {	2107	sub configure {
2004	my ($self, $x, $y, $w, $h) = @_;	2108	my ($self, $x, $y, $w, $h) = @_;
2005		2109
2006	$self->_size_allocate ($x, $y, $w, $h);	2110	$self->SUPER::configure ($x, $y, $w, $h);
2007		2111
2008	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
2009	for @{$self->{children}};	2112	for my $child (@{$self->{children}}) {
		2113	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2114
		2115	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2116	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2117	$child->configure ($X, $Y, $W,$H);
		2118	}
2010	}	2119	}
2011		2120
2012	sub _topleft {	2121	sub _topleft {
2013	my ($self, $x, $y) = @_;	2122	my ($self, $x, $y) = @_;
2014		2123
…		…
2016	}	2125	}
2017		2126
2018	sub update {	2127	sub update {
2019	my ($self) = @_;	2128	my ($self) = @_;
2020		2129
2021	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2130	$self->check_size;
2022	::refresh ();	2131	::refresh ();
2023	}	2132	}
2024		2133
2025	sub add {	2134	sub add {
2026	my ($self, $widget) = @_;	2135	my ($self, $child) = @_;
2027		2136
		2137	# integerize window positions
		2138	$child->{x} = int $child->{x};
		2139	$child->{y} = int $child->{y};
		2140
2028	$self->SUPER::add ($widget);	2141	$self->SUPER::add ($child);
2029
2030	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2031	}	2142	}
2032		2143
2033	sub on_refresh {	2144	sub on_refresh {
2034	my ($self, $id, $cb) = @_;	2145	my ($self, $id, $cb) = @_;
2035		2146

Diff Legend

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