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.272 by root, Sat Jun 3 01:47:14 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	#############################################################################
…		…
777	$ROOT->on_post_alloc ($self => sub { $self->render_child });	814	$ROOT->on_post_alloc ($self => sub { $self->render_child });
778	$self->SUPER::update;	815	$self->SUPER::update;
779	}	816	}
780		817
781	sub size_allocate {	818	sub size_allocate {
782	my ($self, $w, $h, $changed) = @_;	819	my ($self, $w, $h) = @_;
783		820
784	$self->SUPER::size_allocate ($w, $h, $changed);	821	$self->SUPER::size_allocate ($w, $h);
785	$self->update	822	$self->update;
786	if $changed;
787	}	823	}
788		824
789	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
790	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
791	}	829	}
792		830
793	sub render_child {	831	sub render_child {
794	my ($self) = @_;	832	my ($self) = @_;
795		833
796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
799		837
		838	{
		839	package CFClient::UI::Base;
		840
		841	($draw_x, $draw_y, $draw_w, $draw_h) =
		842	(0, 0, $self->{w}, $self->{h});
		843	}
		844
800	$self->_render;	845	$self->_render;
801	};	846	};
802	}	847	}
803		848
804	sub _draw {	849	sub _draw {
805	my ($self) = @_;	850	my ($self) = @_;
806		851
807	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
808		853
809	my $tex = $self->{texture}	854	my $tex = $self->{texture}
810	or return;	855	or return;
811		856
812	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
835	}	880	}
836		881
837	sub size_request {	882	sub size_request {
838	my ($self) = @_;	883	my ($self) = @_;
839		884
840	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		886
842	$w = 10 if $self->{scroll_x};	887	$w = 10 if $self->{scroll_x};
843	$h = 10 if $self->{scroll_y};	888	$h = 10 if $self->{scroll_y};
844		889
845	($w, $h)	890	($w, $h)
846	}	891	}
847		892
848	sub size_allocate {	893	sub size_allocate {
849	my ($self, $w, $h, $changed) = @_;	894	my ($self, $w, $h) = @_;
850		895
		896	my $child = $self->child;
		897
851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853		900
854	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
855	$self->update;	902	$self->update;
856	}	903	}
857		904
…		…
892	}	939	}
893	}	940	}
894		941
895	sub _render {	942	sub _render {
896	my ($self) = @_;	943	my ($self) = @_;
		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
897		947
898	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899		949
900	$self->SUPER::_render;	950	$self->SUPER::_render;
901	}	951	}
…		…
941	my $child = $self->{vp}->child;	991	my $child = $self->{vp}->child;
942	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	992	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943	}	993	}
944		994
945	sub size_allocate {	995	sub size_allocate {
946	my ($self, $w, $h, $changed) = @_;	996	my ($self, $w, $h) = @_;
947		997
948	$self->SUPER::size_allocate ($w, $h, $changed);	998	$self->SUPER::size_allocate ($w, $h);
949		999
950	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
951	$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]);
952	}	1002	}
953		1003
…		…
1009	my @border =	1059	my @border =
1010	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1060	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);	1061	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1012		1062
1013	sub new {	1063	sub new {
1014	my $class = shift;	1064	my ($class, %arg) = @_;
		1065
		1066	my $title = delete $arg{title};
1015		1067
1016	my $self = $class->SUPER::new (	1068	my $self = $class->SUPER::new (
1017	bg => [1, 1, 1, 1],	1069	bg => [1, 1, 1, 1],
1018	border_bg => [1, 1, 1, 1],	1070	border_bg => [1, 1, 1, 1],
1019	border => 0.6,	1071	border => 0.6,
1020	is_toplevel => 1,
1021	can_events => 1,	1072	can_events => 1,
1022	@_	1073	min_w => 16,
		1074	min_h => 16,
		1075	%arg,
1023	);	1076	);
1024		1077
1025	$self->{title} &&= new CFClient::UI::Label	1078	$self->{title} = new CFClient::UI::Label
1026	align => 0,	1079	align => 0,
1027	valign => 1,	1080	valign => 1,
1028	text => $self->{title},	1081	text => $title,
1029	fontsize => $self->{border};	1082	fontsize => $self->{border}
		1083	if defined $title;
1030		1084
1031	$self	1085	$self
		1086	}
		1087
		1088	sub add {
		1089	my ($self, @widgets) = @_;
		1090
		1091	$self->SUPER::add (@widgets);
		1092	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1032	}	1093	}
1033		1094
1034	sub border {	1095	sub border {
1035	int $_[0]{border} * $::FONTSIZE	1096	int $_[0]{border} * $::FONTSIZE
1036	}	1097	}
1037		1098
1038	sub size_request {	1099	sub size_request {
1039	my ($self) = @_;	1100	my ($self) = @_;
		1101
		1102	$self->{title}->size_request
		1103	if $self->{title};
1040		1104
1041	my ($w, $h) = $self->SUPER::size_request;	1105	my ($w, $h) = $self->SUPER::size_request;
1042		1106
1043	(	1107	(
1044	$w + $self->border * 2,	1108	$w + $self->border * 2,
1045	$h + $self->border * 2,	1109	$h + $self->border * 2,
1046	)	1110	)
1047	}	1111	}
1048		1112
1049	sub size_allocate {	1113	sub size_allocate {
1050	my ($self, $w, $h, $changed) = @_;	1114	my ($self, $w, $h) = @_;
1051		1115
1052	return unless $changed;	1116	if ($self->{title}) {
		1117	$self->{title}{w} = $w;
		1118	$self->{title}{h} = $h;
		1119	$self->{title}->size_allocate ($w, $h);
		1120	}
1053		1121
		1122	my $border = $self->border;
		1123
1054	$h -= List::Util::max 0, $self->border * 2;	1124	$h -= List::Util::max 0, $border * 2;
1055	$w -= List::Util::max 0, $self->border * 2;	1125	$w -= List::Util::max 0, $border * 2;
1056		1126
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);	1127	$self->child->configure ($border, $border, $w, $h);
1061	}	1128	}
1062		1129
1063	sub button_down {	1130	sub button_down {
1064	my ($self, $ev, $x, $y) = @_;	1131	my ($self, $ev, $x, $y) = @_;
1065		1132
…		…
1081	my ($ev, $x, $y) = @_;	1148	my ($ev, $x, $y) = @_;
1082		1149
1083	my $dx = $ev->{x} - $ox;	1150	my $dx = $ev->{x} - $ox;
1084	my $dy = $ev->{y} - $oy;	1151	my $dy = $ev->{y} - $oy;
1085		1152
1086	$self->{user_x} = $wx + $dx * $mx;
1087	$self->{user_y} = $wy + $dy * $my;
1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1153	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1154	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090	$self->move ($self->{user_x}, $self->{user_y});	1155
1091	$self->realloc;	1156	$self->realloc;
		1157	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092	};	1158	};
