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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
18		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
238	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
240		284
241	$self->focus_out;	285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
242	}	305	}
243		306
244	sub hide {	307	sub hide {
245	my ($self) = @_;	308	my ($self) = @_;
246		309
…		…
248		311
249	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
250	if $self->{parent};	313	if $self->{parent};
251	}	314	}
252		315
253	sub move {	316	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
255		318
256	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
259		322
260	$self->update;	323	$self->update;
261	}	324	}
262		325
263	sub set_size {	326	sub set_size {
264	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
265		328
266	$self->{user_w} = $w;	329	$self->{force_w} = $w;
267	$self->{user_h} = $h;	330	$self->{force_h} = $h;
268		331
269	$self->check_size;	332	$self->realloc;
270	}	333	}
271		334
272	sub size_request {	335	sub size_request {
273	require Carp;	336	require Carp;
274	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
276		339
277	sub configure {	340	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
279		342
280	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
283		348
284	# use alignment to adjust x, y	349	# use alignment to adjust x, y
285		350
286	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	353	}
291		354
292	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	356	$self->{x} = $x;
294	$self->{y} = $y;	357	$self->{y} = $y;
295	$self->update;	358	$self->update;
296	}	359	}
297		360
298	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
300	}	368	}
301	}	369	}
302		370
303	sub size_allocate {	371	sub size_allocate {
304	# nothing to be done	372	# nothing to be done
305	}
306
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}	373	}
313		374
314	sub children {	375	sub children {
315	}	376	}
316		377
…		…
389	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
390		451
391	$self->focus_in;	452	$self->focus_in;
392	}	453	}
393		454
394	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
395	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
396	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
397	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
398	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459
		460	return $self
		461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		463
		464	()
		465	}
		466
		467	sub set_parent {
		468	my ($self, $parent) = @_;
		469
		470	Scalar::Util::weaken ($self->{parent} = $parent);
		471	$self->set_visible if $parent->{visible};
		472	}
		473
		474	sub connect {
		475	my ($self, $signal, $cb) = @_;
		476
		477	push @{ $self->{signal_cb}{$signal} }, $cb;
		478	}
		479
		480	sub _emit {
		481	my ($self, $signal, @args) = @_;
		482
		483	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		484	}
		485
		486	sub emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	$self->_emit ($signal, @args)
		490	|| $self->$signal (@args);
		491	}
		492
		493	sub visibility_change {
		494	#my ($self, $visible) = @_;
		495	}
		496
		497	sub realloc {
		498	my ($self) = @_;
		499
		500	if ($self->{visible}) {
		501	return if $self->{root}{realloc}{$self+0};
		502
		503	$self->{root}{realloc}{$self+0} = $self;
		504	$self->{root}->update;
		505	} else {
		506	delete $self->{req_w};
		507	delete $self->{req_h};
		508	}
		509	}
		510
		511	sub update {
		512	my ($self) = @_;
		513
		514	$self->{parent}->update
		515	if $self->{parent};
		516	}
		517
		518	sub reconfigure {
		519	my ($self) = @_;
		520
		521	$self->realloc;
		522	$self->update;
		523	}
		524
		525	# using global variables seems a bit hacky, but passing through all drawing
		526	# functions seems pointless.
		527	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399		528
400	sub draw {	529	sub draw {
401	my ($self) = @_;	530	my ($self) = @_;
402		531
403	return unless $self->{h} && $self->{w};	532	return unless $self->{h} && $self->{w};
		533
		534	# update screen rectangle
		535	local $draw_x = $draw_x + $self->{x};
		536	local $draw_y = $draw_y + $self->{y};
		537	local $draw_w = $draw_x + $self->{w};
		538	local $draw_h = $draw_y + $self->{h};
		539
		540	# skip widgets that are entirely outside the drawing area
		541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404		543
405	glPushMatrix;	544	glPushMatrix;
406	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
407	$self->_draw;	546	$self->_draw;
408	glPopMatrix;	547	glPopMatrix;
…		…
420	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
421	glEnd;	560	glEnd;
422	glDisable GL_BLEND;	561	glDisable GL_BLEND;
423	}	562	}
424		563
425	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
426	glPushMatrix;	565	glPushMatrix;
427	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
430	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
441	my ($self) = @_;	580	my ($self) = @_;
442		581
443	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
444	}	583	}
445		584
446	sub find_widget {
447	my ($self, $x, $y) = @_;
448
449	return () unless $self->{can_events};
450
451	return $self
452	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455	()
456	}
457
458	sub set_parent {
459	my ($self, $parent) = @_;
460
461	Scalar::Util::weaken ($self->{parent} = $parent);
462
463	# TODO: req_w _does_change after ->reconfigure
464	$self->check_size
465	unless exists $self->{req_w};
466
467	$self->show;
468	}
469
470	sub check_size {
471	my ($self, $forced) = @_;
472
473	$self->{force_alloc} = 1 if $forced;
474	$CFClient::UI::ROOT->{check_size}{$self} = $self;
475	}
476
477	sub update {
478	my ($self) = @_;
479
480	$self->{parent}->update
481	if $self->{parent};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub DESTROY {	585	sub DESTROY {
504	my ($self) = @_;	586	my ($self) = @_;
505		587
506	delete $WIDGET{$self+0};	588	delete $WIDGET{$self+0};
507	#$self->deactivate;	589	#$self->deactivate;
…		…
563	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
564	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
565	}	647	}
566		648
567	sub size_request {	649	sub size_request {
568	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
569	}	653	}
570		654
571	sub draw { }	655	sub draw { }
572		656
573	#############################################################################	657	#############################################################################
…		…
602	$self->{children} = [	686	$self->{children} = [
603	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
604	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
605	];	689	];
606		690
607	$self->check_size (1);	691	$self->realloc;
608	$self->update;
609	}	692	}
610		693
611	sub children {	694	sub children {
612	@{ $_[0]{children} }	695	@{ $_[0]{children} }
613	}	696	}
…		…
618	delete $child->{parent};	701	delete $child->{parent};
619	$child->hide;	702	$child->hide;
620		703
621	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622		705
623	$self->check_size (1);	706	$self->realloc;
624	$self->update;
625	}	707	}
626		708
627	sub clear {	709	sub clear {
628	my ($self) = @_;	710	my ($self) = @_;
629		711
…		…
633	for (@$children) {	715	for (@$children) {
634	delete $_->{parent};	716	delete $_->{parent};
635	$_->hide;	717	$_->hide;
636	}	718	}
637		719
638	$self->check_size;	720	$self->realloc;
639	$self->update;
640	}	721	}
641		722
642	sub find_widget {	723	sub find_widget {
643	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
644		725
…		…
731	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
732	$self->update;	813	$self->update;
733	}	814	}
734		815
735	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
736	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
737	}	820	}
738		821
739	sub render_child {	822	sub render_child {
740	my ($self) = @_;	823	my ($self) = @_;
741		824
742	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	825	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
743	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
744	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
745		828
		829	{
		830	package CFClient::UI::Base;
		831
		832	($draw_x, $draw_y, $draw_w, $draw_h) =
		833	(0, 0, $self->{w}, $self->{h});
		834	}
		835
746	$self->_render;	836	$self->_render;
747	};	837	};
748	}	838	}
749		839
750	sub _draw {	840	sub _draw {
751	my ($self) = @_;	841	my ($self) = @_;
752		842
753	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
754		844
755	my $tex = $self->{texture}	845	my $tex = $self->{texture}
756	or return;	846	or return;
757		847
758	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
781	}	871	}
782		872
783	sub size_request {	873	sub size_request {
784	my ($self) = @_;	874	my ($self) = @_;
785		875
786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787		877
788	@$self{qw(child_w child_h)}	878	$w = 10 if $self->{scroll_x};
		879	$h = 10 if $self->{scroll_y};
		880
		881	($w, $h)
789	}	882	}
790		883
791	sub size_allocate {	884	sub size_allocate {
792	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
793		886
		887	my $child = $self->child;
		888
794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796		891
797	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
798	$self->update;	893	$self->update;
799	}	894	}
800		895
…		…
836	}	931	}
837		932
838	sub _render {	933	sub _render {
839	my ($self) = @_;	934	my ($self) = @_;
840		935
		936	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		937	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		938
841	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842		940
843	$self->SUPER::_render;	941	$self->SUPER::_render;
844	}	942	}
845		943
…		…
853	my $class = shift;	951	my $class = shift;
854		952
855	my $self;	953	my $self;
856		954
857	my $slider = new CFClient::UI::Slider	955	my $slider = new CFClient::UI::Slider
858	vertical => 1,	956	vertical => 1,
859	range => [0, 0, 1, 0.01], # HACK fix	957	range => [0, 0, 1, 0.01], # HACK fix
860	connect_changed => sub {	958	on_changed => sub {
861	$self->{vp}->set_offset (0, $_[1]);	959	$self->{vp}->set_offset (0, $_[1]);
862	},	960	},
863	;	961	;
864		962
865	$self = $class->SUPER::new (	963	$self = $class->SUPER::new (
…		…
871	$self->{vp}->add ($self->{scrolled});	969	$self->{vp}->add ($self->{scrolled});
872	$self->add ($self->{vp});	970	$self->add ($self->{vp});
873	$self->add ($self->{slider});	971	$self->add ($self->{slider});
874		972
875	$self	973	$self
		974	}
		975
		976	sub update {
		977	my ($self) = @_;
		978
		979	$self->SUPER::update;
		980
		981	# todo: overwrite size_allocate of child
		982	my $child = $self->{vp}->child;
		983	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876	}	984	}
