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.234 by root, Thu May 25 16:24:44 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;	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;
…		…
1101	col_expand => [],	1230	col_expand => [],
1102	@_,	1231	@_,
1103	)	1232	)
1104	}	1233	}
1105		1234
		1235	sub children {
		1236	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1237	}
		1238
1106	sub add {	1239	sub add {
1107	my ($self, $x, $y, $child) = @_;	1240	my ($self, $x, $y, $child) = @_;
1108		1241
1109	$child->set_parent ($self);	1242	$child->set_parent ($self);
1110	$self->{children}[$y][$x] = $child;	1243	$self->{children}[$y][$x] = $child;
1111		1244
1112	$child->check_size;	1245	$self->realloc;
1113	}	1246	}
1114		1247
1115	sub children {
1116	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117	}
1118
1119	# TODO: move to container class maybe? send childs 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) = @_;
1122		1251
1123	my @children = $self->children;	1252	my @children = $self->children;
1124	delete $self->{children};	1253	delete $self->{children};
…		…
1126	for (@children) {	1255	for (@children) {
1127	delete $_->{parent};	1256	delete $_->{parent};
1128	$_->hide;	1257	$_->hide;
1129	}	1258	}
1130		1259
1131	$self->update;	1260	$self->realloc;
1132	}	1261	}
1133		1262
1134	sub get_wh {	1263	sub get_wh {
1135	my ($self) = @_;	1264	my ($self) = @_;
1136		1265
…		…
1167	sub size_allocate {	1296	sub size_allocate {
1168	my ($self, $w, $h) = @_;	1297	my ($self, $w, $h) = @_;
1169		1298
1170	my ($ws, $hs) = $self->get_wh;	1299	my ($ws, $hs) = $self->get_wh;
1171		1300
1172	my $req_w = sum @$ws;	1301	my $req_w = (sum @$ws) || 1;
1173	my $req_h = sum @$hs;	1302	my $req_h = (sum @$hs) || 1;
1174		1303
1175	# TODO: nicer code && do row_expand	1304	# TODO: nicer code && do row_expand
1176	my @col_expand = @{$self->{col_expand}};	1305	my @col_expand = @{$self->{col_expand}};
1177	@col_expand = (1) x @$ws unless @col_expand;	1306	@col_expand = (1) x @$ws unless @col_expand;
1178	my $col_expand = (sum @col_expand) || 1;	1307	my $col_expand = (sum @col_expand) || 1;
…		…
1232	}	1361	}
1233	}	1362	}
1234		1363
1235	#############################################################################	1364	#############################################################################
1236		1365
1237	package CFClient::UI::HBox;	1366	package CFClient::UI::Box;
1238
1239	# TODO: wrap into common Box base class
1240		1367
1241	our @ISA = CFClient::UI::Container::;	1368	our @ISA = CFClient::UI::Container::;
1242		1369
1243	sub size_request {	1370	sub size_request {
1244	my ($self) = @_;	1371	my ($self) = @_;
1245		1372
1246	my @alloc = map [$_->size_request], @{$self->{children}};	1373	$self->{vertical}
1247		1374	? (
1248	(	1375	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1249	(List::Util::sum map $_->[0], @alloc),	1376	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250	(List::Util::max map $_->[1], @alloc),	1377	)
1251	)	1378	: (
		1379	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1381	)
1252	}	1382	}
1253		1383
1254	sub size_allocate {	1384	sub size_allocate {
1255	my ($self, $w, $h) = @_;	1385	my ($self, $w, $h) = @_;
1256		1386
1257	($h, $w) = ($w, $h);	1387	my $space = $self->{vertical} ? $h : $w;
1258
1259	my $children = $self->{children};	1388	my $children = $self->{children};
1260		1389
1261	my @h = map $_->{req_w}, @$children;	1390	my @req;
1262		1391
1263	my $req_h = List::Util::sum @h;	1392	if ($self->{homogeneous}) {
1264		1393	@req = ($space / (@$children || 1)) x @$children;
1265	if ($req_h > $h) {
1266	# ah well, not enough space
1267	$_ *= $h / $req_h for @h;
1268	} 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 {
1269	my $exp = List::Util::sum map $_->{expand}, @$children;	1402	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270	$exp ||= 1;
1271		1403
		1404	$space = ($space - $req) / $expand; # remaining space to give away
		1405
		1406	$req[$_] += $space * $children->[$_]{expand}
1272	for (0 .. $#$children) {	1407	for 0 .. $#$children;
1273	my $child = $children->[$_];
1274
1275	my $alloc_h = $h[$_];
1276	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277	$h[$_] = $alloc_h;
1278	}	1408	}
1279	}	1409	}
1280		1410
1281	CFClient::UI::harmonize \@h;	1411	CFClient::UI::harmonize \@req;
1282		1412
1283	my $y = 0;	1413	my $pos = 0;
1284	for (0 .. $#$children) {	1414	for (0 .. $#$children) {
1285	my $child = $children->[$_];
1286	my $h = $h[$_];	1415	my $alloc = $req[$_];
1287	$child->configure ($y, 0, $h, $w);	1416	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288		1417
1289	$y += $h;	1418	$pos += $alloc;
1290	}	1419	}
1291		1420
1292	1	1421	1
1293	}	1422	}
1294		1423
1295	#############################################################################	1424	#############################################################################
1296		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
1297	package CFClient::UI::VBox;	1441	package CFClient::UI::VBox;
1298		1442
1299	# TODO: wrap into common Box base class
1300
1301	our @ISA = CFClient::UI::Container::;	1443	our @ISA = CFClient::UI::Box::;
1302		1444
1303	sub size_request {	1445	sub new {
1304	my ($self) = @_;	1446	my $class = shift;
1305		1447
1306	my @alloc = map [$_->size_request], @{$self->{children}};	1448	$class->SUPER::new (
1307		1449	vertical => 1,
1308	(	1450	@_,
1309	(List::Util::max map $_->[0], @alloc),
1310	(List::Util::sum map $_->[1], @alloc),
1311	)	1451	)
1312	}
1313
1314	sub size_allocate {
1315	my ($self, $w, $h) = @_;
1316
1317	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319	my $children = $self->{children};
1320
1321	my @h = map $_->{req_h}, @$children;
1322
1323	my $req_h = List::Util::sum @h;
1324
1325	if ($req_h > $h) {
1326	# ah well, not enough space
1327	$_ *= $h / $req_h for @h;
1328	} else {
1329	my $exp = List::Util::sum map $_->{expand}, @$children;
1330	$exp ||= 1;
1331
1332	for (0 .. $#$children) {
1333	my $child = $children->[$_];
1334
1335	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336	}
1337	}
1338
1339	CFClient::UI::harmonize \@h;
1340
1341	my $y = 0;
1342	for (0 .. $#$children) {
1343	my $child = $children->[$_];
1344	my $h = $h[$_];
1345	$child->configure (0, $y, $w, $h);
1346
1347	$y += $h;
1348	}
1349
1350	1
1351	}	1452	}
1352		1453
1353	#############################################################################	1454	#############################################################################
1354		1455
1355	package CFClient::UI::Label;	1456	package CFClient::UI::Label;
…		…
1372	ellipsise => 3, # end	1473	ellipsise => 3, # end
1373	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1374	fontsize => 1,	1475	fontsize => 1,
1375	align => -1,	1476	align => -1,
1376	valign => -1,	1477	valign => -1,
1377	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1378	can_events => 0,	1480	can_events => 0,
1379	%arg	1481	%arg
1380	);	1482	);
1381		1483
1382	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1418	$self->{text} = "T$text";	1520	$self->{text} = "T$text";
1419		1521
1420	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421	$self->{layout}->set_text ($text);	1523	$self->{layout}->set_text ($text);
1422		1524
		1525	$self->realloc;
