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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	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};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
45	$TOOLTIP->hide;	51	$TOOLTIP->hide;
46		52
47	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
48		54
…		…
165	sub rescale_widgets {	171	sub rescale_widgets {
166	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
167		173
168	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
169	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
170	$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.]+$/;
171	$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};
172	$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};
173	$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.]+$/;
174	$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};
175	$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};
		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
176	}	189	}
177	}	190	}
178		191
179	reconfigure_widgets;	192	reconfigure_widgets;
180	}	193	}
…		…
189		202
190	sub new {	203	sub new {
191	my $class = shift;	204	my $class = shift;
192		205
193	my $self = bless {	206	my $self = bless {
194	x => 0,	207	x => "center",
195	y => 0,	208	y => "center",
196	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
197	can_events => 1,	212	can_events => 1,
198	@_	213	@_
199	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200		217
201	for (keys %$self) {	218	for (keys %$self) {
202	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
203	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
204	}	221	}
205	}	222	}
206		223
207	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	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};
214	}	234	}
215		235
216	$self	236	$self
217	}	237	}
218		238
…		…
227	my ($self) = @_;	247	my ($self) = @_;
228		248
229	return if $self->{parent};	249	return if $self->{parent};
230		250
231	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
232	}
233
234	sub center {
235	my ($self) = @_;
236
237	$CFClient::UI::ROOT->on_post_alloc (
238	"center_$self" => sub {
239	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240	},
241	);
242
243	$self->update;
244	}	252	}
245		253
246	sub set_visible {	254	sub set_visible {
247	my ($self) = @_;	255	my ($self) = @_;
248		256
…		…
303		311
304	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
305	if $self->{parent};	313	if $self->{parent};
306	}	314	}
307		315
308	sub move {	316	sub move_abs {
309	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
310		318
311	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
312	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
313	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
314		322
315	$self->update;	323	$self->update;
316	}	324	}
317		325
318	sub set_size {	326	sub set_size {
319	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
320		328
321	$self->{def_w} = $w;	329	$self->{force_w} = $w;
322	$self->{def_h} = $h;	330	$self->{force_h} = $h;
323		331
324	$self->realloc;	332	$self->realloc;
325	}	333	}
326		334
327	sub size_request {	335	sub size_request {
…		…
331		339
332	sub configure {	340	sub configure {
333	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
334		342
335	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
336	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
337	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
338		348
339	# use alignment to adjust x, y	349	# use alignment to adjust x, y
340		350
341	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
342	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
343
344	($w, $h) = ($w2, $h2);
345	}	353	}
346		354
347	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
348	$self->{x} = $x;	356	$self->{x} = $x;
349	$self->{y} = $y;	357	$self->{y} = $y;
350	$self->update;	358	$self->update;
351	}	359	}
352		360
353	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354	return unless $self->{visible};	362	return unless $self->{visible};
355		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
357	}	368	}
358	}	369	}
359		370
360	sub size_allocate {	371	sub size_allocate {
361	# nothing to be done	372	# nothing to be done
362	}	373	}
363		374
364	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
365	}	381	}
366		382
367	sub set_max_size {	383	sub set_max_size {
368	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
369		385
…		…
428		444
429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430	unless $FOCUS;	446	unless $FOCUS;
431	}	447	}
432		448
433	sub mouse_motion { }	449	sub mouse_motion { 0 }
434	sub button_up { }	450	sub button_up { 0 }
435	sub key_down { }	451	sub key_down { 0 }
436	sub key_up { }	452	sub key_up { 0 }
437		453
438	sub button_down {	454	sub button_down {
439	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
440		456
441	$self->focus_in;	457	$self->focus_in;
442	}
443		458
444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449		461
450	sub find_widget {	462	sub find_widget {
451	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
452		464
453	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
461		473
462	sub set_parent {	474	sub set_parent {
463	my ($self, $parent) = @_;	475	my ($self, $parent) = @_;
464		476
465	Scalar::Util::weaken ($self->{parent} = $parent);	477	Scalar::Util::weaken ($self->{parent} = $parent);
466
467	$self->set_visible if $parent->{visible};	478	$self->set_visible if $parent->{visible};
468	}	479	}
469		480
470	sub connect {	481	sub connect {
471	my ($self, $signal, $cb) = @_;	482	my ($self, $signal, $cb) = @_;
…		…
492		503
493	sub realloc {	504	sub realloc {
494	my ($self) = @_;	505	my ($self) = @_;
495		506
496	if ($self->{visible}) {	507	if ($self->{visible}) {
497	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
498		509
499	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
500	$self->{root}->update;	511	$self->{root}->update;
501	} else {	512	} else {
502	delete $self->{req_w};	513	delete $self->{req_w};
		514	delete $self->{req_h};
503	}	515	}
504	}	516	}
505		517
506	sub update {	518	sub update {
507	my ($self) = @_;	519	my ($self) = @_;
508		520
509	$self->{parent}->update	521	$self->{parent}->update
510	if $self->{parent};	522	if $self->{parent};
511	}	523	}
512		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		535
513	sub draw {	536	sub draw {
514	my ($self) = @_;	537	my ($self) = @_;
515		538
516	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517		550
518	glPushMatrix;	551	glPushMatrix;
519	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
520	$self->_draw;	553	$self->_draw;
521	glPopMatrix;	554	glPopMatrix;
…		…
533	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
534	glEnd;	567	glEnd;
535	glDisable GL_BLEND;	568	glDisable GL_BLEND;
536	}	569	}
537		570
538	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
539	glPushMatrix;	572	glPushMatrix;
540	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
542	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
543	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
619	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
620	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
621	}	654	}
622		655
623	sub size_request {	656	sub size_request {
624	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
625	}	660	}
626		661
627	sub draw { }	662	sub draw { }
628		663
629	#############################################################################	664	#############################################################################
…		…
633	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
634		669
635	sub new {	670	sub new {
636	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
637		672
638	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
639		674
640	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
641	children => [],	676	children => [],
642	can_events => 0,	677	can_events => 0,
643	%arg,	678	%arg,
644	);	679	);
		680
645	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
646		683
647	$self	684	$self
648	}	685	}
649		686
650	sub add {	687	sub add {
…		…
698	$x -= $self->{x};	735	$x -= $self->{x};
699	$y -= $self->{y};	736	$y -= $self->{y};
700		737
701	my $res;	738	my $res;
702		739
703	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
704	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
705	and return $res;	742	and return $res;
706	}	743	}
707		744
708	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
750	sub size_request {	787	sub size_request {
751	$_[0]{children}[0]->size_request	788	$_[0]{children}[0]->size_request
752	}	789	}
753		790
754	sub size_allocate {	791	sub size_allocate {
755	my ($self, $w, $h, $changed) = @_;	792	my ($self, $w, $h) = @_;
756		793
757	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
758	}	795	}
759		796
760	#############################################################################	797	#############################################################################
		798
		799	# back-buffered drawing area
761		800
762	package CFClient::UI::Window;	801	package CFClient::UI::Window;
763		802
764	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
765		804
…		…
777	$ROOT->on_post_alloc ($self => sub { $self->render_child });	816	$ROOT->on_post_alloc ($self => sub { $self->render_child });
778	$self->SUPER::update;	817	$self->SUPER::update;
779	}	818	}
780		819
781	sub size_allocate {	820	sub size_allocate {
782	my ($self, $w, $h, $changed) = @_;	821	my ($self, $w, $h) = @_;
783		822
784	$self->SUPER::size_allocate ($w, $h, $changed);	823	$self->SUPER::size_allocate ($w, $h);
785	$self->update	824	$self->update;
786	if $changed;
787	}	825	}
788		826
789	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
790	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
791	}	831	}
792		832
793	sub render_child {	833	sub render_child {
794	my ($self) = @_;	834	my ($self) = @_;
795		835
796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
799		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
800	$self->_render;	847	$self->_render;
801	};	848	};
802	}	849	}
803		850
804	sub _draw {	851	sub _draw {
805	my ($self) = @_;	852	my ($self) = @_;
806		853
807	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
808		855
809	my $tex = $self->{texture}	856	my $tex = $self->{texture}
810	or return;	857	or return;
811		858
812	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
835	}	882	}
836		883
837	sub size_request {	884	sub size_request {
838	my ($self) = @_;	885	my ($self) = @_;
839		886
840	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		888
842	$w = 10 if $self->{scroll_x};	889	$w = 10 if $self->{scroll_x};
843	$h = 10 if $self->{scroll_y};	890	$h = 10 if $self->{scroll_y};
844		891
845	($w, $h)	892	($w, $h)
846	}	893	}
847		894
848	sub size_allocate {	895	sub size_allocate {
849	my ($self, $w, $h, $changed) = @_;	896	my ($self, $w, $h) = @_;
850		897
		898	my $child = $self->child;
		899
851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853		902
854	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
855	$self->update;	904	$self->update;
856	}	905	}
857		906
…		…
893	}	942	}
894		943
895	sub _render {	944	sub _render {
896	my ($self) = @_;	945	my ($self) = @_;
897		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
898	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899		951
900	$self->SUPER::_render;	952	$self->SUPER::_render;
901	}	953	}
902		954
…		…
905	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
906		958
907	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
908		960
909	sub new {	961	sub new {
910	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
911		965
912	my $self;	966	my $self;
913		967
914	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
915	vertical => 1,	969	vertical => 1,
…		…
920	;	974	;
921		975
922	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
923	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
924	slider => $slider,	978	slider => $slider,
925	@_,	979	%arg,
926	);	980	);
927		981
928	$self->{vp}->add ($self->{scrolled});
929	$self->add ($self->{vp});
930	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
931		984
932	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
933	}	992	}
934		993
935	sub update {	994	sub update {
936	my ($self) = @_;	995	my ($self) = @_;
937		996
…		…
941	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
942	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943	}	1002	}
944		1003
945	sub size_allocate {	1004	sub size_allocate {
946	my ($self, $w, $h, $changed) = @_;	1005	my ($self, $w, $h) = @_;
947		1006
948	$self->SUPER::size_allocate ($w, $h, $changed);	1007	$self->SUPER::size_allocate ($w, $h);
949		1008
950	my $child = $self->{vp}->child;	1009	my $child = $self->{vp}->child;
951	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1010	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952	}	1011	}
953		1012
…		…
1009	my @border =	1068	my @border =
1010	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1011	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1012		1071
1013	sub new {	1072	sub new {
1014	my $class = shift;	1073	my ($class, %arg) = @_;
		1074
		1075	my $title = delete $arg{title};
1015		1076
1016	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1017	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1018	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1019	border => 0.6,	1080	border => 0.6,
1020	is_toplevel => 1,
1021	can_events => 1,	1081	can_events => 1,
1022	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
1023	);	1085	);
1024		1086
1025	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1026	align => 0,	1088	align => 0,
1027	valign => 1,	1089	valign => 1,
1028	text => $self->{title},	1090	text => $title,
1029	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1030		1093
1031	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1032	}	1102	}
1033		1103
1034	sub border {	1104	sub border {
1035	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1036	}	1106	}
1037		1107
1038	sub size_request {	1108	sub size_request {
1039	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1040		1113
1041	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1042		1115
1043	(	1116	(
1044	$w + $self->border * 2,	1117	$w + $self->border * 2,
1045	$h + $self->border * 2,	1118	$h + $self->border * 2,
1046	)	1119	)
1047	}	1120	}
1048		1121
1049	sub size_allocate {	1122	sub size_allocate {
1050	my ($self, $w, $h, $changed) = @_;	1123	my ($self, $w, $h) = @_;
1051		1124
1052	return unless $changed;	1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
1053		1130
		1131	my $border = $self->border;
		1132
1054	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1055	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1056		1135
1057	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058	if $self->{title};
1059
1060	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1061	}	1137	}
1062		1138
1063	sub button_down {	1139	sub button_down {
1064	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1065		1141
…		…
1081	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1082		1158
1083	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1084	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1085		1161
1086	$self->{user_x} = $wx + $dx * $mx;
1087	$self->{user_y} = $wy + $dy * $my;
1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090	$self->move ($self->{user_x}, $self->{user_y});	1164
1091	$self->realloc;	1165	$self->realloc;
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092	};	1167	};
1093		1168
1094	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1098	$self->{motion} = sub {	1173	$self->{motion} = sub {
1099	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1100		1175
1101	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1102		1177
1103	$self->{user_x} = $bx + $x - $ox;	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104	$self->{user_y} = $by + $y - $oy;
1105
1106	$self->move ($self->{user_x}, $self->{user_y});
1107	$self->realloc;
1108	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1109	}	1184	1
1110	}	1185	}
1111		1186
1112	sub button_up {	1187	sub button_up {
1113	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1114		1189
1115	delete $self->{motion};	1190	!!delete $self->{motion}
1116	}	1191	}
1117		1192
1118	sub mouse_motion {	1193	sub mouse_motion {
1119	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1120		1195
1121	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1122	}	1199	}
1123		1200
1124	sub _draw {	1201	sub _draw {
1125	my ($self) = @_;	1202	my ($self) = @_;
1126		1203
		1204	my $child = $self->{children}[0];
		1205
1127	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1128	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1129		1208
1130	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1131	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132		1211
1133	my $border = $self->border;	1212	my $border = $self->border;
…		…
1148	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1149	}	1228	}
1150		1229
1151	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1152		1231
1153	$self->{title}->draw if $self->{title};
1154
1155	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1156	}	1238	}
1157		1239
1158	#############################################################################	1240	#############################################################################
1159		1241
1160	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1234	(sum @$hs),	1316	(sum @$hs),
1235	)	1317	)
1236	}	1318	}
1237		1319
1238	sub size_allocate {	1320	sub size_allocate {
1239	my ($self, $w, $h, $changed) = @_;	1321	my ($self, $w, $h) = @_;
1240		1322
1241	my ($ws, $hs) = $self->get_wh;	1323	my ($ws, $hs) = $self->get_wh;
1242		1324
1243	my $req_w = (sum @$ws) || 1;	1325	my $req_w = (sum @$ws) || 1;
1244	my $req_h = (sum @$hs) || 1;	1326	my $req_h = (sum @$hs) || 1;
…		…
1322	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1323	)	1405	)
1324	}	1406	}
1325		1407
1326	sub size_allocate {	1408	sub size_allocate {
1327	my ($self, $w, $h, $changed) = @_;	1409	my ($self, $w, $h) = @_;
1328		1410
1329	my $space = $self->{vertical} ? $h : $w;	1411	my $space = $self->{vertical} ? $h : $w;
1330	my $children = $self->{children};	1412	my $children = $self->{children};
1331		1413
1332	my @req;	1414	my @req;
…		…
1415	ellipsise => 3, # end	1497	ellipsise => 3, # end
1416	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1417	fontsize => 1,	1499	fontsize => 1,
1418	align => -1,	1500	align => -1,
1419	valign => -1,	1501	valign => -1,
1420	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1421	can_events => 0,	1504	can_events => 0,
1422	%arg	1505	%arg
1423	);	1506	);
1424		1507
1425	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1501		1584
1502	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1503	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1504	}	1587	}
1505		1588
1506	(	1589	($w, $h)
1507	$w + $self->{padding} * 2,
1508	$h + $self->{padding} * 2,
1509	)
1510	}	1590	}
1511		1591
1512	sub size_allocate {	1592	sub size_allocate {
1513	my ($self, $w, $h, $changed) = @_;	1593	my ($self, $w, $h) = @_;
		1594
		1595	delete $self->{ox};
1514		1596
1515	delete $self->{texture}	1597	delete $self->{texture}
1516	if $changed;	1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1517	}	1599	}
1518		1600
1519	sub set_fontsize {	1601	sub set_fontsize {
1520	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1521		1603
…		…
1536	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1537	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1538	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1539	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1540		1622
1541	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1542		1625
		1626	unless (exists $self->{ox}) {
1543	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1544	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1545	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1546		1630
1547	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1548	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1549	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1550
1551	$tex
1552	};	1634	};
1553		1635
1554	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1555	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1556		1638
…		…
1651	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1652	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1653	$self->_emit ('escape');	1735	$self->_emit ('escape');
1654	} elsif ($uni) {	1736	} elsif ($uni) {
1655	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1656	}	1740	}
1657		1741
1658	$self->_set_text ($text);	1742	$self->_set_text ($text);
1659		1743
1660	$self->realloc;	1744	$self->realloc;
		1745
		1746	1