877		985
878	sub size_allocate {	986	sub size_allocate {
879	my ($self, $w, $h) = @_;	987	my ($self, $w, $h) = @_;
880		988
…		…
933		1041
934	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
935		1043
936	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
937		1045
938	my @tex =	1046	my $bg =
		1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1048	mipmap => 1, wrap => 1;
		1049
		1050	my @border =
939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941		1053
942	sub new {	1054	sub new {
943	my $class = shift;	1055	my ($class, %arg) = @_;
944		1056
945	# TODO: user_x, user_y, overwrite moveto?	1057	my $title = delete $arg{title};
946		1058
947	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
948	bg => [1, 1, 1, 1],	1060	bg => [1, 1, 1, 1],
949	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
950	border => 0.6,	1062	border => 0.6,
951	is_toplevel => 1,
952	can_events => 1,	1063	can_events => 1,
953	@_	1064	min_w => 16,
		1065	min_h => 16,
		1066	%arg,
954	);	1067	);
955		1068
956	$self->{title} &&= new CFClient::UI::Label	1069	$self->{title} = new CFClient::UI::Label
957	align => 0,	1070	align => 0,
958	valign => 1,	1071	valign => 1,
959	text => $self->{title},	1072	text => $title,
960	fontsize => $self->{border};	1073	fontsize => $self->{border}
		1074	if defined $title;
961		1075
962	$self	1076	$self
		1077	}
		1078
		1079	sub add {
		1080	my ($self, @widgets) = @_;
		1081
		1082	$self->SUPER::add (@widgets);
		1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
963	}	1084	}
964		1085
965	sub border {	1086	sub border {
966	int $_[0]{border} * $::FONTSIZE	1087	int $_[0]{border} * $::FONTSIZE
967	}	1088	}
968		1089
969	sub size_request {	1090	sub size_request {
970	my ($self) = @_;	1091	my ($self) = @_;
		1092
		1093	$self->{title}->size_request
		1094	if $self->{title};
971		1095
972	my ($w, $h) = $self->SUPER::size_request;	1096	my ($w, $h) = $self->SUPER::size_request;
973		1097
974	(	1098	(
975	$w + $self->border * 2,	1099	$w + $self->border * 2,
…		…
978	}	1102	}
979		1103
980	sub size_allocate {	1104	sub size_allocate {
981	my ($self, $w, $h) = @_;	1105	my ($self, $w, $h) = @_;
982		1106
		1107	if ($self->{title}) {
		1108	$self->{title}{w} = $w;
		1109	$self->{title}{h} = $h;
		1110	$self->{title}->size_allocate ($w, $h);
		1111	}
		1112
		1113	my $border = $self->border;
		1114
983	$h -= List::Util::max 0, $self->border * 2;	1115	$h -= List::Util::max 0, $border * 2;
984	$w -= List::Util::max 0, $self->border * 2;	1116	$w -= List::Util::max 0, $border * 2;
985		1117
986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987	if $self->{title};
988
989	$self->child->configure ($self->border, $self->border, $w, $h);	1118	$self->child->configure ($border, $border, $w, $h);
990	}	1119	}
991		1120
992	sub button_down {	1121	sub button_down {
993	my ($self, $ev, $x, $y) = @_;	1122	my ($self, $ev, $x, $y) = @_;
994		1123
…		…
1010	my ($ev, $x, $y) = @_;	1139	my ($ev, $x, $y) = @_;
1011		1140
1012	my $dx = $ev->{x} - $ox;	1141	my $dx = $ev->{x} - $ox;
1013	my $dy = $ev->{y} - $oy;	1142	my $dy = $ev->{y} - $oy;
1014		1143
1015	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1146
		1147	$self->realloc;
1017	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018	$self->check_size;
1019	};	1149	};
1020		1150
1021	} elsif ($lr ^ $td) {	1151	} elsif ($lr ^ $td) {
1022	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023	my ($bx, $by) = ($self->{x}, $self->{y});	1153	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1025	$self->{motion} = sub {	1155	$self->{motion} = sub {
1026	my ($ev, $x, $y) = @_;	1156	my ($ev, $x, $y) = @_;
1027		1157
1028	($x, $y) = ($ev->{x}, $ev->{y});	1158	($x, $y) = ($ev->{x}, $ev->{y});
1029		1159
1030	$self->move ($bx + $x - $ox, $by + $y - $oy);	1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031	$self->update;
1032	};	1161	};
1033	}	1162	}
1034	}	1163	}
1035		1164
1036	sub button_up {	1165	sub button_up {
…		…
1046	}	1175	}
1047		1176
1048	sub _draw {	1177	sub _draw {
1049	my ($self) = @_;	1178	my ($self) = @_;
1050		1179
		1180	my $child = $self->{children}[0];
		1181
1051	my ($w, $h ) = ($self->{w}, $self->{h});	1182	my ($w, $h ) = ($self->{w}, $self->{h});
1052	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1183	my ($cw, $ch) = ($child->{w}, $child->{h});
1053		1184
1054	glEnable GL_TEXTURE_2D;	1185	glEnable GL_TEXTURE_2D;
1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056		1187
1057	my $border = $self->border;	1188	my $border = $self->border;
1058		1189
1059	glColor @{ $self->{border_bg} };	1190	glColor @{ $self->{border_bg} };
1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1191	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1192	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1193	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1194	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064		1195
1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1196	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066	my $bg = $tex[0];	1197	glColor @{ $self->{bg} };
1067		1198
1068	# TODO: repeat texture not scale	1199	# TODO: repeat texture not scale
		1200	# solve this better(?)
1069	my $rep_x = $cw / $bg->{w};	1201	$bg->{s} = $cw / $bg->{w};
1070	my $rep_y = $ch / $bg->{h};	1202	$bg->{t} = $ch / $bg->{h};
1071
1072	glColor @{ $self->{bg} };
1073
1074	$bg->{s} = $rep_x;
1075	$bg->{t} = $rep_y;
1076	$bg->{wrap_mode} = 1;
1077	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1203	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078	}	1204	}
1079		1205
1080	glDisable GL_TEXTURE_2D;	1206	glDisable GL_TEXTURE_2D;
1081		1207
1082	$self->{title}->draw if $self->{title};
1083
1084	$self->child->draw;	1208	$child->draw;
		1209
		1210	if ($self->{title}) {
		1211	glTranslate 0, $border - $self->{h};
		1212	$self->{title}->_draw;
		1213	}