1093		1159
1094	} elsif ($lr ^ $td) {	1160	} elsif ($lr ^ $td) {
1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1161	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096	my ($bx, $by) = ($self->{x}, $self->{y});	1162	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1098	$self->{motion} = sub {	1164	$self->{motion} = sub {
1099	my ($ev, $x, $y) = @_;	1165	my ($ev, $x, $y) = @_;
1100		1166
1101	($x, $y) = ($ev->{x}, $ev->{y});	1167	($x, $y) = ($ev->{x}, $ev->{y});
1102		1168
1103	$self->{user_x} = $bx + $x - $ox;	1169	$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	};	1170	};
		1171	} else {
		1172	return 0;
		1173	}
		1174
1109	}	1175	1
1110	}	1176	}
1111		1177
1112	sub button_up {	1178	sub button_up {
1113	my ($self, $ev, $x, $y) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1114		1180
1115	delete $self->{motion};	1181	!!delete $self->{motion}
1116	}	1182	}
1117		1183
1118	sub mouse_motion {	1184	sub mouse_motion {
1119	my ($self, $ev, $x, $y) = @_;	1185	my ($self, $ev, $x, $y) = @_;
1120		1186
1121	$self->{motion}->($ev, $x, $y) if $self->{motion};	1187	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1188
		1189	!!$self->{motion}
1122	}	1190	}
1123		1191
1124	sub _draw {	1192	sub _draw {
1125	my ($self) = @_;	1193	my ($self) = @_;
1126		1194
		1195	my $child = $self->{children}[0];
		1196
1127	my ($w, $h ) = ($self->{w}, $self->{h});	1197	my ($w, $h ) = ($self->{w}, $self->{h});
1128	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1198	my ($cw, $ch) = ($child->{w}, $child->{h});
1129		1199
1130	glEnable GL_TEXTURE_2D;	1200	glEnable GL_TEXTURE_2D;
1131	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1201	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132		1202
1133	my $border = $self->border;	1203	my $border = $self->border;
…		…
1148	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1218	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1149	}	1219	}
1150		1220
1151	glDisable GL_TEXTURE_2D;	1221	glDisable GL_TEXTURE_2D;
1152		1222
1153	$self->{title}->draw if $self->{title};
1154
1155	$self->child->draw;	1223	$child->draw;
		1224
		1225	if ($self->{title}) {
		1226	glTranslate 0, $border - $self->{h};
		1227	$self->{title}->_draw;
		1228	}