1423	$self->update;	1526	$self->update;
1424	$self->check_size;
1425	}	1527	}
1426		1528
1427	sub set_markup {	1529	sub set_markup {
1428	my ($self, $markup) = @_;	1530	my ($self, $markup) = @_;
1429		1531
…		…
1433	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434		1536
1435	$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;
1436	$self->{layout}->set_markup ($markup);	1538	$self->{layout}->set_markup ($markup);
1437		1539
		1540	$self->realloc;
1438	$self->update;	1541	$self->update;
1439	$self->check_size;
1440	}	1542	}
1441		1543
1442	sub size_request {	1544	sub size_request {
1443	my ($self) = @_;	1545	my ($self) = @_;
1444		1546
…		…
1458		1560
1459	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1460	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1461	}	1563	}
1462		1564
1463	(	1565	($w, $h)
1464	$w + $self->{padding} * 2,
1465	$h + $self->{padding} * 2,
1466	)
1467	}	1566	}
1468		1567
1469	sub size_allocate {	1568	sub size_allocate {
1470	my ($self, $w, $h) = @_;	1569	my ($self, $w, $h) = @_;
1471		1570
		1571	delete $self->{ox};
		1572
1472	delete $self->{texture};	1573	delete $self->{texture}
		1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1473	}	1575	}