1661	}	1747	}
1662		1748
1663	sub focus_in {	1749	sub focus_in {
1664	my ($self) = @_;	1750	my ($self) = @_;
1665		1751
…		…
1680	utf8::encode $text;	1766	utf8::encode $text;
1681	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1682		1768
1683	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1684	$self->update;	1770	$self->update;
		1771
		1772	1
1685	}	1773	}
1686		1774
1687	sub mouse_motion {	1775	sub mouse_motion {
1688	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1689	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1777	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1778
		1779	0
1690	}	1780	}
1691		1781
1692	sub _draw {	1782	sub _draw {
1693	my ($self) = @_;	1783	my ($self) = @_;
1694		1784
…		…
1771	} else {	1861	} else {
1772	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1773	}	1863	}
1774		1864
1775	} else {	1865	} else {
1776	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1777	}	1869	1
1778
1779	}	1870	}
1780		1871
1781	#############################################################################	1872	#############################################################################
1782		1873
1783	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1792		1883
1793	sub new {	1884	sub new {
1794	my $class = shift;	1885	my $class = shift;
1795		1886
1796	$class->SUPER::new (	1887	$class->SUPER::new (
1797	padding => 4,	1888	padding_x => 4,
		1889	padding_y => 4,
1798	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1799	active_fg => [0, 0, 1],	1891	active_fg => [0, 0, 1],
1800	can_hover => 1,	1892	can_hover => 1,
1801	align => 0,	1893	align => 0,
1802	valign => 0,	1894	valign => 0,
…		…
1811	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1812		1904
1813	$self->emit ("activate")	1905	$self->emit ("activate")
1814	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1815	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1816	}	1910	}
1817		1911
1818	sub _draw {	1912	sub _draw {
1819	my ($self) = @_;	1913	my ($self) = @_;
1820		1914
…		…
1849		1943
1850	sub new {	1944	sub new {
1851	my $class = shift;	1945	my $class = shift;
1852		1946
1853	$class->SUPER::new (	1947	$class->SUPER::new (
1854	padding => 2,	1948	padding_x => 2,
		1949	padding_y => 2,
1855	fg => [1, 1, 1],	1950	fg => [1, 1, 1],
1856	active_fg => [1, 1, 0],	1951	active_fg => [1, 1, 0],
1857	bg => [0, 0, 0, 0.2],	1952	bg => [0, 0, 0, 0.2],
1858	active_bg => [1, 1, 1, 0.5],	1953	active_bg => [1, 1, 1, 0.5],
1859	state => 0,	1954	state => 0,
…		…
1863	}	1958	}
1864		1959
1865	sub size_request {	1960	sub size_request {
1866	my ($self) = @_;	1961	my ($self) = @_;
1867		1962
1868	($self->{padding} * 2 + 6) x 2	1963	(6) x 2
1869	}	1964	}
1870		1965
1871	sub button_down {	1966	sub button_down {
1872	my ($self, $ev, $x, $y) = @_;	1967	my ($self, $ev, $x, $y) = @_;
1873		1968
1874	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1969	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1875	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1970	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1876	$self->{state} = !$self->{state};	1971	$self->{state} = !$self->{state};
1877	$self->_emit (changed => $self->{state});	1972	$self->_emit (changed => $self->{state});
		1973	} else {
		1974	return 0
		1975	}
		1976
1878	}	1977	1
1879	}	1978	}
1880		1979
1881	sub _draw {	1980	sub _draw {
1882	my ($self) = @_;	1981	my ($self) = @_;
1883		1982
1884	$self->SUPER::_draw;	1983	$self->SUPER::_draw;
1885		1984
1886	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1985	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1887		1986
1888	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1987	my ($w, $h) = @$self{qw(w h)};
		1988
		1989	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1889		1990
1890	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1991	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1891		1992
1892	my $tex = $self->{state} ? $tex[1] : $tex[0];	1993	my $tex = $self->{state} ? $tex[1] : $tex[0];
1893		1994
…		…
2158	fg => [1, 1, 1],	2259	fg => [1, 1, 1],
2159	active_fg => [0, 0, 0],	2260	active_fg => [0, 0, 0],
2160	bg => [0, 0, 0, 0.2],	2261	bg => [0, 0, 0, 0.2],
2161	active_bg => [1, 1, 1, 0.5],	2262	active_bg => [1, 1, 1, 0.5],
2162	range => [0, 0, 100, 10, 0],	2263	range => [0, 0, 100, 10, 0],
2163	req_w => $::WIDTH / 80,	2264	min_w => $::WIDTH / 80,
2164	req_h => $::WIDTH / 80,	2265	min_h => $::WIDTH / 80,
2165	vertical => 0,	2266	vertical => 0,
2166	can_hover => 1,	2267	can_hover => 1,
2167	inner_pad => 0.02,	2268	inner_pad => 0.02,
2168	@_	2269	@_
2169	);	2270	);
…		…
2209	}	2310	}
2210		2311
2211	sub size_request {	2312	sub size_request {
2212	my ($self) = @_;	2313	my ($self) = @_;
2213		2314
2214	my $w = $self->{req_w};	2315	($self->{req_w}, $self->{req_h})
2215	my $h = $self->{req_h};
2216
2217	$self->{vertical} ? ($h, $w) : ($w, $h)
2218	}	2316	}
2219		2317
2220	sub button_down {	2318	sub button_down {
2221	my ($self, $ev, $x, $y) = @_;	2319	my ($self, $ev, $x, $y) = @_;
2222		2320
2223	$self->SUPER::button_down ($ev, $x, $y);	2321	$self->SUPER::button_down ($ev, $x, $y);
2224		2322
2225	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2323	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2226		2324
2227	$self->mouse_motion ($ev, $x, $y);	2325	$self->mouse_motion ($ev, $x, $y)
2228	}	2326	}
2229		2327
2230	sub mouse_motion {	2328	sub mouse_motion {
2231	my ($self, $ev, $x, $y) = @_;	2329	my ($self, $ev, $x, $y) = @_;
2232		2330
…		…
2236	my (undef, $lo, $hi, $page) = @{$self->{range}};	2334	my (undef, $lo, $hi, $page) = @{$self->{range}};
2237		2335
2238	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2336	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2239		2337
2240	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2338	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2339	} else {
		2340	return 0;
		2341	}
		2342
2241	}	2343	1
2242	}	2344	}
2243		2345
2244	sub update {	2346	sub update {
2245	my ($self) = @_;	2347	my ($self) = @_;
2246		2348
2247	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2349	delete $self->{knob_w};
		2350	$self->SUPER::update;
		2351	}
		2352
		2353	sub _draw {
		2354	my ($self) = @_;
		2355
		2356	unless ($self->{knob_w}) {
2248	$self->set_value ($self->{range}[0]);	2357	$self->set_value ($self->{range}[0]);
2249		2358
2250	my ($value, $lo, $hi, $page) = @{$self->{range}};	2359	my ($value, $lo, $hi, $page) = @{$self->{range}};
2251	my $range = ($hi - $page - $lo) || 1e-100;	2360	my $range = ($hi - $page - $lo) || 1e-100;
2252		2361
…		…
2258	$value = ($value - $lo) / $range;	2367	$value = ($value - $lo) / $range;
2259	$value = $value * $self->{scale} + $self->{offset};	2368	$value = $value * $self->{scale} + $self->{offset};
2260		2369
2261	$self->{knob_x} = $value - $knob_w * 0.5;	2370	$self->{knob_x} = $value - $knob_w * 0.5;
2262	$self->{knob_w} = $knob_w;	2371	$self->{knob_w} = $knob_w;
2263	});	2372	}
2264
2265	$self->SUPER::update;
2266	}
2267
2268	sub _draw {
2269	my ($self) = @_;
2270		2373
2271	$self->SUPER::_draw ();	2374	$self->SUPER::_draw ();
2272		2375
2273	glScale $self->{w}, $self->{h};	2376	glScale $self->{w}, $self->{h};
2274		2377
…		…
2372	$self->{fontsize} = $fontsize;	2475	$self->{fontsize} = $fontsize;
2373	$self->reflow;	2476	$self->reflow;
2374	}	2477	}
2375		2478
2376	sub size_allocate {	2479	sub size_allocate {
2377	my ($self, $w, $h, $changed) = @_;	2480	my ($self, $w, $h) = @_;
2378		2481
2379	$self->SUPER::size_allocate ($w, $h, $changed);	2482	$self->SUPER::size_allocate ($w, $h);
2380
2381	return unless $changed;
2382		2483
2383	$self->{layout}->set_font ($self->{font}) if $self->{font};	2484	$self->{layout}->set_font ($self->{font}) if $self->{font};
2384	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2485	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2385	$self->{layout}->set_width ($self->{children}[0]{w});	2486	$self->{layout}->set_width ($self->{children}[0]{w});
2386		2487
…		…
2609	}	2710	}
2610		2711
2611	sub set_tooltip_from {	2712	sub set_tooltip_from {
2612	my ($self, $widget) = @_;	2713	my ($self, $widget) = @_;
2613		2714
		2715	my $tooltip = $widget->{tooltip};
		2716
		2717	if ($ENV{CFPLUS_DEBUG} & 2) {
		2718	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2719	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2720	. "req $widget->{req_w} $widget->{req_h}\n"
		2721	. "visible $widget->{visible}";
		2722	}
		2723
2614	$self->add (new CFClient::UI::Label	2724	$self->add (new CFClient::UI::Label
2615	markup => $widget->{tooltip},	2725	markup => $tooltip,
2616	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2726	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2617	fontsize => 0.8,	2727	fontsize => 0.8,
2618	fg => [0, 0, 0, 1],	2728	fg => [0, 0, 0, 1],
2619	ellipsise => 0,	2729	ellipsise => 0,
2620	font => ($widget->{tooltip_font} || $::FONT_PROP),	2730	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2628		2738
2629	($w + 4, $h + 4)	2739	($w + 4, $h + 4)
2630	}	2740	}
2631		2741
2632	sub size_allocate {	2742	sub size_allocate {
2633	my ($self, $w, $h, $changed) = @_;	2743	my ($self, $w, $h) = @_;
2634		2744
2635	return unless $changed;
2636
2637	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2745	$self->SUPER::size_allocate ($w - 4, $h - 4);
2638	}	2746	}
2639		2747
2640	sub visibility_change {	2748	sub visibility_change {
2641	my ($self, $visible) = @_;	2749	my ($self, $visible) = @_;
2642		2750
…		…
2649	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2757	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650		2758
2651	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2759	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652	if $x + $self->{w} > $::WIDTH;	2760	if $x + $self->{w} > $::WIDTH;
2653		2761
2654	$self->move ($x, $y);	2762	$self->move_abs ($x, $y);
2655	});	2763	});
2656	}	2764	}
2657		2765
2658	sub _draw {	2766	sub _draw {
2659	my ($self) = @_;	2767	my ($self) = @_;
…		…
2763	$self->SUPER::DESTROY;	2871	$self->SUPER::DESTROY;
2764	}	2872	}
2765		2873
2766	#############################################################################	2874	#############################################################################
2767		2875
2768	package CFClient::UI::Inventory;	2876	package CFClient::UI::Buttonbar;
2769		2877
2770	our @ISA = CFClient::UI::ScrolledWindow::;	2878	our @ISA = CFClient::UI::HBox::;
2771		2879
2772	sub new {	2880	# TODO: should actualyl wrap buttons and other goodies.
2773	my $class = shift;
2774
2775	my $self = $class->SUPER::new (
2776	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2777	@_,
2778	);
2779
2780	$self
2781	}
2782
2783	sub set_items {
2784	my ($self, $items) = @_;
2785
2786	$self->{scrolled}->clear;
2787	return unless $items;
2788
2789	my @items = sort {
2790	($a->{type} <=> $b->{type})
2791	or ($a->{name} cmp $b->{name})
2792	} @$items;
2793
2794	$self->{real_items} = \@items;
2795
2796	my $row = 0;
2797	for my $item (@items) {
2798	CFClient::Item::update_widgets $item;
2799
2800	$self->{scrolled}->add (0, $row, $item->{face_widget});
2801	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2802	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2803
2804	$row++;
2805	}
2806	}
2807		2881
2808	#############################################################################	2882	#############################################################################
2809		2883
2810	package CFClient::UI::Menu;	2884	package CFClient::UI::Menu;
2811		2885
…		…
2852	# maybe save $GRAB? must be careful about events...	2926	# maybe save $GRAB? must be careful about events...
2853	$GRAB = $self;	2927	$GRAB = $self;
2854	$self->{button} = $ev->{button};	2928	$self->{button} = $ev->{button};
2855		2929
2856	$self->show;	2930	$self->show;
2857	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2931	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858	}	2932	}
2859		2933
2860	sub mouse_motion {	2934	sub mouse_motion {
2861	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2862		2936
2863	# TODO: should use vbox->find_widget or so	2937	# TODO: should use vbox->find_widget or so
2864	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2938	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2865	$self->{hover} = $self->{item}{$HOVER};	2939	$self->{hover} = $self->{item}{$HOVER};
		2940
		2941	0
2866	}	2942	}
2867		2943
2868	sub button_up {	2944	sub button_up {
2869	my ($self, $ev, $x, $y) = @_;	2945	my ($self, $ev, $x, $y) = @_;
2870		2946
…		…
2872	undef $GRAB;	2948	undef $GRAB;
2873	$self->hide;	2949	$self->hide;
2874		2950
2875	$self->_emit ("popdown");	2951	$self->_emit ("popdown");
2876	$self->{hover}[1]->() if $self->{hover};	2952	$self->{hover}[1]->() if $self->{hover};
		2953	} else {
		2954	return 0
		2955	}
		2956
		2957	1
		2958	}
		2959
		2960	#############################################################################
		2961
		2962	package CFClient::UI::Multiplexer;
		2963
		2964	our @ISA = CFClient::UI::Container::;
		2965
		2966	sub new {
		2967	my $class = shift;
		2968
		2969	my $self = $class->SUPER::new (
		2970	@_,
		2971	);
		2972
		2973	$self->{current} = $self->{children}[0]
		2974	if @{ $self->{children} };
		2975
		2976	$self
		2977	}
		2978
		2979	sub add {
		2980	my ($self, @widgets) = @_;
		2981
		2982	$self->SUPER::add (@widgets);
		2983
		2984	$self->{current} = $self->{children}[0]
		2985	if @{ $self->{children} };
		2986	}
		2987
		2988	sub set_current_page {
		2989	my ($self, $page_or_widget) = @_;
		2990
		2991	my $widget = ref $page_or_widget
		2992	? $page_or_widget
		2993	: $self->{children}[$page_or_widget];
		2994
		2995	$self->{current} = $widget;
		2996	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2997
		2998	$self->_emit (page_changed => $self->{current});
		2999
		3000	$self->realloc;
		3001	}
		3002
		3003	sub visible_children {
		3004	$_[0]{current}
		3005	}
		3006
		3007	sub size_request {
		3008	my ($self) = @_;
		3009
		3010	$self->{current}->size_request
		3011	}
		3012
		3013	sub size_allocate {
		3014	my ($self, $w, $h) = @_;
		3015
		3016	$self->{current}->configure (0, 0, $w, $h);
		3017	}
		3018
		3019	sub _draw {
		3020	my ($self) = @_;
		3021
		3022	$self->{current}->draw;
		3023	}
		3024
		3025	#############################################################################
		3026
		3027	package CFClient::UI::Notebook;
		3028
		3029	our @ISA = CFClient::UI::VBox::;
		3030
		3031	sub new {
		3032	my $class = shift;
		3033
		3034	my $self = $class->SUPER::new (
		3035	buttonbar => (new CFClient::UI::Buttonbar),
		3036	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3037	# filter => # will be put between multiplexer and $self
		3038	@_,
		3039	);
2877	}	3040
		3041	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3042	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3043
		3044	$self
		3045	}
		3046
		3047	sub add {
		3048	my ($self, $title, $widget, $tooltip) = @_;
		3049
		3050	Scalar::Util::weaken $self;
		3051
		3052	$self->{buttonbar}->add (new CFClient::UI::Button
		3053	markup => $title,
		3054	tooltip => $tooltip,
		3055	on_activate => sub { $self->set_current_page ($widget) },
		3056	);
		3057
		3058	$self->{multiplexer}->add ($widget);
		3059	}
		3060
		3061	sub set_current_page {
		3062	my ($self, $page) = @_;
		3063
		3064	$self->{multiplexer}->set_current_page ($page);
		3065	$self->_emit (page_changed => $self->{multiplexer}{current});
2878	}	3066	}
2879		3067
2880	#############################################################################	3068	#############################################################################
2881		3069
2882	package CFClient::UI::Statusbox;	3070	package CFClient::UI::Statusbox;
…		…
2987	$self->SUPER::reconfigure;	3175	$self->SUPER::reconfigure;
2988	}	3176	}
2989		3177
2990	#############################################################################	3178	#############################################################################
2991		3179
		3180	package CFClient::UI::Inventory;
		3181
		3182	our @ISA = CFClient::UI::ScrolledWindow::;
		3183
		3184	sub new {
		3185	my $class = shift;
		3186
		3187	my $self = $class->SUPER::new (
		3188	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3189	@_,
		3190	);
		3191
		3192	$self
		3193	}
		3194
		3195	sub set_items {
		3196	my ($self, $items) = @_;
		3197
		3198	$self->{child}->clear;
		3199	return unless $items;
		3200
		3201	my @items = sort {
		3202	($a->{type} <=> $b->{type})
		3203	or ($a->{name} cmp $b->{name})
		3204	} @$items;
		3205
		3206	$self->{real_items} = \@items;
		3207
		3208	my $row = 0;
		3209	for my $item (@items) {
		3210	CFClient::Item::update_widgets $item;
		3211
		3212	$self->{child}->add (0, $row, $item->{face_widget});
		3213	$self->{child}->add (1, $row, $item->{desc_widget});
		3214	$self->{child}->add (2, $row, $item->{weight_widget});
		3215
		3216	$row++;
		3217	}
		3218	}
		3219
		3220	#############################################################################
		3221
		3222	package CFClient::UI::BindEditor;
		3223
		3224	our @ISA = CFClient::UI::FancyFrame::;
		3225
		3226	sub new {
		3227	my $class = shift;
		3228
		3229	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3230
		3231	$self->add (my $vb = new CFClient::UI::VBox);
		3232
		3233
		3234	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3235	text => "start recording",
		3236	tooltip => "Start/Stops recording of actions."
		3237	."All subsequent actions after the recording started will be captured."
		3238	."The actions are displayed after the record was stopped."
		3239	."To bind the action you have to click on the 'Bind' button",
		3240	on_activate => sub {
		3241	unless ($self->{recording}) {
		3242	$self->start;
		3243	} else {
		3244	$self->stop;
		3245	}
		3246	});
		3247
		3248	$vb->add (new CFClient::UI::Label text => "Actions:");
		3249	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3250
		3251	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3252	$vb->add (my $hb = new CFClient::UI::HBox);
		3253	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3254	$hb->add (new CFClient::UI::Button
		3255	text => "bind",
		3256	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3257	on_activate => sub {
		3258	$self->ask_for_bind;
		3259	});
		3260
		3261	$vb->add (my $hb = new CFClient::UI::HBox);
		3262	$hb->add (new CFClient::UI::Button
		3263	text => "ok",
		3264	expand => 1,
		3265	tooltip => "This closes the binding editor and saves the binding",
		3266	on_activate => sub {
		3267	$self->hide;
		3268	$self->commit;
		3269	});
		3270
		3271	$hb->add (new CFClient::UI::Button
		3272	text => "cancel",
		3273	expand => 1,
		3274	tooltip => "This closes the binding editor without saving",
		3275	on_activate => sub {
		3276	$self->hide;
		3277	$self->{binding_cancel}->()
		3278	if $self->{binding_cancel};
		3279	});
		3280
		3281	$self->update_binding_widgets;
		3282
		3283	$self
		3284	}
		3285
		3286	sub commit {
		3287	my ($self) = @_;
		3288	my ($mod, $sym, $cmds) = $self->get_binding;
		3289	if ($sym != 0 && @$cmds > 0) {
		3290	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3291	."'. Don't forget 'Save Config'!");
		3292	$self->{binding_change}->($mod, $sym, $cmds)
		3293	if $self->{binding_change};
		3294	} else {
		3295	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3296	$self->{binding_cancel}->()
		3297	if $self->{binding_cancel};
		3298	}
		3299	}
		3300
		3301	sub start {
		3302	my ($self) = @_;
		3303
		3304	$self->{rec_btn}->set_text ("stop recording");
		3305	$self->{recording} = 1;
		3306	$self->clear_command_list;
		3307	$::CONN->start_record if $::CONN;
		3308	}
		3309
		3310	sub stop {
		3311	my ($self) = @_;
		3312
		3313	$self->{rec_btn}->set_text ("start recording");
		3314	$self->{recording} = 0;
		3315
		3316	my $rec;
		3317	$rec = $::CONN->stop_record if $::CONN;
		3318	return unless ref $rec eq 'ARRAY';
		3319	$self->set_command_list ($rec);
		3320	}
		3321
		3322
		3323	sub ask_for_bind_and_commit {
		3324	my ($self) = @_;
		3325	$self->ask_for_bind (1);
		3326	}
		3327
		3328	sub ask_for_bind {
		3329	my ($self, $commit) = @_;
		3330
		3331	CFClient::Binder::open_binding_dialog (sub {
		3332	my ($mod, $sym) = @_;
		3333	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3334	$self->update_binding_widgets;
		3335	$self->commit if $commit;
		3336	});
		3337	}
		3338
		3339	# $mod and $sym are the modifiers and key symbol
		3340	# $cmds is a array ref of strings (the commands)
		3341	# $cb is the callback that is executed on OK
		3342	# $ccb is the callback that is executed on CANCEL and
		3343	# when the binding was unsuccessful on OK
		3344	sub set_binding {
		3345	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3346
		3347	$self->clear_command_list;
		3348	$self->{recording} = 0;
		3349	$self->{rec_btn}->set_text ("start recording");
		3350
		3351	$self->{binding} = [$mod, $sym];
		3352	$self->{commands} = $cmds;
		3353
		3354	$self->{binding_change} = $cb;
		3355	$self->{binding_cancel} = $ccb;
		3356
		3357	$self->update_binding_widgets;
		3358	}
		3359
		3360	# this is a shortcut method that asks for a binding
		3361	# and then just binds it.
		3362	sub do_quick_binding {
		3363	my ($self, $cmds) = @_;
		3364	$self->set_binding (undef, undef, $cmds, sub {
		3365	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3366	});
		3367	$self->ask_for_bind (1);
		3368	}
		3369
		3370	sub update_binding_widgets {
		3371	my ($self) = @_;
		3372	my ($mod, $sym, $cmds) = $self->get_binding;
		3373	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3374	$self->set_command_list ($cmds);
		3375	}
		3376
		3377	sub get_binding {
		3378	my ($self) = @_;
		3379	return (
		3380	$self->{binding}->[0],
		3381	$self->{binding}->[1],
		3382	[ grep { defined $_ } @{$self->{commands}} ]
		3383	);
		3384	}
		3385
		3386	sub clear_command_list {
		3387	my ($self) = @_;
		3388	$self->{cmdbox}->clear ();
		3389	}
		3390
		3391	sub set_command_list {
		3392	my ($self, $cmds) = @_;
		3393
		3394	$self->{cmdbox}->clear ();
		3395	$self->{commands} = $cmds;
		3396
		3397	my $idx = 0;
		3398
		3399	for (@$cmds) {
		3400	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3401
		3402	my $i = $idx;
		3403	$hb->add (new CFClient::UI::Label text => $_);
		3404	$hb->add (new CFClient::UI::Button
		3405	text => "delete",
		3406	tooltip => "Deletes the action from the record",
		3407	on_activate => sub {
		3408	$self->{cmdbox}->remove ($hb);
		3409	$cmds->[$i] = undef;
		3410	});
		3411
		3412
		3413	$idx++
		3414	}
		3415	}
		3416
		3417	#############################################################################
		3418
		3419	package CFClient::UI::SpellList;
		3420
		3421	our @ISA = CFClient::UI::Table::;
		3422
		3423	sub new {
		3424	my $class = shift;
		3425
		3426	my $self = $class->SUPER::new (
		3427	binding => [],
		3428	commands => [],
		3429	@_,
		3430	)
		3431	}
		3432
		3433	# XXX: Do sorting? Argl...
		3434	sub add_spell {
		3435	my ($self, $spell) = @_;
		3436	$self->{spells}->{$spell->{name}} = $spell;
		3437
		3438	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3439	face => $spell->{face},
		3440	can_hover => 1,
		3441	can_events => 1,
		3442	tooltip => $spell->{message});
		3443
		3444	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3445	text => $spell->{name},
		3446	can_hover => 1,
		3447	can_events => 1,
		3448	tooltip => $spell->{message},
		3449	expand => 1);
		3450
		3451	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3452	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3453	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3454	expand => 1);
		3455
		3456	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3457	text => "bind to key",
		3458	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3459	}
		3460
		3461	sub rebuild_spell_list {
		3462	my ($self) = @_;
		3463	$self->{tbl_idx} = 0;
		3464	$self->add_spell ($_) for values %{$self->{spells}};
		3465	}
		3466
		3467	sub remove_spell {
		3468	my ($self, $spell) = @_;
		3469	delete $self->{spells}->{$spell->{name}};
		3470	$self->rebuild_spell_list;
		3471	}
		3472
		3473	#############################################################################
		3474