1085	}	1214	}
1086		1215
1087	#############################################################################	1216	#############################################################################
1088		1217
1089	package CFClient::UI::Table;	1218	package CFClient::UI::Table;
…		…
1111	my ($self, $x, $y, $child) = @_;	1240	my ($self, $x, $y, $child) = @_;
1112		1241
1113	$child->set_parent ($self);	1242	$child->set_parent ($self);
1114	$self->{children}[$y][$x] = $child;	1243	$self->{children}[$y][$x] = $child;
1115		1244
1116	$self->check_size (1);	1245	$self->realloc;
1117	}	1246	}
1118		1247
1119	# TODO: move to container class maybe? send children a signal on removal?	1248	# TODO: move to container class maybe? send children a signal on removal?
1120	sub clear {	1249	sub clear {
1121	my ($self) = @_;	1250	my ($self) = @_;
…		…
1126	for (@children) {	1255	for (@children) {
1127	delete $_->{parent};	1256	delete $_->{parent};
1128	$_->hide;	1257	$_->hide;
1129	}	1258	}
1130		1259
1131	$self->check_size (1);	1260	$self->realloc;
1132	$self->update;
1133	}	1261	}
1134		1262
1135	sub get_wh {	1263	sub get_wh {
1136	my ($self) = @_;	1264	my ($self) = @_;
1137		1265
…		…
1168	sub size_allocate {	1296	sub size_allocate {
1169	my ($self, $w, $h) = @_;	1297	my ($self, $w, $h) = @_;
1170		1298
1171	my ($ws, $hs) = $self->get_wh;	1299	my ($ws, $hs) = $self->get_wh;
1172		1300
1173	my $req_w = sum @$ws;	1301	my $req_w = (sum @$ws) || 1;
1174	my $req_h = sum @$hs;	1302	my $req_h = (sum @$hs) || 1;
1175		1303
1176	# TODO: nicer code && do row_expand	1304	# TODO: nicer code && do row_expand
1177	my @col_expand = @{$self->{col_expand}};	1305	my @col_expand = @{$self->{col_expand}};
1178	@col_expand = (1) x @$ws unless @col_expand;	1306	@col_expand = (1) x @$ws unless @col_expand;
1179	my $col_expand = (sum @col_expand) || 1;	1307	my $col_expand = (sum @col_expand) || 1;
…		…
1233	}	1361	}
1234	}	1362	}
1235		1363
1236	#############################################################################	1364	#############################################################################
1237		1365
1238	package CFClient::UI::HBox;	1366	package CFClient::UI::Box;
1239
1240	# TODO: wrap into common Box base class
1241		1367
1242	our @ISA = CFClient::UI::Container::;	1368	our @ISA = CFClient::UI::Container::;
1243		1369
1244	sub size_request {	1370	sub size_request {
1245	my ($self) = @_;	1371	my ($self) = @_;
1246		1372
1247	my @alloc = map [$_->size_request], @{$self->{children}};	1373	$self->{vertical}
1248		1374	? (
1249	(	1375	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1250	(List::Util::sum map $_->[0], @alloc),	1376	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1251	(List::Util::max map $_->[1], @alloc),	1377	)
1252	)	1378	: (
		1379	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1381	)
1253	}	1382	}
1254		1383
1255	sub size_allocate {	1384	sub size_allocate {
1256	my ($self, $w, $h) = @_;	1385	my ($self, $w, $h) = @_;
1257		1386
1258	($h, $w) = ($w, $h);	1387	my $space = $self->{vertical} ? $h : $w;
1259
1260	my $children = $self->{children};	1388	my $children = $self->{children};
1261		1389
1262	my @h = map $_->{req_w}, @$children;	1390	my @req;
1263		1391
1264	my $req_h = List::Util::sum @h;	1392	if ($self->{homogeneous}) {
1265		1393	@req = ($space / (@$children || 1)) x @$children;
1266	if ($req_h > $h) {
1267	# ah well, not enough space
1268	$_ *= $h / $req_h for @h;
1269	} else {	1394	} else {
		1395	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1396	my $req = List::Util::sum @req;
		1397
		1398	if ($req > $space) {
		1399	# ah well, not enough space
		1400	$_ *= $space / $req for @req;
		1401	} else {
1270	my $exp = List::Util::sum map $_->{expand}, @$children;	1402	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1271	$exp ||= 1;
1272		1403
		1404	$space = ($space - $req) / $expand; # remaining space to give away
		1405
		1406	$req[$_] += $space * $children->[$_]{expand}
1273	for (0 .. $#$children) {	1407	for 0 .. $#$children;
1274	my $child = $children->[$_];
1275
1276	my $alloc_h = $h[$_];
1277	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1278	$h[$_] = $alloc_h;
1279	}	1408	}
1280	}	1409	}
1281		1410
1282	CFClient::UI::harmonize \@h;	1411	CFClient::UI::harmonize \@req;
1283		1412
1284	my $y = 0;	1413	my $pos = 0;
1285	for (0 .. $#$children) {	1414	for (0 .. $#$children) {
1286	my $child = $children->[$_];
1287	my $h = $h[$_];	1415	my $alloc = $req[$_];
1288	$child->configure ($y, 0, $h, $w);	1416	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1289		1417
1290	$y += $h;	1418	$pos += $alloc;
1291	}	1419	}
1292		1420
1293	1	1421	1
1294	}	1422	}
1295		1423
1296	#############################################################################	1424	#############################################################################
1297		1425
		1426	package CFClient::UI::HBox;
		1427
		1428	our @ISA = CFClient::UI::Box::;
		1429
		1430	sub new {
		1431	my $class = shift;
		1432
		1433	$class->SUPER::new (
		1434	vertical => 0,
		1435	@_,
		1436	)
		1437	}
		1438
		1439	#############################################################################
		1440