1474		1576
1475	sub set_fontsize {	1577	sub set_fontsize {
1476	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1477		1579
1478	$self->{fontsize} = $fontsize;	1580	$self->{fontsize} = $fontsize;
1479	delete $self->{texture};	1581	delete $self->{texture};
1480		1582
1481	$self->update;	1583	$self->realloc;
1482	$self->check_size;
1483	}	1584	}
1484		1585
1485	sub _draw {	1586	sub _draw {
1486	my ($self) = @_;	1587	my ($self) = @_;
1487		1588
…		…
1493	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1494	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497		1598
1498	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1499		1601
		1602	unless (exists $self->{ox}) {
1500	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1503		1606
1504	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1507
1508	$tex
1509	};	1610	};
1510		1611
1511	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1512	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1513		1614
…		…
1567	sub set_text {	1668	sub set_text {
1568	my ($self, $text) = @_;	1669	my ($self, $text) = @_;
1569		1670
1570	$self->{cursor} = length $text;	1671	$self->{cursor} = length $text;
1571	$self->_set_text ($text);	1672	$self->_set_text ($text);
1572	$self->update;	1673
1573	$self->check_size;	1674	$self->realloc;
1574	}	1675	}
1575		1676
1576	sub get_text {	1677	sub get_text {
1577	$_[0]{text}	1678	$_[0]{text}
1578	}	1679	}
…		…
1611	} elsif ($uni) {	1712	} elsif ($uni) {
1612	substr $text, $self->{cursor}++, 0, chr $uni;	1713	substr $text, $self->{cursor}++, 0, chr $uni;
1613	}	1714	}
1614		1715
1615	$self->_set_text ($text);	1716	$self->_set_text ($text);
1616	$self->update;	1717
1617	$self->check_size;	1718	$self->realloc;
1618	}	1719	}
1619		1720
1620	sub focus_in {	1721	sub focus_in {
1621	my ($self) = @_;	1722	my ($self) = @_;
1622		1723
…		…
1749		1850
1750	sub new {	1851	sub new {
1751	my $class = shift;	1852	my $class = shift;
1752		1853
1753	$class->SUPER::new (	1854	$class->SUPER::new (
1754	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1755	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1756	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1757	can_hover => 1,	1859	can_hover => 1,
1758	align => 0,	1860	align => 0,
1759	valign => 0,	1861	valign => 0,
…		…
1806		1908
1807	sub new {	1909	sub new {
1808	my $class = shift;	1910	my $class = shift;
1809		1911
1810	$class->SUPER::new (	1912	$class->SUPER::new (
1811	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1812	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1813	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1814	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1815	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1816	state => 0,	1919	state => 0,
…		…
1820	}	1923	}
1821		1924
1822	sub size_request {	1925	sub size_request {
1823	my ($self) = @_;	1926	my ($self) = @_;
1824		1927
1825	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1826	}	1929	}
1827		1930
1828	sub button_down {	1931	sub button_down {
1829	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1830		1933
1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1834	$self->_emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1835	}	1938	}
1836	}	1939	}
1837		1940
1838	sub _draw {	1941	sub _draw {
1839	my ($self) = @_;	1942	my ($self) = @_;
1840		1943
1841	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1842		1945
1843	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844		1947
1845	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;
1846		1951
1847	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848		1953
1849	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1850		1955
…		…
2115	fg => [1, 1, 1],	2220	fg => [1, 1, 1],
2116	active_fg => [0, 0, 0],	2221	active_fg => [0, 0, 0],
2117	bg => [0, 0, 0, 0.2],	2222	bg => [0, 0, 0, 0.2],
2118	active_bg => [1, 1, 1, 0.5],	2223	active_bg => [1, 1, 1, 0.5],
2119	range => [0, 0, 100, 10, 0],	2224	range => [0, 0, 100, 10, 0],
2120	req_w => $::WIDTH / 80,	2225	min_w => $::WIDTH / 80,
2121	req_h => $::WIDTH / 80,	2226	min_h => $::WIDTH / 80,
2122	vertical => 0,	2227	vertical => 0,
2123	can_hover => 1,	2228	can_hover => 1,
2124	inner_pad => 0.02,	2229	inner_pad => 0.02,
2125	@_	2230	@_
2126	);	2231	);
…		…
2129	$self->update;	2234	$self->update;
2130		2235
2131	$self	2236	$self
2132	}	2237	}
2133		2238
		2239	sub changed { }
		2240
2134	sub set_range {	2241	sub set_range {
2135	my ($self, $range) = @_;	2242	my ($self, $range) = @_;
2136		2243
2137	$self->{range} = $range;	2244	($range, $self->{range}) = ($self->{range}, $range);
2138		2245
2139	$self->update;	2246	$self->update
		2247	if "@$range" ne "@{$self->{range}}";
2140	}	2248	}
2141		2249
2142	sub set_value {	2250	sub set_value {
2143	my ($self, $value) = @_;	2251	my ($self, $value) = @_;
2144		2252
…		…
2163	}	2271	}
2164		2272
2165	sub size_request {	2273	sub size_request {
2166	my ($self) = @_;	2274	my ($self) = @_;
2167		2275
2168	my $w = $self->{req_w};	2276	($self->{req_w}, $self->{req_h})
2169	my $h = $self->{req_h};
2170
2171	$self->{vertical} ? ($h, $w) : ($w, $h)
2172	}	2277	}
2173		2278
2174	sub button_down {	2279	sub button_down {
2175	my ($self, $ev, $x, $y) = @_;	2280	my ($self, $ev, $x, $y) = @_;
2176		2281
…		…
2527		2632
2528	sub new {	2633	sub new {
2529	my $class = shift;	2634	my $class = shift;
2530		2635
2531	my $self = $class->SUPER::new (	2636	my $self = $class->SUPER::new (
2532	state => 0,	2637	state => 0,
2533	connect_activate => \&toggle_flopper,	2638	on_activate => \&toggle_flopper,
2534	@_	2639	@_
2535	);	2640	);
2536		2641
2537	if ($self->{state}) {
2538	$self->{state} = 0;
2539	$self->toggle_flopper;
2540	}
2541
2542	$self	2642	$self
2543	}	2643	}
2544		2644
2545	sub toggle_flopper {	2645	sub toggle_flopper {
2546	my ($self) = @_;	2646	my ($self) = @_;
2547		2647
2548	# TODO: use animation	2648	$self->{other}->toggle_visibility;
2549	if ($self->{state} = !$self->{state}) {
2550	$CFClient::UI::ROOT->add ($self->{other});
2551	$self->{other}->move ($self->coord2global (0, $self->{h}));
2552	$self->_emit ("open");
2553	} else {
2554	$CFClient::UI::ROOT->remove ($self->{other});
2555	$self->_emit ("close");
2556	}
2557
2558	$self->_emit (changed => $self->{state});
2559	}	2649	}
2560		2650
2561	#############################################################################	2651	#############################################################################
2562		2652
2563	package CFClient::UI::Tooltip;	2653	package CFClient::UI::Tooltip;
…		…
2576	}	2666	}
2577		2667
2578	sub set_tooltip_from {	2668	sub set_tooltip_from {
2579	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2580		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
2581	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2582	markup => $widget->{tooltip},	2681	markup => $tooltip,
2583	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584	fontsize => 0.8,	2683	fontsize => 0.8,
2585	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2586	ellipsise => 0,	2685	ellipsise => 0,
2587	font => ($widget->{tooltip_font} || $::FONT_PROP),	2686	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2598		2697
2599	sub size_allocate {	2698	sub size_allocate {
2600	my ($self, $w, $h) = @_;	2699	my ($self, $w, $h) = @_;
2601		2700
2602	$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	});
2603	}	2720	}
2604		2721
2605	sub _draw {	2722	sub _draw {
2606	my ($self) = @_;	2723	my ($self) = @_;
2607		2724
…		…
2624	glVertex $w, $h;	2741	glVertex $w, $h;
2625	glVertex $w, 0;	2742	glVertex $w, 0;
2626	glEnd;	2743	glEnd;
2627		2744
2628	glTranslate 2 - 0.375, 2 - 0.375;	2745	glTranslate 2 - 0.375, 2 - 0.375;
		2746
2629	$self->SUPER::_draw;	2747	$self->SUPER::_draw;
2630	}	2748	}
2631		2749
2632	#############################################################################	2750	#############################################################################
2633		2751
…		…
2709	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2710	}	2828	}
2711		2829
2712	#############################################################################	2830	#############################################################################
2713		2831
2714	package CFClient::UI::InventoryItem;
2715
2716	our @ISA = CFClient::UI::HBox::;
2717
2718	sub new {
2719	my $class = shift;
2720
2721	my %args = @_;
2722
2723	my $item = delete $args{item};
2724
2725	my $desc = CFClient::Item::desc_string $item;
2726
2727	my $self = $class->SUPER::new (
2728	can_hover => 1,
2729	can_events => 1,
2730	tooltip => ((CFClient::UI::Label::escape $desc)
2731	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732	connect_button_down => sub {
2733	my ($self, $ev, $x, $y) = @_;
2734
2735	# todo: maybe put examine on 1? but should just be a tooltip :(
2736	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737	my $targ = $::CONN->{player}{tag};
2738
2739	if ($item->{container} == $::CONN->{player}{tag}) {
2740	$targ = $main::OPENCONT;
2741	}
2742
2743	$::CONN->send ("move $targ $item->{tag} 0");
2744	} elsif ($ev->{button} == 1) {
2745	$::CONN->send ("examine $item->{tag}");
2746	} elsif ($ev->{button} == 2) {
2747	$::CONN->send ("apply $item->{tag}");
2748	} elsif ($ev->{button} == 3) {
2749	my @menu_items = (
2750	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753	(
2754	$item->{flags} & Crossfire::Protocol::F_LOCKED
2755	? (
2756	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757	)
2758	: (
2759	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761	)
2762	),
2763	);
2764
2765	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766	}
2767
2768	1
2769	},
2770	%args
2771	);
2772
2773
2774	$self->add (new CFClient::UI::Face
2775	can_events => 0,
2776	face => $item->{face},
2777	anim => $item->{anim},
2778	animspeed => $item->{animspeed},
2779	);
2780
2781	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783	$self->{item} = $item;
2784
2785	$self->update_item;
2786
2787	$self
2788	}
2789
2790	sub update_item {
2791	my ($self) = @_;
2792
2793	my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795	$self->{name_lbl}->set_text ($desc);
2796	}
2797
2798	#############################################################################
2799
2800	package CFClient::UI::Inventory;
2801
2802	our @ISA = CFClient::UI::ScrolledWindow::;
2803
2804	sub new {
2805	my $class = shift;
2806
2807	my $self = $class->SUPER::new (
2808	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2809	@_,
2810	);
2811
2812	$self
2813	}
2814
2815	sub set_items {
2816	my ($self, $items) = @_;
2817
2818	$self->{scrolled}->clear;
2819	return unless $items;
2820
2821	my @items = sort {
2822	($a->{type} <=> $b->{type})
2823	or ($a->{name} cmp $b->{name})
2824	} @$items;
2825
2826	$self->{real_items} = \@items;
2827
2828	my $row = 0;
2829	for my $item (@items) {
2830	CFClient::Item::update_widgets $item;
2831
2832	$self->{scrolled}->add (0, $row, $item->{face_widget});
2833	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2834	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836	$row++;
2837	}
2838
2839	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840	}
2841
2842	sub size_request {
2843	my ($self) = @_;
2844	($self->{req_w}, $self->{req_h});
2845	}
2846
2847	#############################################################################
2848
2849	package CFClient::UI::Menu;	2832	package CFClient::UI::Menu;
2850		2833
2851	our @ISA = CFClient::UI::FancyFrame::;	2834	our @ISA = CFClient::UI::FancyFrame::;
2852		2835
2853	use CFClient::OpenGL;	2836	use CFClient::OpenGL;
…		…
2891	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2892	$GRAB = $self;	2875	$GRAB = $self;
2893	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2894		2877
2895	$self->show;	2878	$self->show;
2896	$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);
2897	}	2880	}
2898		2881
2899	sub mouse_motion {	2882	sub mouse_motion {
2900	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2901		2884
…		…
3026	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
3027	}	3010	}
3028		3011
3029	#############################################################################	3012	#############################################################################
3030		3013
3031	package CFClient::UI::Root;	3014	package CFClient::UI::Inventory;
3032		3015
3033	our @ISA = CFClient::UI::Container::;	3016	our @ISA = CFClient::UI::ScrolledWindow::;
3034
3035	use CFClient::OpenGL;
3036		3017
3037	sub new {	3018	sub new {
3038	my $class = shift;	3019	my $class = shift;
3039		3020
3040	$class->SUPER::new (	3021	my $self = $class->SUPER::new (
		3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3041	@_,	3023	@_,
3042	)	3024	);
3043	}
3044		3025
3045	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 {
3046	my ($self, $x, $y, $w, $h) = @_;	3174	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3047		3175
3048	$self->{w} = $w;	3176	$self->clear_command_list;
3049	$self->{h} = $h;	3177	$self->{recording} = 0;
3050	}	3178	$self->{rec_btn}->set_text ("start recording");
3051		3179
3052	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 {
3053	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	}
3054		3198
3055	$self->size_allocate ($self->{w}, $self->{h})	3199	sub update_binding_widgets {
3056	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
3057	}	3322	}
3058		3323
3059	sub size_request {	3324	sub size_request {
3060	my ($self) = @_;	3325	my ($self) = @_;
3061		3326
3062	($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
3063	}	3342	}
3064		3343
3065	sub size_allocate {	3344	sub size_allocate {
3066	my ($self, $w, $h) = @_;	3345	my ($self, $w, $h) = @_;
3067		3346
3068	for my $child ($self->children) {	3347	for my $child ($self->children) {
3069	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)};
3070		3349
3071	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3350	$X = $child->{force_x} if exists $child->{force_x};
3072	if exists $child->{req_x};	3351	$Y = $child->{force_y} if exists $child->{force_y};
3073		3352
3074	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3353	$X = _to_pixel $X, $W, $self->{w};
3075	if exists $child->{req_y};	3354	$Y = _to_pixel $Y, $H, $self->{h};
3076
3077	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079		3355
3080	$child->configure ($X, $Y, $W, $H);	3356	$child->configure ($X, $Y, $W, $H);
3081	}	3357	}
3082	}	3358	}
3083		3359
…		…
3094	}	3370	}
3095		3371
3096	sub update {	3372	sub update {
3097	my ($self) = @_;	3373	my ($self) = @_;
3098		3374
3099	$self->check_size;
3100	$::WANT_REFRESH++;	3375	$::WANT_REFRESH++;
3101	}	3376	}
3102		3377
3103	sub add {	3378	sub add {
3104	my ($self, @children) = @_;	3379	my ($self, @children) = @_;
3105		3380
3106	for (my @widgets = @children; my $w = pop @widgets; ) {
3107	push @widgets, $w->children;
3108	$w->{root} = $self;
3109	$w->{visible} = 1;
3110	}
3111
3112	for my $child (@children) {
3113	$child->{is_toplevel} = 1;	3381	$_->{is_toplevel} = 1
3114		3382	for @children;
3115	# integerise window positions
3116	$child->{x} = int $child->{x};
3117	$child->{y} = int $child->{y};
3118	}
3119		3383
3120	$self->SUPER::add (@children);	3384	$self->SUPER::add (@children);
3121	}	3385	}
3122		3386
3123	sub remove {	3387	sub remove {
3124	my ($self, @children) = @_;	3388	my ($self, @children) = @_;
3125		3389
3126	$self->SUPER::remove (@children);	3390	$self->SUPER::remove (@children);
		3391
		3392	delete $self->{is_toplevel}
		3393	for @children;
3127		3394
3128	while (@children) {	3395	while (@children) {
3129	my $w = pop @children;	3396	my $w = pop @children;
3130	push @children, $w->children;	3397	push @children, $w->children;
3131	$w->set_invisible;	3398	$w->set_invisible;
…		…
3150	while ($self->{refresh_hook}) {	3417	while ($self->{refresh_hook}) {
3151	$_->()	3418	$_->()
3152	for values %{delete $self->{refresh_hook}};	3419	for values %{delete $self->{refresh_hook}};
3153	}	3420	}
3154		3421
3155	if ($self->{check_size}) {	3422	if ($self->{realloc}) {
3156	my @queue = ([], []);	3423	my %queue;
		3424	my @queue;
		3425	my $widget;
3157		3426
3158	for (;;) {	3427	outer:
3159	if ($self->{check_size}) {	3428	while () {
3160	# heuristic: check containers last	3429	if (my $realloc = delete $self->{realloc}) {
3161	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3430	for $widget (values %$realloc) {
3162	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	}
3163	}	3437	}
3164		3438
3165	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3439	while () {
		3440	@queue or last outer;
3166		3441
3167	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3442	$widget = pop @{ $queue[-1] || [] }
3168	? @$widget{qw(user_w user_h)}	3443	and last;
3169	: $widget->size_request;
3170
3171	if (delete $widget->{force_alloc}
3172	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174		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}) {
3175	$widget->{req_w} = $w;	3460	$widget->{req_w} = $w;
3176	$widget->{req_h} = $h;	3461	$widget->{req_h} = $h;
3177		3462
3178	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3463	$self->{size_alloc}{$widget+0} = $widget;
3179		3464
3180	$widget->{parent}->check_size
3181	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	}
3182	}	3472	}
		3473
		3474	delete $self->{realloc}{$widget+0};
3183	}	3475	}
3184	}	3476	}
3185		3477
3186	while ($self->{size_alloc}) {	3478	while (my $size_alloc = delete $self->{size_alloc}) {
3187	for (values %{delete $self->{size_alloc}}) {	3479	my @queue = sort { $b->{visible} <=> $a->{visible} }
3188	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)};
3189		3486
3190	$w = 0 if $w < 0;	3487	$w = 0 if $w < 0;
3191	$h = 0 if $h < 0;	3488	$h = 0 if $h < 0;
3192		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
3193	$widget->{w} = $w;	3497	$widget->{w} = $w;
3194	$widget->{h} = $h;	3498	$widget->{h} = $h;
		3499
3195	$widget->emit (size_allocate => $w, $h);	3500	$widget->emit (size_allocate => $w, $h);
		3501	}
3196	}	3502	}
3197	}	3503	}
3198		3504
3199	while ($self->{post_alloc_hook}) {	3505	while ($self->{post_alloc_hook}) {
3200	$_->()	3506	$_->()
3201	for values %{delete $self->{post_alloc_hook}};	3507	for values %{delete $self->{post_alloc_hook}};
3202	}	3508	}
		3509
3203		3510
3204	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3511	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3205	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3512	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3206	glClear GL_COLOR_BUFFER_BIT;	3513	glClear GL_COLOR_BUFFER_BIT;
3207		3514
…		…
3209	glLoadIdentity;	3516	glLoadIdentity;
3210	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3517	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3211	glMatrixMode GL_MODELVIEW;	3518	glMatrixMode GL_MODELVIEW;
3212	glLoadIdentity;	3519	glLoadIdentity;
3213		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
3214	$self->_draw;	3528	$self->_draw;
3215	}	3529	}
3216		3530
3217	#############################################################################	3531	#############################################################################
3218		3532

Diff Legend

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