2992	package CFClient::UI::Root;	3475	package CFClient::UI::Root;
2993		3476
2994	our @ISA = CFClient::UI::Container::;	3477	our @ISA = CFClient::UI::Container::;
2995		3478
2996	use CFClient::OpenGL;	3479	use CFClient::OpenGL;
…		…
3006	Scalar::Util::weaken ($self->{root} = $self);	3489	Scalar::Util::weaken ($self->{root} = $self);
3007		3490
3008	$self	3491	$self
3009	}	3492	}
3010		3493
3011	sub configure {
3012	my ($self, $x, $y, $w, $h) = @_;
3013
3014	$self->{w} = $w;
3015	$self->{h} = $h;
3016	}
3017
3018	sub reconfigure {
3019	my ($self) = @_;
3020
3021	$self->SUPER::reconfigure;
3022
3023	$self->size_allocate ($self->{w}, $self->{h}, 1)
3024	if $self->{w};
3025	}
3026
3027	sub size_request {	3494	sub size_request {
3028	my ($self) = @_;	3495	my ($self) = @_;
3029		3496
3030	($self->{w}, $self->{h})	3497	($self->{w}, $self->{h})
3031	}	3498	}
3032		3499
		3500	sub _to_pixel {
		3501	my ($coord, $size, $max) = @_;
		3502
		3503	$coord =
		3504	$coord eq "center" ? ($max - $size) * 0.5
		3505	: $coord eq "max" ? $max
		3506	: $coord;
		3507
		3508	$coord = 0 if $coord < 0;
		3509	$coord = $max - $size if $coord > $max - $size;
		3510
		3511	int $coord + 0.5
		3512	}
		3513