1298	package CFClient::UI::VBox;	1441	package CFClient::UI::VBox;
1299		1442
1300	# TODO: wrap into common Box base class
1301
1302	our @ISA = CFClient::UI::Container::;	1443	our @ISA = CFClient::UI::Box::;
1303		1444
1304	sub size_request {	1445	sub new {
1305	my ($self) = @_;	1446	my $class = shift;
1306		1447
1307	my @alloc = map [$_->size_request], @{$self->{children}};	1448	$class->SUPER::new (
1308		1449	vertical => 1,
1309	(	1450	@_,
1310	(List::Util::max map $_->[0], @alloc),
1311	(List::Util::sum map $_->[1], @alloc),
1312	)	1451	)
1313	}
1314
1315	sub size_allocate {
1316	my ($self, $w, $h) = @_;
1317
1318	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1319
1320	my $children = $self->{children};
1321
1322	my @h = map $_->{req_h}, @$children;
1323
1324	my $req_h = List::Util::sum @h;
1325
1326	if ($req_h > $h) {
1327	# ah well, not enough space
1328	$_ *= $h / $req_h for @h;
1329	} else {
1330	my $exp = List::Util::sum map $_->{expand}, @$children;
1331	$exp ||= 1;
1332
1333	for (0 .. $#$children) {
1334	my $child = $children->[$_];
1335
1336	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1337	}
1338	}
1339
1340	CFClient::UI::harmonize \@h;
1341
1342	my $y = 0;
1343	for (0 .. $#$children) {
1344	my $child = $children->[$_];
1345	my $h = $h[$_];
1346	$child->configure (0, $y, $w, $h);
1347
1348	$y += $h;
1349	}
1350
1351	1
1352	}	1452	}
1353		1453
1354	#############################################################################	1454	#############################################################################
1355		1455
1356	package CFClient::UI::Label;	1456	package CFClient::UI::Label;
…		…
1373	ellipsise => 3, # end	1473	ellipsise => 3, # end
1374	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1375	fontsize => 1,	1475	fontsize => 1,
1376	align => -1,	1476	align => -1,
1377	valign => -1,	1477	valign => -1,
1378	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1379	can_events => 0,	1480	can_events => 0,
1380	%arg	1481	%arg
1381	);	1482	);
1382		1483
1383	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1419	$self->{text} = "T$text";	1520	$self->{text} = "T$text";
1420		1521
1421	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1422	$self->{layout}->set_text ($text);	1523	$self->{layout}->set_text ($text);
1423		1524
		1525	$self->realloc;
1424	$self->update;	1526	$self->update;
1425	$self->check_size;
1426	}	1527	}
1427		1528
1428	sub set_markup {	1529	sub set_markup {
1429	my ($self, $markup) = @_;	1530	my ($self, $markup) = @_;
1430		1531
…		…
1434	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1435		1536
1436	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1437	$self->{layout}->set_markup ($markup);	1538	$self->{layout}->set_markup ($markup);
1438		1539
		1540	$self->realloc;
1439	$self->update;	1541	$self->update;
1440	$self->check_size;
1441	}	1542	}
1442		1543
1443	sub size_request {	1544	sub size_request {
1444	my ($self) = @_;	1545	my ($self) = @_;
1445		1546
…		…
1459		1560
1460	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1461	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1462	}	1563	}
1463		1564
1464	(	1565	($w, $h)
1465	$w + $self->{padding} * 2,
1466	$h + $self->{padding} * 2,
1467	)
1468	}	1566	}
1469		1567
1470	sub size_allocate {	1568	sub size_allocate {
1471	my ($self, $w, $h) = @_;	1569	my ($self, $w, $h) = @_;
1472		1570
		1571	delete $self->{ox};
		1572
1473	delete $self->{texture};	1573	delete $self->{texture}
		1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1474	}	1575	}