1156	}	1229	}
1157		1230
1158	#############################################################################	1231	#############################################################################
1159		1232
1160	package CFClient::UI::Table;	1233	package CFClient::UI::Table;
…		…
1234	(sum @$hs),	1307	(sum @$hs),
1235	)	1308	)
1236	}	1309	}
1237		1310
1238	sub size_allocate {	1311	sub size_allocate {
1239	my ($self, $w, $h, $changed) = @_;	1312	my ($self, $w, $h) = @_;
1240		1313
1241	my ($ws, $hs) = $self->get_wh;	1314	my ($ws, $hs) = $self->get_wh;
1242		1315
1243	my $req_w = (sum @$ws) || 1;	1316	my $req_w = (sum @$ws) || 1;
1244	my $req_h = (sum @$hs) || 1;	1317	my $req_h = (sum @$hs) || 1;
…		…
1322	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1395	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1323	)	1396	)
1324	}	1397	}
1325		1398
1326	sub size_allocate {	1399	sub size_allocate {
1327	my ($self, $w, $h, $changed) = @_;	1400	my ($self, $w, $h) = @_;
1328		1401
1329	my $space = $self->{vertical} ? $h : $w;	1402	my $space = $self->{vertical} ? $h : $w;
1330	my $children = $self->{children};	1403	my $children = $self->{children};
1331		1404
1332	my @req;	1405	my @req;
…		…
1415	ellipsise => 3, # end	1488	ellipsise => 3, # end
1416	layout => (new CFClient::Layout),	1489	layout => (new CFClient::Layout),
1417	fontsize => 1,	1490	fontsize => 1,
1418	align => -1,	1491	align => -1,
1419	valign => -1,	1492	valign => -1,
1420	padding => 2,	1493	padding_x => 2,
		1494	padding_y => 2,
1421	can_events => 0,	1495	can_events => 0,
1422	%arg	1496	%arg
1423	);	1497	);
1424		1498
1425	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1501		1575
1502	$w = List::Util::max $w, $w2;	1576	$w = List::Util::max $w, $w2;
1503	$h = List::Util::max $h, $h2;	1577	$h = List::Util::max $h, $h2;
1504	}	1578	}
1505		1579
1506	(	1580	($w, $h)
1507	$w + $self->{padding} * 2,
1508	$h + $self->{padding} * 2,
1509	)
1510	}	1581	}
1511		1582
1512	sub size_allocate {	1583	sub size_allocate {
1513	my ($self, $w, $h, $changed) = @_;	1584	my ($self, $w, $h) = @_;
		1585
		1586	delete $self->{ox};
1514		1587
1515	delete $self->{texture}	1588	delete $self->{texture}
1516	if $changed;	1589	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1517	}	1590	}
1518		1591
1519	sub set_fontsize {	1592	sub set_fontsize {
1520	my ($self, $fontsize) = @_;	1593	my ($self, $fontsize) = @_;
1521		1594
…		…
1536	$self->{layout}->set_width ($self->{w});	1609	$self->{layout}->set_width ($self->{w});
1537	$self->{layout}->set_ellipsise ($self->{ellipsise});	1610	$self->{layout}->set_ellipsise ($self->{ellipsise});
1538	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1611	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1539	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1612	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1540		1613
1541	my $tex = new_from_layout CFClient::Texture $self->{layout};	1614	new_from_layout CFClient::Texture $self->{layout}
		1615	};
1542		1616
		1617	unless (exists $self->{ox}) {
1543	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1618	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1544	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1619	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1545	: ($self->{w} - $tex->{w}) * 0.5);	1620	: ($self->{w} - $tex->{w}) * 0.5);
1546		1621
1547	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1622	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1548	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1623	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1549	: ($self->{h} - $tex->{h}) * 0.5);	1624	: ($self->{h} - $tex->{h}) * 0.5);
1550
1551	$tex
1552	};	1625	};
1553		1626
1554	glEnable GL_TEXTURE_2D;	1627	glEnable GL_TEXTURE_2D;
1555	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1556		1629
…		…
1651	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1652	} elsif ($uni == 27) {	1725	} elsif ($uni == 27) {
1653	$self->_emit ('escape');	1726	$self->_emit ('escape');
1654	} elsif ($uni) {	1727	} elsif ($uni) {
1655	substr $text, $self->{cursor}++, 0, chr $uni;	1728	substr $text, $self->{cursor}++, 0, chr $uni;
		1729	} else {
		1730	return 0;
1656	}	1731	}
1657		1732
1658	$self->_set_text ($text);	1733	$self->_set_text ($text);
1659		1734
1660	$self->realloc;	1735	$self->realloc;
		1736
		1737	1
1661	}	1738	}
1662		1739
1663	sub focus_in {	1740	sub focus_in {
1664	my ($self) = @_;	1741	my ($self) = @_;
1665		1742
…		…
1680	utf8::encode $text;	1757	utf8::encode $text;
1681	$self->{cursor} = length substr $text, 0, $idx;	1758	$self->{cursor} = length substr $text, 0, $idx;
1682		1759
1683	$self->_set_text ($self->{text});	1760	$self->_set_text ($self->{text});
1684	$self->update;	1761	$self->update;
		1762
		1763	1
1685	}	1764	}
1686		1765
1687	sub mouse_motion {	1766	sub mouse_motion {
1688	my ($self, $ev, $x, $y) = @_;	1767	my ($self, $ev, $x, $y) = @_;
1689	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1768	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1769
		1770	0
1690	}	1771	}
1691		1772
1692	sub _draw {	1773	sub _draw {
1693	my ($self) = @_;	1774	my ($self) = @_;
1694		1775
…		…
1771	} else {	1852	} else {
1772	$self->set_text ($self->{history_saveback});	1853	$self->set_text ($self->{history_saveback});
1773	}	1854	}
1774		1855
1775	} else {	1856	} else {
1776	$self->SUPER::key_down ($ev);	1857	return $self->SUPER::key_down ($ev)
		1858	}
		1859