3033	sub size_allocate {	3514	sub size_allocate {
3034	my ($self, $w, $h, $changed) = @_;	3515	my ($self, $w, $h) = @_;
3035		3516
3036	for my $child ($self->children) {	3517	for my $child ($self->children) {
3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3518	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038		3519
3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3520	$X = $child->{force_x} if exists $child->{force_x};
3040	if exists $child->{req_x};	3521	$Y = $child->{force_y} if exists $child->{force_y};
3041		3522
3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3523	$X = _to_pixel $X, $W, $self->{w};
3043	if exists $child->{req_y};	3524	$Y = _to_pixel $Y, $H, $self->{h};
3044
3045	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049		3525
3050	$child->configure ($X, $Y, $W, $H);	3526	$child->configure ($X, $Y, $W, $H);
3051	}	3527	}
3052	}	3528	}
3053		3529
…		…
3070	}	3546	}
3071		3547
3072	sub add {	3548	sub add {
3073	my ($self, @children) = @_;	3549	my ($self, @children) = @_;
3074		3550
3075	for my $child (@children) {
3076	$child->{is_toplevel} = 1;	3551	$_->{is_toplevel} = 1
3077		3552	for @children;
3078	# integerise window positions
3079	$child->{x} = int $child->{x};
3080	$child->{y} = int $child->{y};
3081	}
3082		3553
3083	$self->SUPER::add (@children);	3554	$self->SUPER::add (@children);
3084	}	3555	}
3085		3556
3086	sub remove {	3557	sub remove {
3087	my ($self, @children) = @_;	3558	my ($self, @children) = @_;
3088		3559
3089	$self->SUPER::remove (@children);	3560	$self->SUPER::remove (@children);
		3561
		3562	delete $self->{is_toplevel}
		3563	for @children;
3090		3564
3091	while (@children) {	3565	while (@children) {
3092	my $w = pop @children;	3566	my $w = pop @children;
3093	push @children, $w->children;	3567	push @children, $w->children;
3094	$w->set_invisible;	3568	$w->set_invisible;
…		…
3114	$_->()	3588	$_->()
3115	for values %{delete $self->{refresh_hook}};	3589	for values %{delete $self->{refresh_hook}};
3116	}	3590	}
3117		3591
3118	if ($self->{realloc}) {	3592	if ($self->{realloc}) {
		3593	my %queue;
3119	my @queue;	3594	my @queue;
		3595	my $widget;
3120		3596
		3597	outer:
3121	while () {	3598	while () {
3122	if ($self->{realloc}) {	3599	if (my $realloc = delete $self->{realloc}) {
3123	#TODO use array-of-depth approach	3600	for $widget (values %$realloc) {
		3601	$widget->{visible} or next; # do not resize invisible widgets
3124		3602
3125	@queue = sort { $a->{visible} <=> $b->{visible} }	3603	$queue{$widget+0}++ and next; # duplicates are common
3126	@queue, values %{delete $self->{realloc}};	3604
		3605	push @{ $queue[$widget->{visible}] }, $widget;
		3606	}
3127	}	3607	}
3128		3608
		3609	while () {
		3610	@queue or last outer;
		3611
		3612	$widget = pop @{ $queue[-1] || [] }
		3613	and last;
		3614
		3615	pop @queue;
		3616	}
		3617
		3618	delete $queue{$widget+0};
		3619
		3620	my ($w, $h) = $widget->size_request;
		3621
		3622	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3623	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3624
		3625	$w = $widget->{force_w} if exists $widget->{force_w};
		3626	$h = $widget->{force_h} if exists $widget->{force_h};
		3627
		3628	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3629	|| delete $widget->{force_realloc}) {
		3630	$widget->{req_w} = $w;
		3631	$widget->{req_h} = $h;
		3632
		3633	$self->{size_alloc}{$widget+0} = $widget;
		3634
		3635	if (my $parent = $widget->{parent}) {
		3636	$self->{realloc}{$parent+0} = $parent
		3637	unless $queue{$parent+0};
		3638
		3639	$parent->{force_size_alloc} = 1;
		3640	$self->{size_alloc}{$parent+0} = $parent;
		3641	}
		3642	}
		3643
		3644	delete $self->{realloc}{$widget+0};
		3645	}
		3646	}
		3647
		3648	while (my $size_alloc = delete $self->{size_alloc}) {
		3649	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3650	values %$size_alloc;
		3651
		3652	while () {
3129	my $widget = pop @queue || last;	3653	my $widget = pop @queue || last;
3130		3654
3131	$widget->{visible} or last; # do not resize invisible widgets	3655	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3132
3133	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134	? @$widget{qw(def_w def_h)}
3135	: $widget->size_request;
3136
3137	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139	$widget->{req_w} = $w;
3140	$widget->{req_h} = $h;
3141
3142	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144	push @queue, $widget->{parent}
3145	if $widget->{parent};
3146	}
3147	}
3148
3149	while (my $size_alloc = delete $self->{size_alloc}) {
3150	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151	values %$size_alloc;
3152
3153	while () {
3154	my ($widget, $w, $h) = @{ pop @queue or last };
3155		3656
3156	$w = 0 if $w < 0;	3657	$w = 0 if $w < 0;
3157	$h = 0 if $h < 0;	3658	$h = 0 if $h < 0;
3158		3659
3159	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3660	$w = int $w + 0.5;
		3661	$h = int $h + 0.5;
3160		3662
		3663	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3664	$widget->{old_w} = $widget->{w};
		3665	$widget->{old_h} = $widget->{h};
		3666
3161	$widget->{w} = $w;	3667	$widget->{w} = $w;
3162	$widget->{h} = $h;	3668	$widget->{h} = $h;
3163		3669
3164	$widget->emit (size_allocate => $w, $h, $changed);	3670	$widget->emit (size_allocate => $w, $h);
		3671	}
3165	}	3672	}
3166	}	3673	}
3167		3674
3168	while ($self->{post_alloc_hook}) {	3675	while ($self->{post_alloc_hook}) {
3169	$_->()	3676	$_->()
3170	for values %{delete $self->{post_alloc_hook}};	3677	for values %{delete $self->{post_alloc_hook}};
3171	}	3678	}
		3679
3172		3680
3173	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3681	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3682	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175	glClear GL_COLOR_BUFFER_BIT;	3683	glClear GL_COLOR_BUFFER_BIT;
3176		3684
…		…
3178	glLoadIdentity;	3686	glLoadIdentity;
3179	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3687	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180	glMatrixMode GL_MODELVIEW;	3688	glMatrixMode GL_MODELVIEW;
3181	glLoadIdentity;	3689	glLoadIdentity;
3182		3690
		3691	{
		3692	package CFClient::UI::Base;
		3693
		3694	($draw_x, $draw_y, $draw_w, $draw_h) =
		3695	(0, 0, $self->{w}, $self->{h});
		3696	}
		3697
3183	$self->_draw;	3698	$self->_draw;
3184	}	3699	}
3185		3700
3186	#############################################################################	3701	#############################################################################
3187		3702

Diff Legend

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