1475		1576
1476	sub set_fontsize {	1577	sub set_fontsize {
1477	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1478		1579
1479	$self->{fontsize} = $fontsize;	1580	$self->{fontsize} = $fontsize;
1480	delete $self->{texture};	1581	delete $self->{texture};
1481		1582
1482	$self->update;	1583	$self->realloc;
1483	$self->check_size;
1484	}	1584	}
1485		1585
1486	sub _draw {	1586	sub _draw {
1487	my ($self) = @_;	1587	my ($self) = @_;
1488		1588
…		…
1494	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1495	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1496	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498		1598
1499	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1500		1601
		1602	unless (exists $self->{ox}) {
1501	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1502	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1503	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1504		1606
1505	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1506	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1507	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1508
1509	$tex
1510	};	1610	};
1511		1611
1512	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1514		1614
…		…
1568	sub set_text {	1668	sub set_text {
1569	my ($self, $text) = @_;	1669	my ($self, $text) = @_;
1570		1670
1571	$self->{cursor} = length $text;	1671	$self->{cursor} = length $text;
1572	$self->_set_text ($text);	1672	$self->_set_text ($text);
1573	$self->update;	1673
1574	$self->check_size;	1674	$self->realloc;
1575	}	1675	}
1576		1676
1577	sub get_text {	1677	sub get_text {
1578	$_[0]{text}	1678	$_[0]{text}
1579	}	1679	}
…		…
1612	} elsif ($uni) {	1712	} elsif ($uni) {
1613	substr $text, $self->{cursor}++, 0, chr $uni;	1713	substr $text, $self->{cursor}++, 0, chr $uni;
1614	}	1714	}
1615		1715
1616	$self->_set_text ($text);	1716	$self->_set_text ($text);
1617	$self->update;	1717
1618	$self->check_size;	1718	$self->realloc;
1619	}	1719	}
1620		1720
1621	sub focus_in {	1721	sub focus_in {
1622	my ($self) = @_;	1722	my ($self) = @_;
1623		1723
…		…
1750		1850
1751	sub new {	1851	sub new {
1752	my $class = shift;	1852	my $class = shift;
1753		1853
1754	$class->SUPER::new (	1854	$class->SUPER::new (
1755	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1756	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1757	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1758	can_hover => 1,	1859	can_hover => 1,
1759	align => 0,	1860	align => 0,
1760	valign => 0,	1861	valign => 0,
…		…
1807		1908
1808	sub new {	1909	sub new {
1809	my $class = shift;	1910	my $class = shift;
1810		1911
1811	$class->SUPER::new (	1912	$class->SUPER::new (
1812	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1813	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1814	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1815	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1816	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1817	state => 0,	1919	state => 0,
…		…
1821	}	1923	}
1822		1924
1823	sub size_request {	1925	sub size_request {
1824	my ($self) = @_;	1926	my ($self) = @_;
1825		1927
1826	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1827	}	1929	}
1828		1930
1829	sub button_down {	1931	sub button_down {
1830	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1831		1933
1832	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1833	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1834	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1835	$self->_emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1836	}	1938	}
1837	}	1939	}
1838		1940
1839	sub _draw {	1941	sub _draw {
1840	my ($self) = @_;	1942	my ($self) = @_;
1841		1943
1842	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1843		1945
1844	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1845		1947
1846	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1948	my ($w, $h) = @$self{qw(w h)};
		1949
		1950	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1847		1951
1848	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1849		1953
1850	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1851		1955
…		…
2116	fg => [1, 1, 1],	2220	fg => [1, 1, 1],
2117	active_fg => [0, 0, 0],	2221	active_fg => [0, 0, 0],
2118	bg => [0, 0, 0, 0.2],	2222	bg => [0, 0, 0, 0.2],
2119	active_bg => [1, 1, 1, 0.5],	2223	active_bg => [1, 1, 1, 0.5],
2120	range => [0, 0, 100, 10, 0],	2224	range => [0, 0, 100, 10, 0],
2121	req_w => $::WIDTH / 80,	2225	min_w => $::WIDTH / 80,
2122	req_h => $::WIDTH / 80,	2226	min_h => $::WIDTH / 80,
2123	vertical => 0,	2227	vertical => 0,
2124	can_hover => 1,	2228	can_hover => 1,
2125	inner_pad => 0.02,	2229	inner_pad => 0.02,
2126	@_	2230	@_
2127	);	2231	);
…		…
2130	$self->update;	2234	$self->update;
2131		2235
2132	$self	2236	$self
2133	}	2237	}
2134		2238
		2239	sub changed { }
		2240
2135	sub set_range {	2241	sub set_range {
2136	my ($self, $range) = @_;	2242	my ($self, $range) = @_;
2137		2243
2138	$self->{range} = $range;	2244	($range, $self->{range}) = ($self->{range}, $range);
2139		2245
2140	$self->update;	2246	$self->update
		2247	if "@$range" ne "@{$self->{range}}";
2141	}	2248	}
2142		2249
2143	sub set_value {	2250	sub set_value {
2144	my ($self, $value) = @_;	2251	my ($self, $value) = @_;
2145		2252
…		…
2164	}	2271	}
2165		2272
2166	sub size_request {	2273	sub size_request {
2167	my ($self) = @_;	2274	my ($self) = @_;
2168		2275
2169	my $w = $self->{req_w};	2276	($self->{req_w}, $self->{req_h})
2170	my $h = $self->{req_h};
2171
2172	$self->{vertical} ? ($h, $w) : ($w, $h)
2173	}	2277	}
2174		2278
2175	sub button_down {	2279	sub button_down {
2176	my ($self, $ev, $x, $y) = @_;	2280	my ($self, $ev, $x, $y) = @_;
2177		2281
…		…
2528		2632
2529	sub new {	2633	sub new {
2530	my $class = shift;	2634	my $class = shift;
2531		2635
2532	my $self = $class->SUPER::new (	2636	my $self = $class->SUPER::new (
2533	state => 0,	2637	state => 0,
2534	connect_activate => \&toggle_flopper,	2638	on_activate => \&toggle_flopper,
2535	@_	2639	@_
2536	);	2640	);
2537		2641
2538	if ($self->{state}) {
2539	$self->{state} = 0;
2540	$self->toggle_flopper;
2541	}
2542
2543	$self	2642	$self
2544	}	2643	}
2545		2644
2546	sub toggle_flopper {	2645	sub toggle_flopper {
2547	my ($self) = @_;	2646	my ($self) = @_;
2548		2647
2549	# TODO: use animation	2648	$self->{other}->toggle_visibility;
2550	if ($self->{state} = !$self->{state}) {
2551	$CFClient::UI::ROOT->add ($self->{other});
2552	$self->{other}->move ($self->coord2global (0, $self->{h}));
2553	$self->_emit ("open");
2554	} else {
2555	$CFClient::UI::ROOT->remove ($self->{other});
2556	$self->_emit ("close");
2557	}
2558
2559	$self->_emit (changed => $self->{state});
2560	}	2649	}
2561		2650
2562	#############################################################################	2651	#############################################################################
2563		2652
2564	package CFClient::UI::Tooltip;	2653	package CFClient::UI::Tooltip;
…		…
2577	}	2666	}
2578		2667
2579	sub set_tooltip_from {	2668	sub set_tooltip_from {
2580	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2581		2670
		2671	my $tooltip = $widget->{tooltip};
		2672
		2673	if ($ENV{CFPLUS_DEBUG} & 2) {
		2674	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2676	. "req $widget->{req_w} $widget->{req_h}\n"
		2677	. "visible $widget->{visible}";
		2678	}
		2679
2582	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2583	markup => $widget->{tooltip},	2681	markup => $tooltip,
2584	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2585	fontsize => 0.8,	2683	fontsize => 0.8,
2586	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2587	ellipsise => 0,	2685	ellipsise => 0,
2588	font => ($widget->{tooltip_font} || $::FONT_PROP),	2686	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2599		2697
2600	sub size_allocate {	2698	sub size_allocate {
2601	my ($self, $w, $h) = @_;	2699	my ($self, $w, $h) = @_;
2602		2700
2603	$self->SUPER::size_allocate ($w - 4, $h - 4);	2701	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2702	}
		2703
		2704	sub visibility_change {
		2705	my ($self, $visible) = @_;
		2706
		2707	return unless $visible;
		2708
		2709	$self->{root}->on_post_alloc ("move_$self" => sub {
		2710	my $widget = $self->{owner}
		2711	or return;
		2712
		2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2714
		2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2716	if $x + $self->{w} > $::WIDTH;
		2717
		2718	$self->move_abs ($x, $y);
		2719	});
2604	}	2720	}
2605		2721
2606	sub _draw {	2722	sub _draw {
2607	my ($self) = @_;	2723	my ($self) = @_;
2608		2724
…		…
2625	glVertex $w, $h;	2741	glVertex $w, $h;
2626	glVertex $w, 0;	2742	glVertex $w, 0;
2627	glEnd;	2743	glEnd;
2628		2744
2629	glTranslate 2 - 0.375, 2 - 0.375;	2745	glTranslate 2 - 0.375, 2 - 0.375;
		2746
2630	$self->SUPER::_draw;	2747	$self->SUPER::_draw;
2631	}	2748	}
2632		2749
2633	#############################################################################	2750	#############################################################################
2634		2751
…		…
2710	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2711	}	2828	}
2712		2829
2713	#############################################################################	2830	#############################################################################
2714		2831
2715	package CFClient::UI::Inventory;
2716
2717	our @ISA = CFClient::UI::ScrolledWindow::;
2718
2719	sub new {
2720	my $class = shift;
2721
2722	my $self = $class->SUPER::new (
2723	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2724	@_,
2725	);
2726
2727	$self
2728	}
2729
2730	sub set_items {
2731	my ($self, $items) = @_;
2732
2733	$self->{scrolled}->clear;
2734	return unless $items;
2735
2736	my @items = sort {
2737	($a->{type} <=> $b->{type})
2738	or ($a->{name} cmp $b->{name})
2739	} @$items;
2740
2741	$self->{real_items} = \@items;
2742
2743	my $row = 0;
2744	for my $item (@items) {
2745	CFClient::Item::update_widgets $item;
2746
2747	$self->{scrolled}->add (0, $row, $item->{face_widget});
2748	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2749	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2750
2751	$row++;
2752	}
2753
2754	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755	}
2756
2757	sub size_request {
2758	my ($self) = @_;
2759	($self->{req_w}, $self->{req_h});
2760	}
2761
2762	#############################################################################
2763
2764	package CFClient::UI::Menu;	2832	package CFClient::UI::Menu;
2765		2833
2766	our @ISA = CFClient::UI::FancyFrame::;	2834	our @ISA = CFClient::UI::FancyFrame::;
2767		2835
2768	use CFClient::OpenGL;	2836	use CFClient::OpenGL;
…		…
2806	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2807	$GRAB = $self;	2875	$GRAB = $self;
2808	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2809		2877
2810	$self->show;	2878	$self->show;
2811	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2879	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2812	}	2880	}
2813		2881
2814	sub mouse_motion {	2882	sub mouse_motion {
2815	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2816		2884
…		…
2941	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
2942	}	3010	}
2943		3011
2944	#############################################################################	3012	#############################################################################
2945		3013
2946	package CFClient::UI::Root;	3014	package CFClient::UI::Inventory;
2947		3015
2948	our @ISA = CFClient::UI::Container::;	3016	our @ISA = CFClient::UI::ScrolledWindow::;
2949
2950	use CFClient::OpenGL;
2951		3017
2952	sub new {	3018	sub new {
2953	my $class = shift;	3019	my $class = shift;
2954		3020
2955	$class->SUPER::new (	3021	my $self = $class->SUPER::new (
		3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2956	@_,	3023	@_,
2957	)	3024	);
2958	}
2959		3025
2960	sub configure {	3026	$self
		3027	}
		3028
		3029	sub set_items {
		3030	my ($self, $items) = @_;
		3031
		3032	$self->{scrolled}->clear;
		3033	return unless $items;
		3034
		3035	my @items = sort {
		3036	($a->{type} <=> $b->{type})
		3037	or ($a->{name} cmp $b->{name})
		3038	} @$items;
		3039
		3040	$self->{real_items} = \@items;
		3041
		3042	my $row = 0;
		3043	for my $item (@items) {
		3044	CFClient::Item::update_widgets $item;
		3045
		3046	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3049
		3050	$row++;
		3051	}
		3052	}
		3053
		3054	#############################################################################
		3055
		3056	package CFClient::UI::BindEditor;
		3057
		3058	our @ISA = CFClient::UI::FancyFrame::;
		3059
		3060	sub new {
		3061	my $class = shift;
		3062
		3063	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3064
		3065	$self->add (my $vb = new CFClient::UI::VBox);
		3066
		3067
		3068	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3069	text => "start recording",
		3070	tooltip => "Start/Stops recording of actions."
		3071	."All subsequent actions after the recording started will be captured."
		3072	."The actions are displayed after the record was stopped."
		3073	."To bind the action you have to click on the 'Bind' button",
		3074	on_activate => sub {
		3075	unless ($self->{recording}) {
		3076	$self->start;
		3077	} else {
		3078	$self->stop;
		3079	}
		3080	});
		3081
		3082	$vb->add (new CFClient::UI::Label text => "Actions:");
		3083	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3084
		3085	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3086	$vb->add (my $hb = new CFClient::UI::HBox);
		3087	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3088	$hb->add (new CFClient::UI::Button
		3089	text => "bind",
		3090	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3091	on_activate => sub {
		3092	$self->ask_for_bind;
		3093	});
		3094
		3095	$vb->add (my $hb = new CFClient::UI::HBox);
		3096	$hb->add (new CFClient::UI::Button
		3097	text => "ok",
		3098	expand => 1,
		3099	tooltip => "This closes the binding editor and saves the binding",
		3100	on_activate => sub {
		3101	$self->hide;
		3102	$self->commit;
		3103	});
		3104
		3105	$hb->add (new CFClient::UI::Button
		3106	text => "cancel",
		3107	expand => 1,
		3108	tooltip => "This closes the binding editor without saving",
		3109	on_activate => sub {
		3110	$self->hide;
		3111	$self->{binding_cancel}->()
		3112	if $self->{binding_cancel};
		3113	});
		3114
		3115	$self->update_binding_widgets;
		3116
		3117	$self
		3118	}
		3119
		3120	sub commit {
		3121	my ($self) = @_;
		3122	my ($mod, $sym, $cmds) = $self->get_binding;
		3123	if ($sym != 0 && @$cmds > 0) {
		3124	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3125	."'. Don't forget 'Save Config'!");
		3126	$self->{binding_change}->($mod, $sym, $cmds)
		3127	if $self->{binding_change};
		3128	} else {
		3129	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3130	$self->{binding_cancel}->()
		3131	if $self->{binding_cancel};
		3132	}
		3133	}
		3134
		3135	sub start {
		3136	my ($self) = @_;
		3137
		3138	$self->{rec_btn}->set_text ("stop recording");
		3139	$self->{recording} = 1;
		3140	$self->clear_command_list;
		3141	$::CONN->start_record if $::CONN;
		3142	}
		3143
		3144	sub stop {
		3145	my ($self) = @_;
		3146
		3147	$self->{rec_btn}->set_text ("start recording");
		3148	$self->{recording} = 0;
		3149
		3150	my $rec;
		3151	$rec = $::CONN->stop_record if $::CONN;
		3152	return unless ref $rec eq 'ARRAY';
		3153	$self->set_command_list ($rec);
		3154	}
		3155
		3156	# if $commit is true, the binding will be set after the user entered a key combo
		3157	sub ask_for_bind {
		3158	my ($self, $commit) = @_;
		3159
		3160	CFClient::Binder::open_binding_dialog (sub {
		3161	my ($mod, $sym) = @_;
		3162	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3163	$self->update_binding_widgets;
		3164	$self->commit if $commit;
		3165	});
		3166	}
		3167
		3168	# $mod and $sym are the modifiers and key symbol
		3169	# $cmds is a array ref of strings (the commands)
		3170	# $cb is the callback that is executed on OK
		3171	# $ccb is the callback that is executed on CANCEL and
		3172	# when the binding was unsuccessful on OK
		3173	sub set_binding {
2961	my ($self, $x, $y, $w, $h) = @_;	3174	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2962		3175
2963	$self->{w} = $w;	3176	$self->clear_command_list;
2964	$self->{h} = $h;	3177	$self->{recording} = 0;
2965	}	3178	$self->{rec_btn}->set_text ("start recording");
2966		3179
2967	sub check_size {	3180	$self->{binding} = [$mod, $sym];
		3181	$self->{commands} = $cmds;
		3182
		3183	$self->{binding_change} = $cb;
		3184	$self->{binding_cancel} = $ccb;
		3185
		3186	$self->update_binding_widgets;
		3187	}
		3188
		3189	# this is a shortcut method that asks for a binding
		3190	# and then just binds it.
		3191	sub do_quick_binding {
2968	my ($self) = @_;	3192	my ($self, $cmds) = @_;
		3193	$self->set_binding (undef, undef, $cmds, sub {
		3194	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3195	});
		3196	$self->ask_for_bind (1);
		3197	}
2969		3198
2970	$self->size_allocate ($self->{w}, $self->{h})	3199	sub update_binding_widgets {
2971	if $self->{w};	3200	my ($self) = @_;
		3201	my ($mod, $sym, $cmds) = $self->get_binding;
		3202	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3203	$self->set_command_list ($cmds);
		3204	}
		3205
		3206	sub get_binding {
		3207	my ($self) = @_;
		3208	return (
		3209	$self->{binding}->[0],
		3210	$self->{binding}->[1],
		3211	[ grep { defined $_ } @{$self->{commands}} ]
		3212	);
		3213	}
		3214
		3215	sub clear_command_list {
		3216	my ($self) = @_;
		3217	$self->{cmdbox}->clear ();
		3218	}
		3219
		3220	sub set_command_list {
		3221	my ($self, $cmds) = @_;
		3222
		3223	$self->{cmdbox}->clear ();
		3224	$self->{commands} = $cmds;
		3225
		3226	my $idx = 0;
		3227
		3228	for (@$cmds) {
		3229	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3230
		3231	my $i = $idx;
		3232	$hb->add (new CFClient::UI::Label text => $_);
		3233	$hb->add (new CFClient::UI::Button
		3234	text => "delete",
		3235	tooltip => "Deletes the action from the record",
		3236	on_activate => sub {
		3237	$self->{cmdbox}->remove ($hb);
		3238	$cmds->[$i] = undef;
		3239	});
		3240
		3241
		3242	$idx++
		3243	}
		3244	}
		3245
		3246	#############################################################################
		3247
		3248	package CFClient::UI::SpellList;
		3249
		3250	our @ISA = CFClient::UI::FancyFrame::;
		3251
		3252	sub new {
		3253	my $class = shift;
		3254
		3255	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3256
		3257	$self->add (new CFClient::UI::ScrolledWindow
		3258	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3259
		3260	$self;
		3261	}
		3262
		3263	# XXX: Do sorting? Argl...
		3264	sub add_spell {
		3265	my ($self, $spell) = @_;
		3266	$self->{spells}->{$spell->{name}} = $spell;
		3267
		3268	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3269	face => $spell->{face},
		3270	can_hover => 1,
		3271	can_events => 1,
		3272	tooltip => $spell->{message});
		3273
		3274	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3275	text => $spell->{name},
		3276	can_hover => 1,
		3277	can_events => 1,
		3278	tooltip => $spell->{message},
		3279	expand => 1);
		3280
		3281	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3282	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3283	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3284	expand => 1);
		3285
		3286	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3287	text => "bind to key",
		3288	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3289	}
		3290
		3291	sub rebuild_spell_list {
		3292	my ($self) = @_;
		3293	$self->{tbl_idx} = 0;
		3294	$self->add_spell ($_) for values %{$self->{spells}};
		3295	}
		3296
		3297	sub remove_spell {
		3298	my ($self, $spell) = @_;
		3299	delete $self->{spells}->{$spell->{name}};
		3300	$self->rebuild_spell_list;
		3301	}
		3302
		3303	#############################################################################
		3304
		3305	package CFClient::UI::Root;
		3306
		3307	our @ISA = CFClient::UI::Container::;
		3308
		3309	use CFClient::OpenGL;
		3310
		3311	sub new {
		3312	my $class = shift;
		3313
		3314	my $self = $class->SUPER::new (
		3315	visible => 1,
		3316	@_,
		3317	);
		3318
		3319	Scalar::Util::weaken ($self->{root} = $self);
		3320
		3321	$self
2972	}	3322	}
2973		3323
2974	sub size_request {	3324	sub size_request {
2975	my ($self) = @_;	3325	my ($self) = @_;
2976		3326
2977	($self->{w}, $self->{h})	3327	($self->{w}, $self->{h})
		3328	}
		3329
		3330	sub _to_pixel {
		3331	my ($coord, $size, $max) = @_;
		3332
		3333	$coord =
		3334	$coord eq "center" ? ($max - $size) * 0.5
		3335	: $coord eq "max" ? $max
		3336	: $coord;
		3337
		3338	$coord = 0 if $coord < 0;
		3339	$coord = $max - $size if $coord > $max - $size;
		3340
		3341	int $coord + 0.5
2978	}	3342	}
2979		3343
2980	sub size_allocate {	3344	sub size_allocate {
2981	my ($self, $w, $h) = @_;	3345	my ($self, $w, $h) = @_;
2982		3346
2983	for my $child ($self->children) {	3347	for my $child ($self->children) {
2984	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3348	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2985		3349
2986	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3350	$X = $child->{force_x} if exists $child->{force_x};
2987	if exists $child->{req_x};	3351	$Y = $child->{force_y} if exists $child->{force_y};
2988		3352
2989	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3353	$X = _to_pixel $X, $W, $self->{w};
2990	if exists $child->{req_y};	3354	$Y = _to_pixel $Y, $H, $self->{h};
2991
2992	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2993	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2994		3355
2995	$child->configure ($X, $Y, $W, $H);	3356	$child->configure ($X, $Y, $W, $H);
2996	}	3357	}
2997	}	3358	}
2998		3359
…		…
3009	}	3370	}
3010		3371
3011	sub update {	3372	sub update {
3012	my ($self) = @_;	3373	my ($self) = @_;
3013		3374
3014	$self->check_size;
3015	$::WANT_REFRESH++;	3375	$::WANT_REFRESH++;
3016	}	3376	}
3017		3377
3018	sub add {	3378	sub add {
3019	my ($self, @children) = @_;	3379	my ($self, @children) = @_;
3020		3380
3021	for (my @widgets = @children; my $w = pop @widgets; ) {
3022	push @widgets, $w->children;
3023	$w->{root} = $self;
3024	$w->{visible} = 1;
3025	}
3026
3027	for my $child (@children) {
3028	$child->{is_toplevel} = 1;	3381	$_->{is_toplevel} = 1
3029		3382	for @children;
3030	# integerise window positions
3031	$child->{x} = int $child->{x};
3032	$child->{y} = int $child->{y};
3033	}
3034		3383
3035	$self->SUPER::add (@children);	3384	$self->SUPER::add (@children);
3036	}	3385	}
3037		3386
3038	sub remove {	3387	sub remove {
3039	my ($self, @children) = @_;	3388	my ($self, @children) = @_;
3040		3389
3041	$self->SUPER::remove (@children);	3390	$self->SUPER::remove (@children);
		3391
		3392	delete $self->{is_toplevel}
		3393	for @children;
3042		3394
3043	while (@children) {	3395	while (@children) {
3044	my $w = pop @children;	3396	my $w = pop @children;
3045	push @children, $w->children;	3397	push @children, $w->children;
3046	$w->set_invisible;	3398	$w->set_invisible;
…		…
3065	while ($self->{refresh_hook}) {	3417	while ($self->{refresh_hook}) {
3066	$_->()	3418	$_->()
3067	for values %{delete $self->{refresh_hook}};	3419	for values %{delete $self->{refresh_hook}};
3068	}	3420	}
3069		3421
3070	if ($self->{check_size}) {	3422	if ($self->{realloc}) {
3071	my @queue = ([], []);	3423	my %queue;
		3424	my @queue;
		3425	my $widget;
3072		3426
3073	for (;;) {	3427	outer:
3074	if ($self->{check_size}) {	3428	while () {
3075	# heuristic: check containers last	3429	if (my $realloc = delete $self->{realloc}) {
3076	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3430	for $widget (values %$realloc) {
3077	for values %{delete $self->{check_size}}	3431	$widget->{visible} or next; # do not resize invisible widgets
		3432
		3433	$queue{$widget+0}++ and next; # duplicates are common
		3434
		3435	push @{ $queue[$widget->{visible}] }, $widget;
		3436	}
3078	}	3437	}
3079		3438
3080	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3439	while () {
		3440	@queue or last outer;
3081		3441
3082	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3442	$widget = pop @{ $queue[-1] || [] }
3083	? @$widget{qw(user_w user_h)}	3443	and last;
3084	: $widget->size_request;
3085
3086	if (delete $widget->{force_alloc}
3087	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3088	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3089		3444
		3445	pop @queue;
		3446	}
		3447
		3448	delete $queue{$widget+0};
		3449
		3450	my ($w, $h) = $widget->size_request;
		3451
		3452	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3453	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3454
		3455	$w = $widget->{force_w} if exists $widget->{force_w};
		3456	$h = $widget->{force_h} if exists $widget->{force_h};
		3457
		3458	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3459	|| delete $widget->{force_realloc}) {
3090	$widget->{req_w} = $w;	3460	$widget->{req_w} = $w;
3091	$widget->{req_h} = $h;	3461	$widget->{req_h} = $h;
3092		3462
3093	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3463	$self->{size_alloc}{$widget+0} = $widget;
3094		3464
3095	$widget->{parent}->check_size
3096	if $widget->{parent};	3465	if (my $parent = $widget->{parent}) {
		3466	$self->{realloc}{$parent+0} = $parent
		3467	unless $queue{$parent+0};
		3468
		3469	$parent->{force_size_alloc} = 1;
		3470	$self->{size_alloc}{$parent+0} = $parent;
		3471	}
3097	}	3472	}
		3473
		3474	delete $self->{realloc}{$widget+0};
3098	}	3475	}
3099	}	3476	}
3100		3477
3101	while ($self->{size_alloc}) {	3478	while (my $size_alloc = delete $self->{size_alloc}) {
3102	for (values %{delete $self->{size_alloc}}) {	3479	my @queue = sort { $b->{visible} <=> $a->{visible} }
3103	my ($widget, $w, $h) = @$_;	3480	values %$size_alloc;
		3481
		3482	while () {
		3483	my $widget = pop @queue || last;
		3484
		3485	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3104		3486
3105	$w = 0 if $w < 0;	3487	$w = 0 if $w < 0;
3106	$h = 0 if $h < 0;	3488	$h = 0 if $h < 0;
3107		3489
		3490	$w = int $w + 0.5;
		3491	$h = int $h + 0.5;
		3492
		3493	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3494	$widget->{old_w} = $widget->{w};
		3495	$widget->{old_h} = $widget->{h};
		3496
3108	$widget->{w} = $w;	3497	$widget->{w} = $w;
3109	$widget->{h} = $h;	3498	$widget->{h} = $h;
		3499
3110	$widget->emit (size_allocate => $w, $h);	3500	$widget->emit (size_allocate => $w, $h);
		3501	}
3111	}	3502	}
3112	}	3503	}
3113		3504
3114	while ($self->{post_alloc_hook}) {	3505	while ($self->{post_alloc_hook}) {
3115	$_->()	3506	$_->()
3116	for values %{delete $self->{post_alloc_hook}};	3507	for values %{delete $self->{post_alloc_hook}};
3117	}	3508	}
		3509
3118		3510
3119	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3511	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3120	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3512	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3121	glClear GL_COLOR_BUFFER_BIT;	3513	glClear GL_COLOR_BUFFER_BIT;
3122		3514
…		…
3124	glLoadIdentity;	3516	glLoadIdentity;
3125	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3517	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3126	glMatrixMode GL_MODELVIEW;	3518	glMatrixMode GL_MODELVIEW;
3127	glLoadIdentity;	3519	glLoadIdentity;
3128		3520
		3521	{
		3522	package CFClient::UI::Base;
		3523
		3524	($draw_x, $draw_y, $draw_w, $draw_h) =
		3525	(0, 0, $self->{w}, $self->{h});
		3526	}
		3527
3129	$self->_draw;	3528	$self->_draw;
3130	}	3529	}
3131		3530
3132	#############################################################################	3531	#############################################################################
3133		3532

Diff Legend

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