1777	}	1860	1
1778
1779	}	1861	}
1780		1862
1781	#############################################################################	1863	#############################################################################
1782		1864
1783	package CFClient::UI::Button;	1865	package CFClient::UI::Button;
…		…
1792		1874
1793	sub new {	1875	sub new {
1794	my $class = shift;	1876	my $class = shift;
1795		1877
1796	$class->SUPER::new (	1878	$class->SUPER::new (
1797	padding => 4,	1879	padding_x => 4,
		1880	padding_y => 4,
1798	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1799	active_fg => [0, 0, 1],	1882	active_fg => [0, 0, 1],
1800	can_hover => 1,	1883	can_hover => 1,
1801	align => 0,	1884	align => 0,
1802	valign => 0,	1885	valign => 0,
…		…
1811	my ($self, $ev, $x, $y) = @_;	1894	my ($self, $ev, $x, $y) = @_;
1812		1895
1813	$self->emit ("activate")	1896	$self->emit ("activate")
1814	if $x >= 0 && $x < $self->{w}	1897	if $x >= 0 && $x < $self->{w}
1815	&& $y >= 0 && $y < $self->{h};	1898	&& $y >= 0 && $y < $self->{h};
		1899
		1900	1
1816	}	1901	}
1817		1902
1818	sub _draw {	1903	sub _draw {
1819	my ($self) = @_;	1904	my ($self) = @_;
1820		1905
…		…
1849		1934
1850	sub new {	1935	sub new {
1851	my $class = shift;	1936	my $class = shift;
1852		1937
1853	$class->SUPER::new (	1938	$class->SUPER::new (
1854	padding => 2,	1939	padding_x => 2,
		1940	padding_y => 2,
1855	fg => [1, 1, 1],	1941	fg => [1, 1, 1],
1856	active_fg => [1, 1, 0],	1942	active_fg => [1, 1, 0],
1857	bg => [0, 0, 0, 0.2],	1943	bg => [0, 0, 0, 0.2],
1858	active_bg => [1, 1, 1, 0.5],	1944	active_bg => [1, 1, 1, 0.5],
1859	state => 0,	1945	state => 0,
…		…
1863	}	1949	}
1864		1950
1865	sub size_request {	1951	sub size_request {
1866	my ($self) = @_;	1952	my ($self) = @_;
1867		1953
1868	($self->{padding} * 2 + 6) x 2	1954	(6) x 2
1869	}	1955	}
1870		1956
1871	sub button_down {	1957	sub button_down {
1872	my ($self, $ev, $x, $y) = @_;	1958	my ($self, $ev, $x, $y) = @_;
1873		1959
1874	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1960	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1875	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1961	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1876	$self->{state} = !$self->{state};	1962	$self->{state} = !$self->{state};
1877	$self->_emit (changed => $self->{state});	1963	$self->_emit (changed => $self->{state});
		1964	} else {
		1965	return 0
		1966	}
		1967
1878	}	1968	1
1879	}	1969	}
1880		1970
1881	sub _draw {	1971	sub _draw {
1882	my ($self) = @_;	1972	my ($self) = @_;
1883		1973
1884	$self->SUPER::_draw;	1974	$self->SUPER::_draw;
1885		1975
1886	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1976	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1887		1977
1888	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1978	my ($w, $h) = @$self{qw(w h)};
		1979
		1980	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1889		1981
1890	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1982	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1891		1983
1892	my $tex = $self->{state} ? $tex[1] : $tex[0];	1984	my $tex = $self->{state} ? $tex[1] : $tex[0];
1893		1985
…		…
2158	fg => [1, 1, 1],	2250	fg => [1, 1, 1],
2159	active_fg => [0, 0, 0],	2251	active_fg => [0, 0, 0],
2160	bg => [0, 0, 0, 0.2],	2252	bg => [0, 0, 0, 0.2],
2161	active_bg => [1, 1, 1, 0.5],	2253	active_bg => [1, 1, 1, 0.5],
2162	range => [0, 0, 100, 10, 0],	2254	range => [0, 0, 100, 10, 0],
2163	req_w => $::WIDTH / 80,	2255	min_w => $::WIDTH / 80,
2164	req_h => $::WIDTH / 80,	2256	min_h => $::WIDTH / 80,
2165	vertical => 0,	2257	vertical => 0,
2166	can_hover => 1,	2258	can_hover => 1,
2167	inner_pad => 0.02,	2259	inner_pad => 0.02,
2168	@_	2260	@_
2169	);	2261	);
…		…
2209	}	2301	}
2210		2302
2211	sub size_request {	2303	sub size_request {
2212	my ($self) = @_;	2304	my ($self) = @_;
2213		2305
2214	my $w = $self->{req_w};	2306	($self->{req_w}, $self->{req_h})
2215	my $h = $self->{req_h};
2216
2217	$self->{vertical} ? ($h, $w) : ($w, $h)
2218	}	2307	}
2219		2308
2220	sub button_down {	2309	sub button_down {
2221	my ($self, $ev, $x, $y) = @_;	2310	my ($self, $ev, $x, $y) = @_;
2222		2311
2223	$self->SUPER::button_down ($ev, $x, $y);	2312	$self->SUPER::button_down ($ev, $x, $y);
2224		2313
2225	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2314	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2226		2315
2227	$self->mouse_motion ($ev, $x, $y);	2316	$self->mouse_motion ($ev, $x, $y)
2228	}	2317	}
2229		2318
2230	sub mouse_motion {	2319	sub mouse_motion {
2231	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2232		2321
…		…
2236	my (undef, $lo, $hi, $page) = @{$self->{range}};	2325	my (undef, $lo, $hi, $page) = @{$self->{range}};
2237		2326
2238	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2327	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2239		2328
2240	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2329	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2330	} else {
		2331	return 0;
		2332	}
		2333
2241	}	2334	1
2242	}	2335	}
2243		2336
2244	sub update {	2337	sub update {
2245	my ($self) = @_;	2338	my ($self) = @_;
2246		2339
…		…
2372	$self->{fontsize} = $fontsize;	2465	$self->{fontsize} = $fontsize;
2373	$self->reflow;	2466	$self->reflow;
2374	}	2467	}
2375		2468
2376	sub size_allocate {	2469	sub size_allocate {
2377	my ($self, $w, $h, $changed) = @_;	2470	my ($self, $w, $h) = @_;
2378		2471
2379	$self->SUPER::size_allocate ($w, $h, $changed);	2472	$self->SUPER::size_allocate ($w, $h);
2380
2381	return unless $changed;
2382		2473
2383	$self->{layout}->set_font ($self->{font}) if $self->{font};	2474	$self->{layout}->set_font ($self->{font}) if $self->{font};
2384	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2475	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2385	$self->{layout}->set_width ($self->{children}[0]{w});	2476	$self->{layout}->set_width ($self->{children}[0]{w});
2386		2477
…		…
2609	}	2700	}
2610		2701
2611	sub set_tooltip_from {	2702	sub set_tooltip_from {
2612	my ($self, $widget) = @_;	2703	my ($self, $widget) = @_;
2613		2704
		2705	my $tooltip = $widget->{tooltip};
		2706
		2707	if ($ENV{CFPLUS_DEBUG} & 2) {
		2708	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2709	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2710	. "req $widget->{req_w} $widget->{req_h}\n"
		2711	. "visible $widget->{visible}";
		2712	}
		2713
2614	$self->add (new CFClient::UI::Label	2714	$self->add (new CFClient::UI::Label
2615	markup => $widget->{tooltip},	2715	markup => $tooltip,
2616	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2716	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2617	fontsize => 0.8,	2717	fontsize => 0.8,
2618	fg => [0, 0, 0, 1],	2718	fg => [0, 0, 0, 1],
2619	ellipsise => 0,	2719	ellipsise => 0,
2620	font => ($widget->{tooltip_font} || $::FONT_PROP),	2720	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2628		2728
2629	($w + 4, $h + 4)	2729	($w + 4, $h + 4)
2630	}	2730	}
2631		2731
2632	sub size_allocate {	2732	sub size_allocate {
2633	my ($self, $w, $h, $changed) = @_;	2733	my ($self, $w, $h) = @_;
2634		2734
2635	return unless $changed;
2636
2637	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2735	$self->SUPER::size_allocate ($w - 4, $h - 4);
2638	}	2736	}
2639		2737
2640	sub visibility_change {	2738	sub visibility_change {
2641	my ($self, $visible) = @_;	2739	my ($self, $visible) = @_;
2642		2740
…		…
2649	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2747	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650		2748
2651	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2749	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652	if $x + $self->{w} > $::WIDTH;	2750	if $x + $self->{w} > $::WIDTH;
2653		2751
2654	$self->move ($x, $y);	2752	$self->move_abs ($x, $y);
2655	});	2753	});
2656	}	2754	}
2657		2755
2658	sub _draw {	2756	sub _draw {
2659	my ($self) = @_;	2757	my ($self) = @_;
…		…
2763	$self->SUPER::DESTROY;	2861	$self->SUPER::DESTROY;
2764	}	2862	}
2765		2863
2766	#############################################################################	2864	#############################################################################
2767		2865
2768	package CFClient::UI::Inventory;	2866	package CFClient::UI::Buttonbar;
2769		2867
2770	our @ISA = CFClient::UI::ScrolledWindow::;	2868	our @ISA = CFClient::UI::HBox::;
2771		2869
2772	sub new {	2870	# 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		2871
2808	#############################################################################	2872	#############################################################################
2809		2873
2810	package CFClient::UI::Menu;	2874	package CFClient::UI::Menu;
2811		2875
…		…
2852	# maybe save $GRAB? must be careful about events...	2916	# maybe save $GRAB? must be careful about events...
2853	$GRAB = $self;	2917	$GRAB = $self;
2854	$self->{button} = $ev->{button};	2918	$self->{button} = $ev->{button};
2855		2919
2856	$self->show;	2920	$self->show;
2857	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2921	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858	}	2922	}
2859		2923
2860	sub mouse_motion {	2924	sub mouse_motion {
2861	my ($self, $ev, $x, $y) = @_;	2925	my ($self, $ev, $x, $y) = @_;
2862		2926
2863	# TODO: should use vbox->find_widget or so	2927	# TODO: should use vbox->find_widget or so
2864	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2928	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2865	$self->{hover} = $self->{item}{$HOVER};	2929	$self->{hover} = $self->{item}{$HOVER};
		2930
		2931	0
2866	}	2932	}
2867		2933
2868	sub button_up {	2934	sub button_up {
2869	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2870		2936
…		…
2872	undef $GRAB;	2938	undef $GRAB;
2873	$self->hide;	2939	$self->hide;
2874		2940
2875	$self->_emit ("popdown");	2941	$self->_emit ("popdown");
2876	$self->{hover}[1]->() if $self->{hover};	2942	$self->{hover}[1]->() if $self->{hover};
		2943	} else {
		2944	return 0
		2945	}
		2946
2877	}	2947	1
		2948	}
		2949
		2950	#############################################################################
		2951
		2952	package CFClient::UI::Multiplexer;
		2953
		2954	our @ISA = CFClient::UI::Container::;
		2955
		2956	sub new {
		2957	my $class = shift;
		2958
		2959	my $self = $class->SUPER::new (
		2960	@_,
		2961	);
		2962
		2963	$self->{current} = $self->{children}[0]
		2964	if @{ $self->{children} };
		2965
		2966	$self
		2967	}
		2968
		2969	sub add {
		2970	my ($self, @widgets) = @_;
		2971
		2972	$self->SUPER::add (@widgets);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976	}
		2977
		2978	sub set_current_page {
		2979	my ($self, $page_or_widget) = @_;
		2980
		2981	my $widget = ref $page_or_widget
		2982	? $page_or_widget
		2983	: $self->{children}[$page_or_widget];
		2984
		2985	$self->{current} = $widget;
		2986	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2987
		2988	$self->_emit (page_changed => $self->{current});
		2989
		2990	$self->realloc;
		2991	}
		2992
		2993	sub visible_children {
		2994	$_[0]{current}
		2995	}
		2996
		2997	sub size_request {
		2998	my ($self) = @_;
		2999
		3000	$self->{current}->size_request
		3001	}
		3002
		3003	sub size_allocate {
		3004	my ($self, $w, $h) = @_;
		3005
		3006	$self->{current}->configure (0, 0, $w, $h);
		3007	}
		3008
		3009	sub _draw {
		3010	my ($self) = @_;
		3011
		3012	$self->{current}->draw;
		3013	}
		3014
		3015	#############################################################################
		3016
		3017	package CFClient::UI::Notebook;
		3018
		3019	our @ISA = CFClient::UI::VBox::;
		3020
		3021	sub new {
		3022	my $class = shift;
		3023
		3024	my $self = $class->SUPER::new (
		3025	buttonbar => (new CFClient::UI::Buttonbar),
		3026	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3027	@_,
		3028	);
		3029
		3030	$self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
		3031
		3032	$self
		3033	}
		3034
		3035	sub add {
		3036	my ($self, $title, $widget, $tooltip) = @_;
		3037
		3038	Scalar::Util::weaken $self;
		3039
		3040	$self->{buttonbar}->add (new CFClient::UI::Button
		3041	markup => $title,
		3042	tooltip => $tooltip,
		3043	on_activate => sub { $self->set_current_page ($widget) },
		3044	);
		3045
		3046	$self->{multiplexer}->add ($widget);
		3047	}
		3048
		3049	sub set_current_page {
		3050	my ($self, $page) = @_;
		3051
		3052	$self->{multiplexer}->set_current_page ($page);
		3053	$self->_emit (page_changed => $self->{multiplexer}{current});
2878	}	3054	}
2879		3055
2880	#############################################################################	3056	#############################################################################
2881		3057
2882	package CFClient::UI::Statusbox;	3058	package CFClient::UI::Statusbox;
…		…
2987	$self->SUPER::reconfigure;	3163	$self->SUPER::reconfigure;
2988	}	3164	}
2989		3165
2990	#############################################################################	3166	#############################################################################
2991		3167
		3168	package CFClient::UI::Inventory;
		3169
		3170	our @ISA = CFClient::UI::ScrolledWindow::;
		3171
		3172	sub new {
		3173	my $class = shift;
		3174
		3175	my $self = $class->SUPER::new (
		3176	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3177	@_,
		3178	);
		3179
		3180	$self
		3181	}
		3182
		3183	sub set_items {
		3184	my ($self, $items) = @_;
		3185
		3186	$self->{scrolled}->clear;
		3187	return unless $items;
		3188
		3189	my @items = sort {
		3190	($a->{type} <=> $b->{type})
		3191	or ($a->{name} cmp $b->{name})
		3192	} @$items;
		3193
		3194	$self->{real_items} = \@items;
		3195
		3196	my $row = 0;
		3197	for my $item (@items) {
		3198	CFClient::Item::update_widgets $item;
		3199
		3200	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3201	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3202	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3203
		3204	$row++;
		3205	}
		3206	}
		3207
		3208	#############################################################################
		3209
		3210	package CFClient::UI::BindEditor;
		3211
		3212	our @ISA = CFClient::UI::FancyFrame::;
		3213
		3214	sub new {
		3215	my $class = shift;
		3216
		3217	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3218
		3219	$self->add (my $vb = new CFClient::UI::VBox);
		3220
		3221
		3222	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3223	text => "start recording",
		3224	tooltip => "Start/Stops recording of actions."
		3225	."All subsequent actions after the recording started will be captured."
		3226	."The actions are displayed after the record was stopped."
		3227	."To bind the action you have to click on the 'Bind' button",
		3228	on_activate => sub {
		3229	unless ($self->{recording}) {
		3230	$self->start;
		3231	} else {
		3232	$self->stop;
		3233	}
		3234	});
		3235
		3236	$vb->add (new CFClient::UI::Label text => "Actions:");
		3237	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3238
		3239	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3240	$vb->add (my $hb = new CFClient::UI::HBox);
		3241	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3242	$hb->add (new CFClient::UI::Button
		3243	text => "bind",
		3244	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3245	on_activate => sub {
		3246	$self->ask_for_bind;
		3247	});
		3248
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add (new CFClient::UI::Button
		3251	text => "ok",
		3252	expand => 1,
		3253	tooltip => "This closes the binding editor and saves the binding",
		3254	on_activate => sub {
		3255	$self->hide;
		3256	$self->commit;
		3257	});
		3258
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "cancel",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor without saving",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->{binding_cancel}->()
		3266	if $self->{binding_cancel};
		3267	});
		3268
		3269	$self->update_binding_widgets;
		3270
		3271	$self
		3272	}
		3273
		3274	sub commit {
		3275	my ($self) = @_;
		3276	my ($mod, $sym, $cmds) = $self->get_binding;
		3277	if ($sym != 0 && @$cmds > 0) {
		3278	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3279	."'. Don't forget 'Save Config'!");
		3280	$self->{binding_change}->($mod, $sym, $cmds)
		3281	if $self->{binding_change};
		3282	} else {
		3283	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3284	$self->{binding_cancel}->()
		3285	if $self->{binding_cancel};
		3286	}
		3287	}
		3288
		3289	sub start {
		3290	my ($self) = @_;
		3291
		3292	$self->{rec_btn}->set_text ("stop recording");
		3293	$self->{recording} = 1;
		3294	$self->clear_command_list;
		3295	$::CONN->start_record if $::CONN;
		3296	}
		3297
		3298	sub stop {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("start recording");
		3302	$self->{recording} = 0;
		3303
		3304	my $rec;
		3305	$rec = $::CONN->stop_record if $::CONN;
		3306	return unless ref $rec eq 'ARRAY';
		3307	$self->set_command_list ($rec);
		3308	}
		3309
		3310
		3311	sub ask_for_bind_and_commit {
		3312	my ($self) = @_;
		3313	$self->ask_for_bind (1);
		3314	}
		3315
		3316	sub ask_for_bind {
		3317	my ($self, $commit) = @_;
		3318
		3319	CFClient::Binder::open_binding_dialog (sub {
		3320	my ($mod, $sym) = @_;
		3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3322	$self->update_binding_widgets;
		3323	$self->commit if $commit;
		3324	});
		3325	}
		3326
		3327	# $mod and $sym are the modifiers and key symbol
		3328	# $cmds is a array ref of strings (the commands)
		3329	# $cb is the callback that is executed on OK
		3330	# $ccb is the callback that is executed on CANCEL and
		3331	# when the binding was unsuccessful on OK
		3332	sub set_binding {
		3333	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3334
		3335	$self->clear_command_list;
		3336	$self->{recording} = 0;
		3337	$self->{rec_btn}->set_text ("start recording");
		3338
		3339	$self->{binding} = [$mod, $sym];
		3340	$self->{commands} = $cmds;
		3341
		3342	$self->{binding_change} = $cb;
		3343	$self->{binding_cancel} = $ccb;
		3344
		3345	$self->update_binding_widgets;
		3346	}
		3347
		3348	# this is a shortcut method that asks for a binding
		3349	# and then just binds it.
		3350	sub do_quick_binding {
		3351	my ($self, $cmds) = @_;
		3352	$self->set_binding (undef, undef, $cmds, sub {
		3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3354	});
		3355	$self->ask_for_bind (1);
		3356	}
		3357
		3358	sub update_binding_widgets {
		3359	my ($self) = @_;
		3360	my ($mod, $sym, $cmds) = $self->get_binding;
		3361	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3362	$self->set_command_list ($cmds);
		3363	}
		3364
		3365	sub get_binding {
		3366	my ($self) = @_;
		3367	return (
		3368	$self->{binding}->[0],
		3369	$self->{binding}->[1],
		3370	[ grep { defined $_ } @{$self->{commands}} ]
		3371	);
		3372	}
		3373
		3374	sub clear_command_list {
		3375	my ($self) = @_;
		3376	$self->{cmdbox}->clear ();
		3377	}
		3378
		3379	sub set_command_list {
		3380	my ($self, $cmds) = @_;
		3381
		3382	$self->{cmdbox}->clear ();
		3383	$self->{commands} = $cmds;
		3384
		3385	my $idx = 0;
		3386
		3387	for (@$cmds) {
		3388	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3389
		3390	my $i = $idx;
		3391	$hb->add (new CFClient::UI::Label text => $_);
		3392	$hb->add (new CFClient::UI::Button
		3393	text => "delete",
		3394	tooltip => "Deletes the action from the record",
		3395	on_activate => sub {
		3396	$self->{cmdbox}->remove ($hb);
		3397	$cmds->[$i] = undef;
		3398	});
		3399
		3400
		3401	$idx++
		3402	}
		3403	}
		3404
		3405	#############################################################################
		3406
		3407	package CFClient::UI::SpellList;
		3408
		3409	our @ISA = CFClient::UI::ScrolledWindow::;
		3410
		3411	sub new {
		3412	my $class = shift;
		3413
		3414	my $self = $class->SUPER::new (
		3415	binding => [],
		3416	commands => [],
		3417	scrolled => (new CFClient::UI::Table),
		3418	@_,
		3419	)
		3420	}
		3421
		3422	# XXX: Do sorting? Argl...
		3423	sub add_spell {
		3424	my ($self, $spell) = @_;
		3425	$self->{spells}->{$spell->{name}} = $spell;
		3426
		3427	$self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3428	face => $spell->{face},
		3429	can_hover => 1,
		3430	can_events => 1,
		3431	tooltip => $spell->{message});
		3432
		3433	$self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3434	text => $spell->{name},
		3435	can_hover => 1,
		3436	can_events => 1,
		3437	tooltip => $spell->{message},
		3438	expand => 1);
		3439
		3440	$self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3441	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3442	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3443	expand => 1);
		3444
		3445	$self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3446	text => "bind to key",
		3447	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3448	}
		3449
		3450	sub rebuild_spell_list {
		3451	my ($self) = @_;
		3452	$self->{tbl_idx} = 0;
		3453	$self->add_spell ($_) for values %{$self->{spells}};
		3454	}
		3455
		3456	sub remove_spell {
		3457	my ($self, $spell) = @_;
		3458	delete $self->{spells}->{$spell->{name}};
		3459	$self->rebuild_spell_list;
		3460	}
		3461
		3462	#############################################################################
		3463
2992	package CFClient::UI::Root;	3464	package CFClient::UI::Root;
2993		3465
2994	our @ISA = CFClient::UI::Container::;	3466	our @ISA = CFClient::UI::Container::;
2995		3467
2996	use CFClient::OpenGL;	3468	use CFClient::OpenGL;
…		…
3006	Scalar::Util::weaken ($self->{root} = $self);	3478	Scalar::Util::weaken ($self->{root} = $self);
3007		3479
3008	$self	3480	$self
3009	}	3481	}
3010		3482
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 {	3483	sub size_request {
3028	my ($self) = @_;	3484	my ($self) = @_;
3029		3485
3030	($self->{w}, $self->{h})	3486	($self->{w}, $self->{h})
3031	}	3487	}
3032		3488
		3489	sub _to_pixel {
		3490	my ($coord, $size, $max) = @_;
		3491
		3492	$coord =
		3493	$coord eq "center" ? ($max - $size) * 0.5
		3494	: $coord eq "max" ? $max
		3495	: $coord;
		3496
		3497	$coord = 0 if $coord < 0;
		3498	$coord = $max - $size if $coord > $max - $size;
		3499
		3500	int $coord + 0.5
		3501	}
		3502
3033	sub size_allocate {	3503	sub size_allocate {
3034	my ($self, $w, $h, $changed) = @_;	3504	my ($self, $w, $h) = @_;
3035		3505
3036	for my $child ($self->children) {	3506	for my $child ($self->children) {
3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3507	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038		3508
3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3509	$X = $child->{force_x} if exists $child->{force_x};
3040	if exists $child->{req_x};	3510	$Y = $child->{force_y} if exists $child->{force_y};
3041		3511
3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3512	$X = _to_pixel $X, $W, $self->{w};
3043	if exists $child->{req_y};	3513	$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		3514
3050	$child->configure ($X, $Y, $W, $H);	3515	$child->configure ($X, $Y, $W, $H);
3051	}	3516	}
3052	}	3517	}
3053		3518
…		…
3070	}	3535	}
3071		3536
3072	sub add {	3537	sub add {
3073	my ($self, @children) = @_;	3538	my ($self, @children) = @_;
3074		3539
3075	for my $child (@children) {
3076	$child->{is_toplevel} = 1;	3540	$_->{is_toplevel} = 1
3077		3541	for @children;
3078	# integerise window positions
3079	$child->{x} = int $child->{x};
3080	$child->{y} = int $child->{y};
3081	}
3082		3542
3083	$self->SUPER::add (@children);	3543	$self->SUPER::add (@children);
3084	}	3544	}
3085		3545
3086	sub remove {	3546	sub remove {
3087	my ($self, @children) = @_;	3547	my ($self, @children) = @_;
3088		3548
3089	$self->SUPER::remove (@children);	3549	$self->SUPER::remove (@children);
		3550
		3551	delete $self->{is_toplevel}
		3552	for @children;
3090		3553
3091	while (@children) {	3554	while (@children) {
3092	my $w = pop @children;	3555	my $w = pop @children;
3093	push @children, $w->children;	3556	push @children, $w->children;
3094	$w->set_invisible;	3557	$w->set_invisible;
…		…
3114	$_->()	3577	$_->()
3115	for values %{delete $self->{refresh_hook}};	3578	for values %{delete $self->{refresh_hook}};
3116	}	3579	}
3117		3580
3118	if ($self->{realloc}) {	3581	if ($self->{realloc}) {
		3582	my %queue;
3119	my @queue;	3583	my @queue;
		3584	my $widget;
3120		3585
		3586	outer:
3121	while () {	3587	while () {
3122	if ($self->{realloc}) {	3588	if (my $realloc = delete $self->{realloc}) {
3123	#TODO use array-of-depth approach	3589	for $widget (values %$realloc) {
		3590	$widget->{visible} or next; # do not resize invisible widgets
3124		3591
3125	@queue = sort { $a->{visible} <=> $b->{visible} }	3592	$queue{$widget+0}++ and next; # duplicates are common
3126	@queue, values %{delete $self->{realloc}};	3593
		3594	push @{ $queue[$widget->{visible}] }, $widget;
		3595	}
3127	}	3596	}
3128		3597
		3598	while () {
		3599	@queue or last outer;
		3600
		3601	$widget = pop @{ $queue[-1] || [] }
		3602	and last;
		3603
		3604	pop @queue;
		3605	}
		3606
		3607	delete $queue{$widget+0};
		3608
		3609	my ($w, $h) = $widget->size_request;
		3610
		3611	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3612	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3613
		3614	$w = $widget->{force_w} if exists $widget->{force_w};
		3615	$h = $widget->{force_h} if exists $widget->{force_h};
		3616
		3617	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3618	|| delete $widget->{force_realloc}) {
		3619	$widget->{req_w} = $w;
		3620	$widget->{req_h} = $h;
		3621
		3622	$self->{size_alloc}{$widget+0} = $widget;
		3623
		3624	if (my $parent = $widget->{parent}) {
		3625	$self->{realloc}{$parent+0} = $parent
		3626	unless $queue{$parent+0};
		3627
		3628	$parent->{force_size_alloc} = 1;
		3629	$self->{size_alloc}{$parent+0} = $parent;
		3630	}
		3631	}
		3632
		3633	delete $self->{realloc}{$widget+0};
		3634	}
		3635	}
		3636
		3637	while (my $size_alloc = delete $self->{size_alloc}) {
		3638	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3639	values %$size_alloc;
		3640
		3641	while () {
3129	my $widget = pop @queue || last;	3642	my $widget = pop @queue || last;
3130		3643
3131	$widget->{visible} or last; # do not resize invisible widgets	3644	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		3645
3156	$w = 0 if $w < 0;	3646	$w = 0 if $w < 0;
3157	$h = 0 if $h < 0;	3647	$h = 0 if $h < 0;
3158		3648
3159	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3649	$w = int $w + 0.5;
		3650	$h = int $h + 0.5;
3160		3651
		3652	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3653	$widget->{old_w} = $widget->{w};
		3654	$widget->{old_h} = $widget->{h};
		3655
3161	$widget->{w} = $w;	3656	$widget->{w} = $w;
3162	$widget->{h} = $h;	3657	$widget->{h} = $h;
3163		3658
3164	$widget->emit (size_allocate => $w, $h, $changed);	3659	$widget->emit (size_allocate => $w, $h);
		3660	}
3165	}	3661	}
3166	}	3662	}
3167		3663
3168	while ($self->{post_alloc_hook}) {	3664	while ($self->{post_alloc_hook}) {
3169	$_->()	3665	$_->()
3170	for values %{delete $self->{post_alloc_hook}};	3666	for values %{delete $self->{post_alloc_hook}};
3171	}	3667	}
		3668
3172		3669
3173	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3670	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3671	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175	glClear GL_COLOR_BUFFER_BIT;	3672	glClear GL_COLOR_BUFFER_BIT;
3176		3673
…		…
3178	glLoadIdentity;	3675	glLoadIdentity;
3179	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3676	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180	glMatrixMode GL_MODELVIEW;	3677	glMatrixMode GL_MODELVIEW;
3181	glLoadIdentity;	3678	glLoadIdentity;
3182		3679
		3680	{
		3681	package CFClient::UI::Base;
		3682
		3683	($draw_x, $draw_y, $draw_w, $draw_h) =
		3684	(0, 0, $self->{w}, $self->{h});
		3685	}
		3686
3183	$self->_draw;	3687	$self->_draw;
3184	}	3688	}
3185		3689
3186	#############################################################################	3690	#############################################################################
3187		3691

Diff Legend

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