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.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

…		…
26		26
27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;	28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};	29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};	30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
31	}	33	}
32		34
33	$layout	35	$layout
34	}	36	}
35		37
36	sub set_layout {	38	sub set_layout {
37	my ($layout) = @_;	39	my ($layout) = @_;
		40
38	$LAYOUT = $layout;	41	$LAYOUT = $layout;
39	}	42	}
40		43
41	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
42	if (!$GRAB) {	47	if (!$GRAB) {
43	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
45
46	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
47	$TOOLTIP->hide;	51	$TOOLTIP->hide;
48		52
49	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
50		54
…		…
167	sub rescale_widgets {	171	sub rescale_widgets {
168	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
169		173
170	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
171	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
172	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174		178
175	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176	$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};
177	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179	$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};
180	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181		185
182	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184		188
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
…		…
207	h => undef,	211	h => undef,
208	can_events => 1,	212	can_events => 1,
209	@_	213	@_
210	}, $class;	214	}, $class;
211		215
212	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220	}
221
222	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223		217
224	for (keys %$self) {	218	for (keys %$self) {
225	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
226	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
227	}	221	}
228	}	222	}
229		223
		224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
		235
230	$self	236	$self
231	}	237	}
232		238
233	sub destroy {	239	sub destroy {
234	my ($self) = @_;	240	my ($self) = @_;
…		…
350	$self->{x} = $x;	356	$self->{x} = $x;
351	$self->{y} = $y;	357	$self->{y} = $y;
352	$self->update;	358	$self->update;
353	}	359	}
354		360
355	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356	return unless $self->{visible};	362	return unless $self->{visible};
357		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
359	}	368	}
360	}	369	}
361		370
362	sub size_allocate {	371	sub size_allocate {
363	# nothing to be done	372	# nothing to be done
364	}	373	}
365		374
366	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
367	}	381	}
368		382
369	sub set_max_size {	383	sub set_max_size {
370	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
371		385
…		…
430		444
431	$::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
432	unless $FOCUS;	446	unless $FOCUS;
433	}	447	}
434		448
435	sub mouse_motion { }	449	sub mouse_motion { 0 }
436	sub button_up { }	450	sub button_up { 0 }
437	sub key_down { }	451	sub key_down { 0 }
438	sub key_up { }	452	sub key_up { 0 }
439		453
440	sub button_down {	454	sub button_down {
441	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
442		456
443	$self->focus_in;	457	$self->focus_in;
444	}
445		458
446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
450	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451		461
452	sub find_widget {	462	sub find_widget {
453	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
454		464
455	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
463		473
464	sub set_parent {	474	sub set_parent {
465	my ($self, $parent) = @_;	475	my ($self, $parent) = @_;
466		476
467	Scalar::Util::weaken ($self->{parent} = $parent);	477	Scalar::Util::weaken ($self->{parent} = $parent);
468
469	$self->set_visible if $parent->{visible};	478	$self->set_visible if $parent->{visible};
470	}	479	}
471		480
472	sub connect {	481	sub connect {
473	my ($self, $signal, $cb) = @_;	482	my ($self, $signal, $cb) = @_;
…		…
494		503
495	sub realloc {	504	sub realloc {
496	my ($self) = @_;	505	my ($self) = @_;
497		506
498	if ($self->{visible}) {	507	if ($self->{visible}) {
499	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
500		509
501	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
502	$self->{root}->update;	511	$self->{root}->update;
503	} else {	512	} else {
504	delete $self->{req_w};	513	delete $self->{req_w};
		514	delete $self->{req_h};
505	}	515	}
506	}	516	}
507		517
508	sub update {	518	sub update {
509	my ($self) = @_;	519	my ($self) = @_;
…		…
517		527
518	$self->realloc;	528	$self->realloc;
519	$self->update;	529	$self->update;
520	}	530	}
521		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
522	sub draw {	536	sub draw {
523	my ($self) = @_;	537	my ($self) = @_;
524		538
525	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);
526		550
527	glPushMatrix;	551	glPushMatrix;
528	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
529	$self->_draw;
530	glPopMatrix;
531		553
532	if ($self == $HOVER && $self->{can_hover}) {	554	if ($self == $HOVER && $self->{can_hover}) {
533	my ($x, $y) = @$self{qw(x y)};
534
535	glColor 1, 0.8, 0.5, 0.2;	555	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536	glEnable GL_BLEND;	556	glEnable GL_BLEND;
537	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	557	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538	glBegin GL_QUADS;	558	glBegin GL_QUADS;
539	glVertex $x , $y;	559	glVertex 0 , 0;
540	glVertex $x + $self->{w}, $y;	560	glVertex $self->{w}, 0;
541	glVertex $x + $self->{w}, $y + $self->{h};	561	glVertex $self->{w}, $self->{h};
542	glVertex $x , $y + $self->{h};	562	glVertex 0 , $self->{h};
543	glEnd;	563	glEnd;
544	glDisable GL_BLEND;	564	glDisable GL_BLEND;
545	}	565	}
546		566
547	if ($ENV{CFPLUS_DEBUG}) {	567	if ($ENV{CFPLUS_DEBUG} & 1) {
548	glPushMatrix;	568	glPushMatrix;
549	glColor 1, 1, 0, 1;	569	glColor 1, 1, 0, 1;
550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	570	glTranslate 0.375, 0.375;
551	glBegin GL_LINE_LOOP;	571	glBegin GL_LINE_LOOP;
552	glVertex 0 , 0;	572	glVertex 0 , 0;
553	glVertex $self->{w} - 1, 0;	573	glVertex $self->{w} - 1, 0;
554	glVertex $self->{w} - 1, $self->{h} - 1;	574	glVertex $self->{w} - 1, $self->{h} - 1;
555	glVertex 0 , $self->{h} - 1;	575	glVertex 0 , $self->{h} - 1;
556	glEnd;	576	glEnd;
557	glPopMatrix;	577	glPopMatrix;
558	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559	}	579	}
		580
		581	$self->_draw;
		582	glPopMatrix;
560	}	583	}
561		584
562	sub _draw {	585	sub _draw {
563	my ($self) = @_;	586	my ($self) = @_;
564		587
…		…
602		625
603	if ($color && (@$color < 4 || $color->[3])) {	626	if ($color && (@$color < 4 || $color->[3])) {
604	my ($w, $h) = @$self{qw(w h)};	627	my ($w, $h) = @$self{qw(w h)};
605		628
606	glEnable GL_BLEND;	629	glEnable GL_BLEND;
607	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608	glColor @$color;	631	glColor_premultiply @$color;
609		632
610	glBegin GL_QUADS;	633	glBegin GL_QUADS;
611	glVertex 0 , 0;	634	glVertex 0 , 0;
612	glVertex 0 , $h;	635	glVertex 0 , $h;
613	glVertex $w, $h;	636	glVertex $w, $h;
…		…
644	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFClient::UI::Base::;
645		668
646	sub new {	669	sub new {
647	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
648		671
649	my $children = delete $arg{children} || [];	672	my $children = delete $arg{children};
650		673
651	my $self = $class->SUPER::new (	674	my $self = $class->SUPER::new (
652	children => [],	675	children => [],
653	can_events => 0,	676	can_events => 0,
654	%arg,	677	%arg,
655	);	678	);
		679
656	$self->add ($_) for @$children;	680	$self->add (@$children)
		681	if $children;
657		682
658	$self	683	$self
659	}	684	}
660		685
661	sub add {	686	sub add {
…		…
709	$x -= $self->{x};	734	$x -= $self->{x};
710	$y -= $self->{y};	735	$y -= $self->{y};
711		736
712	my $res;	737	my $res;
713		738
714	for (reverse @{ $self->{children} }) {	739	for (reverse $self->visible_children) {
715	$res = $_->find_widget ($x, $y)	740	$res = $_->find_widget ($x, $y)
716	and return $res;	741	and return $res;
717	}	742	}
718		743
719	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	744	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
761	sub size_request {	786	sub size_request {
762	$_[0]{children}[0]->size_request	787	$_[0]{children}[0]->size_request
763	}	788	}
764		789
765	sub size_allocate {	790	sub size_allocate {
766	my ($self, $w, $h, $changed) = @_;	791	my ($self, $w, $h) = @_;
767		792
768	$self->{children}[0]->configure (0, 0, $w, $h);	793	$self->{children}[0]->configure (0, 0, $w, $h);
769	}	794	}
770		795
771	#############################################################################	796	#############################################################################
		797
		798	# back-buffered drawing area
772		799
773	package CFClient::UI::Window;	800	package CFClient::UI::Window;
774		801
775	our @ISA = CFClient::UI::Bin::;	802	our @ISA = CFClient::UI::Bin::;
776		803
…		…
788	$ROOT->on_post_alloc ($self => sub { $self->render_child });	815	$ROOT->on_post_alloc ($self => sub { $self->render_child });
789	$self->SUPER::update;	816	$self->SUPER::update;
790	}	817	}
791		818
792	sub size_allocate {	819	sub size_allocate {
793	my ($self, $w, $h, $changed) = @_;	820	my ($self, $w, $h) = @_;
794		821
795	$self->SUPER::size_allocate ($w, $h, $changed);	822	$self->SUPER::size_allocate ($w, $h);
796	$self->update	823	$self->update;
797	if $changed;
798	}	824	}
799		825
800	sub _render {	826	sub _render {
		827	my ($self) = @_;
		828
801	$_[0]{children}[0]->draw;	829	$self->{children}[0]->draw;
802	}	830	}
803		831
804	sub render_child {	832	sub render_child {
805	my ($self) = @_;	833	my ($self) = @_;
806		834
807	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808	glClearColor 0, 0, 0, 0;	836	glClearColor 0, 0, 0, 0;
809	glClear GL_COLOR_BUFFER_BIT;	837	glClear GL_COLOR_BUFFER_BIT;
810		838
		839	{
		840	package CFClient::UI::Base;
		841
		842	($draw_x, $draw_y, $draw_w, $draw_h) =
		843	(0, 0, $self->{w}, $self->{h});
		844	}
		845
811	$self->_render;	846	$self->_render;
812	};	847	};
813	}	848	}
814		849
815	sub _draw {	850	sub _draw {
816	my ($self) = @_;	851	my ($self) = @_;
817		852
818	my ($w, $h) = ($self->w, $self->h);	853	my ($w, $h) = @$self{qw(w h)};
819		854
820	my $tex = $self->{texture}	855	my $tex = $self->{texture}
821	or return;	856	or return;
822		857
823	glEnable GL_TEXTURE_2D;	858	glEnable GL_TEXTURE_2D;
824	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		860	glEnable GL_BLEND;
		861	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
825	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
826		863
827	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad (0, 0, $w, $h);
828		865
		866	glDisable GL_BLEND;
829	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
830	}	868	}
831		869
832	#############################################################################	870	#############################################################################
833		871
…		…
846	}	884	}
847		885
848	sub size_request {	886	sub size_request {
849	my ($self) = @_;	887	my ($self) = @_;
850		888
851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	889	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852		890
853	$w = 10 if $self->{scroll_x};	891	$w = 10 if $self->{scroll_x};
854	$h = 10 if $self->{scroll_y};	892	$h = 10 if $self->{scroll_y};
855		893
856	($w, $h)	894	($w, $h)
857	}	895	}
858		896
859	sub size_allocate {	897	sub size_allocate {
860	my ($self, $w, $h, $changed) = @_;	898	my ($self, $w, $h) = @_;
861		899
		900	my $child = $self->child;
		901
862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864		904
865	$self->child->configure (0, 0, $w, $h);	905	$self->child->configure (0, 0, $w, $h);
866	$self->update;	906	$self->update;
867	}	907	}
868		908
…		…
904	}	944	}
905		945
906	sub _render {	946	sub _render {
907	my ($self) = @_;	947	my ($self) = @_;
908		948
		949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		950	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		951
909	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910		953
911	$self->SUPER::_render;	954	$self->SUPER::_render;
912	}	955	}
913		956
…		…
916	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
917		960
918	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
919		962
920	sub new {	963	sub new {
921	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
922		967
923	my $self;	968	my $self;
924		969
925	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
926	vertical => 1,	971	vertical => 1,
…		…
931	;	976	;
932		977
933	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
934	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
935	slider => $slider,	980	slider => $slider,
936	@_,	981	%arg,
937	);	982	);
938		983
939	$self->{vp}->add ($self->{scrolled});
940	$self->add ($self->{vp});
941	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
942		986
943	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
944	}	994	}
945		995
946	sub update {	996	sub update {
947	my ($self) = @_;	997	my ($self) = @_;
948		998
…		…
952	my $child = $self->{vp}->child;	1002	my $child = $self->{vp}->child;
953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954	}	1004	}
955		1005
956	sub size_allocate {	1006	sub size_allocate {
957	my ($self, $w, $h, $changed) = @_;	1007	my ($self, $w, $h) = @_;
958		1008
959	$self->SUPER::size_allocate ($w, $h, $changed);	1009	$self->SUPER::size_allocate ($w, $h);
960		1010
961	my $child = $self->{vp}->child;	1011	my $child = $self->{vp}->child;
962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963	}	1013	}
964		1014
…		…
987		1037
988	if ($self->{bg}) {	1038	if ($self->{bg}) {
989	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
990		1040
991	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
992	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
993	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
994		1044
995	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
996	glVertex 0 , 0;	1046	glVertex 0 , 0;
997	glVertex 0 , $h;	1047	glVertex 0 , $h;
998	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1020	my @border =	1070	my @border =
1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023		1073
1024	sub new {	1074	sub new {
1025	my $class = shift;	1075	my ($class, %arg) = @_;
		1076
		1077	my $title = delete $arg{title};
1026		1078
1027	my $self = $class->SUPER::new (	1079	my $self = $class->SUPER::new (
1028	bg => [1, 1, 1, 1],	1080	bg => [1, 1, 1, 1],
1029	border_bg => [1, 1, 1, 1],	1081	border_bg => [1, 1, 1, 1],
1030	border => 0.6,	1082	border => 0.6,
1031	is_toplevel => 1,
1032	can_events => 1,	1083	can_events => 1,
1033	@_	1084	min_w => 16,
		1085	min_h => 16,
		1086	%arg,
1034	);	1087	);
1035		1088
1036	$self->{title} &&= new CFClient::UI::Label	1089	$self->{title} = new CFClient::UI::Label
1037	align => 0,	1090	align => 0,
1038	valign => 1,	1091	valign => 1,
1039	text => $self->{title},	1092	text => $title,
1040	fontsize => $self->{border};	1093	fontsize => $self->{border}
		1094	if defined $title;
1041		1095
1042	$self	1096	$self
		1097	}
		1098
		1099	sub add {
		1100	my ($self, @widgets) = @_;
		1101
		1102	$self->SUPER::add (@widgets);
		1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1043	}	1104	}
1044		1105
1045	sub border {	1106	sub border {
1046	int $_[0]{border} * $::FONTSIZE	1107	int $_[0]{border} * $::FONTSIZE
1047	}	1108	}
1048		1109
1049	sub size_request {	1110	sub size_request {
1050	my ($self) = @_;	1111	my ($self) = @_;
		1112
		1113	$self->{title}->size_request
		1114	if $self->{title};
1051		1115
1052	my ($w, $h) = $self->SUPER::size_request;	1116	my ($w, $h) = $self->SUPER::size_request;
1053		1117
1054	(	1118	(
1055	$w + $self->border * 2,	1119	$w + $self->border * 2,
1056	$h + $self->border * 2,	1120	$h + $self->border * 2,
1057	)	1121	)
1058	}	1122	}
1059		1123
1060	sub size_allocate {	1124	sub size_allocate {
1061	my ($self, $w, $h, $changed) = @_;	1125	my ($self, $w, $h) = @_;
1062		1126
1063	return unless $changed;	1127	if ($self->{title}) {
		1128	$self->{title}{w} = $w;
		1129	$self->{title}{h} = $h;
		1130	$self->{title}->size_allocate ($w, $h);
		1131	}
1064		1132
		1133	my $border = $self->border;
		1134
1065	$h -= List::Util::max 0, $self->border * 2;	1135	$h -= List::Util::max 0, $border * 2;
1066	$w -= List::Util::max 0, $self->border * 2;	1136	$w -= List::Util::max 0, $border * 2;
1067		1137
1068	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1069	if $self->{title};
1070
1071	$self->child->configure ($self->border, $self->border, $w, $h);	1138	$self->child->configure ($border, $border, $w, $h);
1072	}	1139	}
1073		1140
1074	sub button_down {	1141	sub button_down {
1075	my ($self, $ev, $x, $y) = @_;	1142	my ($self, $ev, $x, $y) = @_;
1076		1143
…		…
1095	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1096		1163
1097	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1098	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1099		1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1100	$self->realloc;	1168	$self->realloc;
1101	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1102	};	1169	};
1103		1170
1104	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1105	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1106	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1109	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1110		1177
1111	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1112		1179
1113	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1181	# HACK: the next line is required to enforce placement
		1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1114	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1115	}	1188	1
1116	}	1189	}
1117		1190
1118	sub button_up {	1191	sub button_up {
1119	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1120		1193
1121	delete $self->{motion};	1194	!!delete $self->{motion}
1122	}	1195	}
1123		1196
1124	sub mouse_motion {	1197	sub mouse_motion {
1125	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1126		1199
1127	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1128	}	1203	}
1129		1204
1130	sub _draw {	1205	sub _draw {
1131	my ($self) = @_;	1206	my ($self) = @_;
1132		1207
		1208	my $child = $self->{children}[0];
		1209
1133	my ($w, $h ) = ($self->{w}, $self->{h});	1210	my ($w, $h ) = ($self->{w}, $self->{h});
1134	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1211	my ($cw, $ch) = ($child->{w}, $child->{h});
1135		1212
1136	glEnable GL_TEXTURE_2D;	1213	glEnable GL_TEXTURE_2D;
1137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1138		1215
1139	my $border = $self->border;	1216	my $border = $self->border;
…		…
1154	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1231	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155	}	1232	}
1156		1233
1157	glDisable GL_TEXTURE_2D;	1234	glDisable GL_TEXTURE_2D;
1158		1235
1159	$self->{title}->draw if $self->{title};
1160
1161	$self->child->draw;	1236	$child->draw;
		1237
		1238	if ($self->{title}) {
		1239	glTranslate 0, $border - $self->{h};
		1240	$self->{title}->_draw;
		1241	}
1162	}	1242	}
1163		1243
1164	#############################################################################	1244	#############################################################################
1165		1245
1166	package CFClient::UI::Table;	1246	package CFClient::UI::Table;
…		…
1240	(sum @$hs),	1320	(sum @$hs),
1241	)	1321	)
1242	}	1322	}
1243		1323
1244	sub size_allocate {	1324	sub size_allocate {
1245	my ($self, $w, $h, $changed) = @_;	1325	my ($self, $w, $h) = @_;
1246		1326
1247	my ($ws, $hs) = $self->get_wh;	1327	my ($ws, $hs) = $self->get_wh;
1248		1328
1249	my $req_w = (sum @$ws) || 1;	1329	my $req_w = (sum @$ws) || 1;
1250	my $req_h = (sum @$hs) || 1;	1330	my $req_h = (sum @$hs) || 1;
…		…
1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1329	)	1409	)
1330	}	1410	}
1331		1411
1332	sub size_allocate {	1412	sub size_allocate {
1333	my ($self, $w, $h, $changed) = @_;	1413	my ($self, $w, $h) = @_;
1334		1414
1335	my $space = $self->{vertical} ? $h : $w;	1415	my $space = $self->{vertical} ? $h : $w;
1336	my $children = $self->{children};	1416	my $children = $self->{children};
1337		1417
1338	my @req;	1418	my @req;
…		…
1421	ellipsise => 3, # end	1501	ellipsise => 3, # end
1422	layout => (new CFClient::Layout),	1502	layout => (new CFClient::Layout),
1423	fontsize => 1,	1503	fontsize => 1,
1424	align => -1,	1504	align => -1,
1425	valign => -1,	1505	valign => -1,
1426	padding => 2,	1506	padding_x => 2,
		1507	padding_y => 2,
1427	can_events => 0,	1508	can_events => 0,
1428	%arg	1509	%arg
1429	);	1510	);
1430		1511
1431	if (exists $self->{template}) {	1512	if (exists $self->{template}) {
…		…
1507		1588
1508	$w = List::Util::max $w, $w2;	1589	$w = List::Util::max $w, $w2;
1509	$h = List::Util::max $h, $h2;	1590	$h = List::Util::max $h, $h2;
1510	}	1591	}
1511		1592
1512	(	1593	($w, $h)
1513	$w + $self->{padding} * 2,
1514	$h + $self->{padding} * 2,
1515	)
1516	}	1594	}
1517		1595
1518	sub size_allocate {	1596	sub size_allocate {
1519	my ($self, $w, $h, $changed) = @_;	1597	my ($self, $w, $h) = @_;
		1598
		1599	delete $self->{ox};
1520		1600
1521	delete $self->{texture}	1601	delete $self->{texture}
1522	if $changed;	1602	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1523	}	1603	}
1524		1604
1525	sub set_fontsize {	1605	sub set_fontsize {
1526	my ($self, $fontsize) = @_;	1606	my ($self, $fontsize) = @_;
1527		1607
…		…
1542	$self->{layout}->set_width ($self->{w});	1622	$self->{layout}->set_width ($self->{w});
1543	$self->{layout}->set_ellipsise ($self->{ellipsise});	1623	$self->{layout}->set_ellipsise ($self->{ellipsise});
1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1624	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1625	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546		1626
1547	my $tex = new_from_layout CFClient::Texture $self->{layout};	1627	new_from_layout CFClient::Texture $self->{layout}
		1628	};
1548		1629
		1630	unless (exists $self->{ox}) {
1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1631	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1632	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551	: ($self->{w} - $tex->{w}) * 0.5);	1633	: ($self->{w} - $tex->{w}) * 0.5);
1552		1634
1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1635	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1636	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555	: ($self->{h} - $tex->{h}) * 0.5);	1637	: ($self->{h} - $tex->{h}) * 0.5);
1556
1557	$tex
1558	};	1638	};
1559		1639
1560	glEnable GL_TEXTURE_2D;	1640	glEnable GL_TEXTURE_2D;
1561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562		1642
…		…
1600		1680
1601	delete $self->{cur_h};	1681	delete $self->{cur_h};
1602		1682
1603	return if $self->{text} eq $text;	1683	return if $self->{text} eq $text;
1604		1684
1605	delete $self->{texture};
1606
1607	$self->{last_activity} = $::NOW;	1685	$self->{last_activity} = $::NOW;
1608	$self->{text} = $text;	1686	$self->{text} = $text;
1609		1687
1610	$text =~ s/./*/g if $self->{hidden};	1688	$text =~ s/./*/g if $self->{hidden};
1611	$self->{layout}->set_text ("$text ");	1689	$self->{layout}->set_text ("$text ");
1612		1690
1613	$self->_emit (changed => $self->{text});	1691	$self->_emit (changed => $self->{text});
		1692	$self->update;
1614	}	1693	}
1615		1694
1616	sub set_text {	1695	sub set_text {
1617	my ($self, $text) = @_;	1696	my ($self, $text) = @_;
1618		1697
…		…
1657	$self->{cursor} = length $text;	1736	$self->{cursor} = length $text;
1658	} elsif ($uni == 27) {	1737	} elsif ($uni == 27) {
1659	$self->_emit ('escape');	1738	$self->_emit ('escape');
1660	} elsif ($uni) {	1739	} elsif ($uni) {
1661	substr $text, $self->{cursor}++, 0, chr $uni;	1740	substr $text, $self->{cursor}++, 0, chr $uni;
		1741	} else {
		1742	return 0;
1662	}	1743	}
1663		1744
1664	$self->_set_text ($text);	1745	$self->_set_text ($text);
1665		1746
1666	$self->realloc;	1747	$self->realloc;
		1748
		1749	1
1667	}	1750	}
1668		1751
1669	sub focus_in {	1752	sub focus_in {
1670	my ($self) = @_;	1753	my ($self) = @_;
1671		1754
…		…
1686	utf8::encode $text;	1769	utf8::encode $text;
1687	$self->{cursor} = length substr $text, 0, $idx;	1770	$self->{cursor} = length substr $text, 0, $idx;
1688		1771
1689	$self->_set_text ($self->{text});	1772	$self->_set_text ($self->{text});
1690	$self->update;	1773	$self->update;
		1774
		1775	1
1691	}	1776	}
1692		1777
1693	sub mouse_motion {	1778	sub mouse_motion {
1694	my ($self, $ev, $x, $y) = @_;	1779	my ($self, $ev, $x, $y) = @_;
1695	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1780	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1781
		1782	0
1696	}	1783	}
1697		1784
1698	sub _draw {	1785	sub _draw {
1699	my ($self) = @_;	1786	my ($self) = @_;
1700		1787
1701	local $self->{fg} = $self->{fg};	1788	local $self->{fg} = $self->{fg};
1702		1789
1703	if ($FOCUS == $self) {	1790	if ($FOCUS == $self) {
1704	glColor @{$self->{active_bg}};	1791	glColor_premultiply @{$self->{active_bg}};
1705	$self->{fg} = $self->{active_fg};	1792	$self->{fg} = $self->{active_fg};
1706	} else {	1793	} else {
1707	glColor @{$self->{bg}};	1794	glColor_premultiply @{$self->{bg}};
1708	}	1795	}
1709		1796
1710	glEnable GL_BLEND;	1797	glEnable GL_BLEND;
1711	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1798	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712	glBegin GL_QUADS;	1799	glBegin GL_QUADS;
1713	glVertex 0 , 0;	1800	glVertex 0 , 0;
1714	glVertex 0 , $self->{h};	1801	glVertex 0 , $self->{h};
1715	glVertex $self->{w}, $self->{h};	1802	glVertex $self->{w}, $self->{h};
1716	glVertex $self->{w}, 0;	1803	glVertex $self->{w}, 0;
…		…
1777	} else {	1864	} else {
1778	$self->set_text ($self->{history_saveback});	1865	$self->set_text ($self->{history_saveback});
1779	}	1866	}
1780		1867
1781	} else {	1868	} else {
1782	$self->SUPER::key_down ($ev);	1869	return $self->SUPER::key_down ($ev)
		1870	}
		1871
1783	}	1872	1
1784
1785	}	1873	}
1786		1874
1787	#############################################################################	1875	#############################################################################
1788		1876
1789	package CFClient::UI::Button;	1877	package CFClient::UI::Button;
…		…
1798		1886
1799	sub new {	1887	sub new {
1800	my $class = shift;	1888	my $class = shift;
1801		1889
1802	$class->SUPER::new (	1890	$class->SUPER::new (
1803	padding => 4,	1891	padding_x => 4,
		1892	padding_y => 4,
1804	fg => [1, 1, 1],	1893	fg => [1, 1, 1],
1805	active_fg => [0, 0, 1],	1894	active_fg => [0, 0, 1],
1806	can_hover => 1,	1895	can_hover => 1,
1807	align => 0,	1896	align => 0,
1808	valign => 0,	1897	valign => 0,
…		…
1817	my ($self, $ev, $x, $y) = @_;	1906	my ($self, $ev, $x, $y) = @_;
1818		1907
1819	$self->emit ("activate")	1908	$self->emit ("activate")
1820	if $x >= 0 && $x < $self->{w}	1909	if $x >= 0 && $x < $self->{w}
1821	&& $y >= 0 && $y < $self->{h};	1910	&& $y >= 0 && $y < $self->{h};
		1911
		1912	1
1822	}	1913	}
1823		1914
1824	sub _draw {	1915	sub _draw {
1825	my ($self) = @_;	1916	my ($self) = @_;
1826		1917
…		…
1855		1946
1856	sub new {	1947	sub new {
1857	my $class = shift;	1948	my $class = shift;
1858		1949
1859	$class->SUPER::new (	1950	$class->SUPER::new (
1860	padding => 2,	1951	padding_x => 2,
		1952	padding_y => 2,
1861	fg => [1, 1, 1],	1953	fg => [1, 1, 1],
1862	active_fg => [1, 1, 0],	1954	active_fg => [1, 1, 0],
1863	bg => [0, 0, 0, 0.2],	1955	bg => [0, 0, 0, 0.2],
1864	active_bg => [1, 1, 1, 0.5],	1956	active_bg => [1, 1, 1, 0.5],
1865	state => 0,	1957	state => 0,
…		…
1869	}	1961	}
1870		1962
1871	sub size_request {	1963	sub size_request {
1872	my ($self) = @_;	1964	my ($self) = @_;
1873		1965
1874	($self->{padding} * 2 + 6) x 2	1966	(6) x 2
1875	}	1967	}
1876		1968
1877	sub button_down {	1969	sub button_down {
1878	my ($self, $ev, $x, $y) = @_;	1970	my ($self, $ev, $x, $y) = @_;
1879		1971
1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1972	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1973	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882	$self->{state} = !$self->{state};	1974	$self->{state} = !$self->{state};
1883	$self->_emit (changed => $self->{state});	1975	$self->_emit (changed => $self->{state});
		1976	} else {
		1977	return 0
		1978	}
		1979
1884	}	1980	1
1885	}	1981	}
1886		1982
1887	sub _draw {	1983	sub _draw {
1888	my ($self) = @_;	1984	my ($self) = @_;
1889		1985
1890	$self->SUPER::_draw;	1986	$self->SUPER::_draw;
1891		1987
1892	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1988	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893		1989
1894	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1990	my ($w, $h) = @$self{qw(w h)};
		1991
		1992	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895		1993
1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1994	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897		1995
1898	my $tex = $self->{state} ? $tex[1] : $tex[0];	1996	my $tex = $self->{state} ? $tex[1] : $tex[0];
1899		1997
…		…
2054		2152
2055	my $h1 = $self->{h} * (1 - $ycut1);	2153	my $h1 = $self->{h} * (1 - $ycut1);
2056	my $h2 = $self->{h} * (1 - $ycut2);	2154	my $h2 = $self->{h} * (1 - $ycut2);
2057		2155
2058	glEnable GL_BLEND;	2156	glEnable GL_BLEND;
2059	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2157	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2158	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060	glEnable GL_TEXTURE_2D;	2159	glEnable GL_TEXTURE_2D;
2061	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2160	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062		2161
2063	glBindTexture GL_TEXTURE_2D, $t1->{name};	2162	glBindTexture GL_TEXTURE_2D, $t1->{name};
2064	glBegin GL_QUADS;	2163	glBegin GL_QUADS;
…		…
2164	fg => [1, 1, 1],	2263	fg => [1, 1, 1],
2165	active_fg => [0, 0, 0],	2264	active_fg => [0, 0, 0],
2166	bg => [0, 0, 0, 0.2],	2265	bg => [0, 0, 0, 0.2],
2167	active_bg => [1, 1, 1, 0.5],	2266	active_bg => [1, 1, 1, 0.5],
2168	range => [0, 0, 100, 10, 0],	2267	range => [0, 0, 100, 10, 0],
2169	req_w => $::WIDTH / 80,	2268	min_w => $::WIDTH / 80,
2170	req_h => $::WIDTH / 80,	2269	min_h => $::WIDTH / 80,
2171	vertical => 0,	2270	vertical => 0,
2172	can_hover => 1,	2271	can_hover => 1,
2173	inner_pad => 0.02,	2272	inner_pad => 0.02,
2174	@_	2273	@_
2175	);	2274	);
…		…
2215	}	2314	}
2216		2315
2217	sub size_request {	2316	sub size_request {
2218	my ($self) = @_;	2317	my ($self) = @_;
2219		2318
2220	my $w = $self->{req_w};	2319	($self->{req_w}, $self->{req_h})
2221	my $h = $self->{req_h};
2222
2223	$self->{vertical} ? ($h, $w) : ($w, $h)
2224	}	2320	}
2225		2321
2226	sub button_down {	2322	sub button_down {
2227	my ($self, $ev, $x, $y) = @_;	2323	my ($self, $ev, $x, $y) = @_;
2228		2324
2229	$self->SUPER::button_down ($ev, $x, $y);	2325	$self->SUPER::button_down ($ev, $x, $y);
2230		2326
2231	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2327	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232		2328
2233	$self->mouse_motion ($ev, $x, $y);	2329	$self->mouse_motion ($ev, $x, $y)
2234	}	2330	}
2235		2331
2236	sub mouse_motion {	2332	sub mouse_motion {
2237	my ($self, $ev, $x, $y) = @_;	2333	my ($self, $ev, $x, $y) = @_;
2238		2334
…		…
2242	my (undef, $lo, $hi, $page) = @{$self->{range}};	2338	my (undef, $lo, $hi, $page) = @{$self->{range}};
2243		2339
2244	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2340	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245		2341
2246	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2342	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2343	} else {
		2344	return 0;
		2345	}
		2346
2247	}	2347	1
2248	}	2348	}
2249		2349
2250	sub update {	2350	sub update {
2251	my ($self) = @_;	2351	my ($self) = @_;
2252		2352
2253	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2353	delete $self->{knob_w};
		2354	$self->SUPER::update;
		2355	}
		2356
		2357	sub _draw {
		2358	my ($self) = @_;
		2359
		2360	unless ($self->{knob_w}) {
2254	$self->set_value ($self->{range}[0]);	2361	$self->set_value ($self->{range}[0]);
2255		2362
2256	my ($value, $lo, $hi, $page) = @{$self->{range}};	2363	my ($value, $lo, $hi, $page) = @{$self->{range}};
2257	my $range = ($hi - $page - $lo) || 1e-100;	2364	my $range = ($hi - $page - $lo) || 1e-100;
2258		2365
…		…
2264	$value = ($value - $lo) / $range;	2371	$value = ($value - $lo) / $range;
2265	$value = $value * $self->{scale} + $self->{offset};	2372	$value = $value * $self->{scale} + $self->{offset};
2266		2373
2267	$self->{knob_x} = $value - $knob_w * 0.5;	2374	$self->{knob_x} = $value - $knob_w * 0.5;
2268	$self->{knob_w} = $knob_w;	2375	$self->{knob_w} = $knob_w;
2269	});	2376	}
2270
2271	$self->SUPER::update;
2272	}
2273
2274	sub _draw {
2275	my ($self) = @_;
2276		2377
2277	$self->SUPER::_draw ();	2378	$self->SUPER::_draw ();
2278		2379
2279	glScale $self->{w}, $self->{h};	2380	glScale $self->{w}, $self->{h};
2280		2381
…		…
2378	$self->{fontsize} = $fontsize;	2479	$self->{fontsize} = $fontsize;
2379	$self->reflow;	2480	$self->reflow;
2380	}	2481	}
2381		2482
2382	sub size_allocate {	2483	sub size_allocate {
2383	my ($self, $w, $h, $changed) = @_;	2484	my ($self, $w, $h) = @_;
2384		2485
2385	$self->SUPER::size_allocate ($w, $h, $changed);	2486	$self->SUPER::size_allocate ($w, $h);
2386
2387	return unless $changed;
2388		2487
2389	$self->{layout}->set_font ($self->{font}) if $self->{font};	2488	$self->{layout}->set_font ($self->{font}) if $self->{font};
2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2489	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391	$self->{layout}->set_width ($self->{children}[0]{w});	2490	$self->{layout}->set_width ($self->{children}[0]{w});
2392		2491
…		…
2615	}	2714	}
2616		2715
2617	sub set_tooltip_from {	2716	sub set_tooltip_from {
2618	my ($self, $widget) = @_;	2717	my ($self, $widget) = @_;
2619		2718
		2719	my $tooltip = $widget->{tooltip};
		2720
		2721	if ($ENV{CFPLUS_DEBUG} & 2) {
		2722	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2723	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2724	. "req $widget->{req_w} $widget->{req_h}\n"
		2725	. "visible $widget->{visible}";
		2726	}
		2727
2620	$self->add (new CFClient::UI::Label	2728	$self->add (new CFClient::UI::Label
2621	markup => $widget->{tooltip},	2729	markup => $tooltip,
2622	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2730	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623	fontsize => 0.8,	2731	fontsize => 0.8,
2624	fg => [0, 0, 0, 1],	2732	fg => [0, 0, 0, 1],
2625	ellipsise => 0,	2733	ellipsise => 0,
2626	font => ($widget->{tooltip_font} || $::FONT_PROP),	2734	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2634		2742
2635	($w + 4, $h + 4)	2743	($w + 4, $h + 4)
2636	}	2744	}
2637		2745
2638	sub size_allocate {	2746	sub size_allocate {
2639	my ($self, $w, $h, $changed) = @_;	2747	my ($self, $w, $h) = @_;
2640		2748
2641	return unless $changed;
2642
2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2749	$self->SUPER::size_allocate ($w - 4, $h - 4);
2644	}	2750	}
2645		2751
2646	sub visibility_change {	2752	sub visibility_change {
2647	my ($self, $visible) = @_;	2753	my ($self, $visible) = @_;
2648		2754
…		…
2769	$self->SUPER::DESTROY;	2875	$self->SUPER::DESTROY;
2770	}	2876	}
2771		2877
2772	#############################################################################	2878	#############################################################################
2773		2879
2774	package CFClient::UI::Inventory;	2880	package CFClient::UI::Buttonbar;
2775		2881
2776	our @ISA = CFClient::UI::ScrolledWindow::;	2882	our @ISA = CFClient::UI::HBox::;
2777		2883
2778	sub new {	2884	# TODO: should actualyl wrap buttons and other goodies.
2779	my $class = shift;
2780
2781	my $self = $class->SUPER::new (
2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783	@_,
2784	);
2785
2786	$self
2787	}
2788
2789	sub set_items {
2790	my ($self, $items) = @_;
2791
2792	$self->{scrolled}->clear;
2793	return unless $items;
2794
2795	my @items = sort {
2796	($a->{type} <=> $b->{type})
2797	or ($a->{name} cmp $b->{name})
2798	} @$items;
2799
2800	$self->{real_items} = \@items;
2801
2802	my $row = 0;
2803	for my $item (@items) {
2804	CFClient::Item::update_widgets $item;
2805
2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810	$row++;
2811	}
2812	}
2813		2885
2814	#############################################################################	2886	#############################################################################
2815		2887
2816	package CFClient::UI::Menu;	2888	package CFClient::UI::Menu;
2817		2889
…		…
2858	# maybe save $GRAB? must be careful about events...	2930	# maybe save $GRAB? must be careful about events...
2859	$GRAB = $self;	2931	$GRAB = $self;
2860	$self->{button} = $ev->{button};	2932	$self->{button} = $ev->{button};
2861		2933
2862	$self->show;	2934	$self->show;
2863	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2935	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864	}	2936	}
2865		2937
2866	sub mouse_motion {	2938	sub mouse_motion {
2867	my ($self, $ev, $x, $y) = @_;	2939	my ($self, $ev, $x, $y) = @_;
2868		2940
2869	# TODO: should use vbox->find_widget or so	2941	# TODO: should use vbox->find_widget or so
2870	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2942	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871	$self->{hover} = $self->{item}{$HOVER};	2943	$self->{hover} = $self->{item}{$HOVER};
		2944
		2945	0
2872	}	2946	}
2873		2947
2874	sub button_up {	2948	sub button_up {
2875	my ($self, $ev, $x, $y) = @_;	2949	my ($self, $ev, $x, $y) = @_;
2876		2950
…		…
2878	undef $GRAB;	2952	undef $GRAB;
2879	$self->hide;	2953	$self->hide;
2880		2954
2881	$self->_emit ("popdown");	2955	$self->_emit ("popdown");
2882	$self->{hover}[1]->() if $self->{hover};	2956	$self->{hover}[1]->() if $self->{hover};
		2957	} else {
		2958	return 0
		2959	}
		2960
		2961	1
		2962	}
		2963
		2964	#############################################################################
		2965
		2966	package CFClient::UI::Multiplexer;
		2967
		2968	our @ISA = CFClient::UI::Container::;
		2969
		2970	sub new {
		2971	my $class = shift;
		2972
		2973	my $self = $class->SUPER::new (
		2974	@_,
		2975	);
		2976
		2977	$self->{current} = $self->{children}[0]
		2978	if @{ $self->{children} };
		2979
		2980	$self
		2981	}
		2982
		2983	sub add {
		2984	my ($self, @widgets) = @_;
		2985
		2986	$self->SUPER::add (@widgets);
		2987
		2988	$self->{current} = $self->{children}[0]
		2989	if @{ $self->{children} };
		2990	}
		2991
		2992	sub set_current_page {
		2993	my ($self, $page_or_widget) = @_;
		2994
		2995	my $widget = ref $page_or_widget
		2996	? $page_or_widget
		2997	: $self->{children}[$page_or_widget];
		2998
		2999	$self->{current} = $widget;
		3000	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3001
		3002	$self->_emit (page_changed => $self->{current});
		3003
		3004	$self->realloc;
		3005	}
		3006
		3007	sub visible_children {
		3008	$_[0]{current}
		3009	}
		3010
		3011	sub size_request {
		3012	my ($self) = @_;
		3013
		3014	$self->{current}->size_request
		3015	}
		3016
		3017	sub size_allocate {
		3018	my ($self, $w, $h) = @_;
		3019
		3020	$self->{current}->configure (0, 0, $w, $h);
		3021	}
		3022
		3023	sub _draw {
		3024	my ($self) = @_;
		3025
		3026	$self->{current}->draw;
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::Notebook;
		3032
		3033	our @ISA = CFClient::UI::VBox::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (
		3039	buttonbar => (new CFClient::UI::Buttonbar),
		3040	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3041	# filter => # will be put between multiplexer and $self
		3042	@_,
		3043	);
2883	}	3044
		3045	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3046	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3047
		3048	$self
		3049	}
		3050
		3051	sub add {
		3052	my ($self, $title, $widget, $tooltip) = @_;
		3053
		3054	Scalar::Util::weaken $self;
		3055
		3056	$self->{buttonbar}->add (new CFClient::UI::Button
		3057	markup => $title,
		3058	tooltip => $tooltip,
		3059	on_activate => sub { $self->set_current_page ($widget) },
		3060	);
		3061
		3062	$self->{multiplexer}->add ($widget);
		3063	}
		3064
		3065	sub set_current_page {
		3066	my ($self, $page) = @_;
		3067
		3068	$self->{multiplexer}->set_current_page ($page);
		3069	$self->_emit (page_changed => $self->{multiplexer}{current});
2884	}	3070	}
2885		3071
2886	#############################################################################	3072	#############################################################################
2887		3073
2888	package CFClient::UI::Statusbox;	3074	package CFClient::UI::Statusbox;
…		…
2993	$self->SUPER::reconfigure;	3179	$self->SUPER::reconfigure;
2994	}	3180	}
2995		3181
2996	#############################################################################	3182	#############################################################################
2997		3183
		3184	package CFClient::UI::Inventory;
		3185
		3186	our @ISA = CFClient::UI::ScrolledWindow::;
		3187
		3188	sub new {
		3189	my $class = shift;
		3190
		3191	my $self = $class->SUPER::new (
		3192	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3193	@_,
		3194	);
		3195
		3196	$self
		3197	}
		3198
		3199	sub set_items {
		3200	my ($self, $items) = @_;
		3201
		3202	$self->{child}->clear;
		3203	return unless $items;
		3204
		3205	my @items = sort {
		3206	($a->{type} <=> $b->{type})
		3207	or ($a->{name} cmp $b->{name})
		3208	} @$items;
		3209
		3210	$self->{real_items} = \@items;
		3211
		3212	my $row = 0;
		3213	for my $item (@items) {
		3214	CFClient::Item::update_widgets $item;
		3215
		3216	$self->{child}->add (0, $row, $item->{face_widget});
		3217	$self->{child}->add (1, $row, $item->{desc_widget});
		3218	$self->{child}->add (2, $row, $item->{weight_widget});
		3219
		3220	$row++;
		3221	}
		3222	}
		3223
		3224	#############################################################################
		3225
		3226	package CFClient::UI::BindEditor;
		3227
		3228	our @ISA = CFClient::UI::FancyFrame::;
		3229
		3230	sub new {
		3231	my $class = shift;
		3232
		3233	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3234
		3235	$self->add (my $vb = new CFClient::UI::VBox);
		3236
		3237
		3238	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3239	text => "start recording",
		3240	tooltip => "Start/Stops recording of actions."
		3241	."All subsequent actions after the recording started will be captured."
		3242	."The actions are displayed after the record was stopped."
		3243	."To bind the action you have to click on the 'Bind' button",
		3244	on_activate => sub {
		3245	unless ($self->{recording}) {
		3246	$self->start;
		3247	} else {
		3248	$self->stop;
		3249	}
		3250	});
		3251
		3252	$vb->add (new CFClient::UI::Label text => "Actions:");
		3253	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3254
		3255	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3256	$vb->add (my $hb = new CFClient::UI::HBox);
		3257	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3258	$hb->add (new CFClient::UI::Button
		3259	text => "bind",
		3260	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3261	on_activate => sub {
		3262	$self->ask_for_bind;
		3263	});
		3264
		3265	$vb->add (my $hb = new CFClient::UI::HBox);
		3266	$hb->add (new CFClient::UI::Button
		3267	text => "ok",
		3268	expand => 1,
		3269	tooltip => "This closes the binding editor and saves the binding",
		3270	on_activate => sub {
		3271	$self->hide;
		3272	$self->commit;
		3273	});
		3274
		3275	$hb->add (new CFClient::UI::Button
		3276	text => "cancel",
		3277	expand => 1,
		3278	tooltip => "This closes the binding editor without saving",
		3279	on_activate => sub {
		3280	$self->hide;
		3281	$self->{binding_cancel}->()
		3282	if $self->{binding_cancel};
		3283	});
		3284
		3285	$self->update_binding_widgets;
		3286
		3287	$self
		3288	}
		3289
		3290	sub commit {
		3291	my ($self) = @_;
		3292	my ($mod, $sym, $cmds) = $self->get_binding;
		3293	if ($sym != 0 && @$cmds > 0) {
		3294	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3295	."'. Don't forget 'Save Config'!");
		3296	$self->{binding_change}->($mod, $sym, $cmds)
		3297	if $self->{binding_change};
		3298	} else {
		3299	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3300	$self->{binding_cancel}->()
		3301	if $self->{binding_cancel};
		3302	}
		3303	}
		3304
		3305	sub start {
		3306	my ($self) = @_;
		3307
		3308	$self->{rec_btn}->set_text ("stop recording");
		3309	$self->{recording} = 1;
		3310	$self->clear_command_list;
		3311	$::CONN->start_record if $::CONN;
		3312	}
		3313
		3314	sub stop {
		3315	my ($self) = @_;
		3316
		3317	$self->{rec_btn}->set_text ("start recording");
		3318	$self->{recording} = 0;
		3319
		3320	my $rec;
		3321	$rec = $::CONN->stop_record if $::CONN;
		3322	return unless ref $rec eq 'ARRAY';
		3323	$self->set_command_list ($rec);
		3324	}
		3325
		3326
		3327	sub ask_for_bind_and_commit {
		3328	my ($self) = @_;
		3329	$self->ask_for_bind (1);
		3330	}
		3331
		3332	sub ask_for_bind {
		3333	my ($self, $commit) = @_;
		3334
		3335	CFClient::Binder::open_binding_dialog (sub {
		3336	my ($mod, $sym) = @_;
		3337	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3338	$self->update_binding_widgets;
		3339	$self->commit if $commit;
		3340	});
		3341	}
		3342
		3343	# $mod and $sym are the modifiers and key symbol
		3344	# $cmds is a array ref of strings (the commands)
		3345	# $cb is the callback that is executed on OK
		3346	# $ccb is the callback that is executed on CANCEL and
		3347	# when the binding was unsuccessful on OK
		3348	sub set_binding {
		3349	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3350
		3351	$self->clear_command_list;
		3352	$self->{recording} = 0;
		3353	$self->{rec_btn}->set_text ("start recording");
		3354
		3355	$self->{binding} = [$mod, $sym];
		3356	$self->{commands} = $cmds;
		3357
		3358	$self->{binding_change} = $cb;
		3359	$self->{binding_cancel} = $ccb;
		3360
		3361	$self->update_binding_widgets;
		3362	}
		3363
		3364	# this is a shortcut method that asks for a binding
		3365	# and then just binds it.
		3366	sub do_quick_binding {
		3367	my ($self, $cmds) = @_;
		3368	$self->set_binding (undef, undef, $cmds, sub {
		3369	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3370	});
		3371	$self->ask_for_bind (1);
		3372	}
		3373
		3374	sub update_binding_widgets {
		3375	my ($self) = @_;
		3376	my ($mod, $sym, $cmds) = $self->get_binding;
		3377	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3378	$self->set_command_list ($cmds);
		3379	}
		3380
		3381	sub get_binding {
		3382	my ($self) = @_;
		3383	return (
		3384	$self->{binding}->[0],
		3385	$self->{binding}->[1],
		3386	[ grep { defined $_ } @{$self->{commands}} ]
		3387	);
		3388	}
		3389
		3390	sub clear_command_list {
		3391	my ($self) = @_;
		3392	$self->{cmdbox}->clear ();
		3393	}
		3394
		3395	sub set_command_list {
		3396	my ($self, $cmds) = @_;
		3397
		3398	$self->{cmdbox}->clear ();
		3399	$self->{commands} = $cmds;
		3400
		3401	my $idx = 0;
		3402
		3403	for (@$cmds) {
		3404	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3405
		3406	my $i = $idx;
		3407	$hb->add (new CFClient::UI::Label text => $_);
		3408	$hb->add (new CFClient::UI::Button
		3409	text => "delete",
		3410	tooltip => "Deletes the action from the record",
		3411	on_activate => sub {
		3412	$self->{cmdbox}->remove ($hb);
		3413	$cmds->[$i] = undef;
		3414	});
		3415
		3416
		3417	$idx++
		3418	}
		3419	}
		3420
		3421	#############################################################################
		3422
		3423	package CFClient::UI::SpellList;
		3424
		3425	our @ISA = CFClient::UI::Table::;
		3426
		3427	sub new {
		3428	my $class = shift;
		3429
		3430	my $self = $class->SUPER::new (
		3431	binding => [],
		3432	commands => [],
		3433	@_,
		3434	)
		3435	}
		3436
		3437	# XXX: Do sorting? Argl...
		3438	sub add_spell {
		3439	my ($self, $spell) = @_;
		3440	$self->{spells}->{$spell->{name}} = $spell;
		3441
		3442	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3443	face => $spell->{face},
		3444	can_hover => 1,
		3445	can_events => 1,
		3446	tooltip => $spell->{message});
		3447
		3448	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3449	text => $spell->{name},
		3450	can_hover => 1,
		3451	can_events => 1,
		3452	tooltip => $spell->{message},
		3453	expand => 1);
		3454
		3455	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3456	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3457	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3458	expand => 1);
		3459
		3460	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3461	text => "bind to key",
		3462	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3463	}
		3464
		3465	sub rebuild_spell_list {
		3466	my ($self) = @_;
		3467	$self->{tbl_idx} = 0;
		3468	$self->add_spell ($_) for values %{$self->{spells}};
		3469	}
		3470
		3471	sub remove_spell {
		3472	my ($self, $spell) = @_;
		3473	delete $self->{spells}->{$spell->{name}};
		3474	$self->rebuild_spell_list;
		3475	}
		3476
		3477	#############################################################################
		3478
2998	package CFClient::UI::Root;	3479	package CFClient::UI::Root;
2999		3480
3000	our @ISA = CFClient::UI::Container::;	3481	our @ISA = CFClient::UI::Container::;
3001		3482
3002	use CFClient::OpenGL;	3483	use CFClient::OpenGL;
…		…
3012	Scalar::Util::weaken ($self->{root} = $self);	3493	Scalar::Util::weaken ($self->{root} = $self);
3013		3494
3014	$self	3495	$self
3015	}	3496	}
3016		3497
3017	sub configure {
3018	my ($self, $x, $y, $w, $h) = @_;
3019
3020	$self->{w} = $w;
3021	$self->{h} = $h;
3022	}
3023
3024	sub reconfigure {
3025	my ($self) = @_;
3026
3027	$self->SUPER::reconfigure;
3028
3029	$self->size_allocate ($self->{w}, $self->{h}, 1)
3030	if $self->{w};
3031	}
3032
3033	sub size_request {	3498	sub size_request {
3034	my ($self) = @_;	3499	my ($self) = @_;
3035		3500
3036	($self->{w}, $self->{h})	3501	($self->{w}, $self->{h})
3037	}	3502	}
…		…
3049		3514
3050	int $coord + 0.5	3515	int $coord + 0.5
3051	}	3516	}
3052		3517
3053	sub size_allocate {	3518	sub size_allocate {
3054	my ($self, $w, $h, $changed) = @_;	3519	my ($self, $w, $h) = @_;
3055		3520
3056	for my $child ($self->children) {	3521	for my $child ($self->children) {
3057	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3522	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3058		3523
3059	$X = $child->{force_x} if exists $child->{force_x};	3524	$X = $child->{force_x} if exists $child->{force_x};
…		…
3127	$_->()	3592	$_->()
3128	for values %{delete $self->{refresh_hook}};	3593	for values %{delete $self->{refresh_hook}};
3129	}	3594	}
3130		3595
3131	if ($self->{realloc}) {	3596	if ($self->{realloc}) {
		3597	my %queue;
3132	my @queue;	3598	my @queue;
		3599	my $widget;
3133		3600
		3601	outer:
3134	while () {	3602	while () {
3135	if ($self->{realloc}) {	3603	if (my $realloc = delete $self->{realloc}) {
3136	#TODO use array-of-depth approach	3604	for $widget (values %$realloc) {
		3605	$widget->{visible} or next; # do not resize invisible widgets
3137		3606
3138	@queue = sort { $a->{visible} <=> $b->{visible} }	3607	$queue{$widget+0}++ and next; # duplicates are common
3139	@queue, values %{delete $self->{realloc}};	3608
		3609	push @{ $queue[$widget->{visible}] }, $widget;
		3610	}
3140	}	3611	}
3141		3612
		3613	while () {
		3614	@queue or last outer;
		3615
		3616	$widget = pop @{ $queue[-1] || [] }
		3617	and last;
		3618
		3619	pop @queue;
		3620	}
		3621
		3622	delete $queue{$widget+0};
		3623
		3624	my ($w, $h) = $widget->size_request;
		3625
		3626	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3627	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3628
		3629	$w = $widget->{force_w} if exists $widget->{force_w};
		3630	$h = $widget->{force_h} if exists $widget->{force_h};
		3631
		3632	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3633	|| delete $widget->{force_realloc}) {
		3634	$widget->{req_w} = $w;
		3635	$widget->{req_h} = $h;
		3636
		3637	$self->{size_alloc}{$widget+0} = $widget;
		3638
		3639	if (my $parent = $widget->{parent}) {
		3640	$self->{realloc}{$parent+0} = $parent
		3641	unless $queue{$parent+0};
		3642
		3643	$parent->{force_size_alloc} = 1;
		3644	$self->{size_alloc}{$parent+0} = $parent;
		3645	}
		3646	}
		3647
		3648	delete $self->{realloc}{$widget+0};
		3649	}
		3650	}
		3651
		3652	while (my $size_alloc = delete $self->{size_alloc}) {
		3653	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3654	values %$size_alloc;
		3655
		3656	while () {
3142	my $widget = pop @queue || last;	3657	my $widget = pop @queue || last;
3143		3658
3144	$widget->{visible} or last; # do not resize invisible widgets	3659	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145
3146	my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147	? @$widget{qw(force_w force_h)}
3148	: $widget->size_request;
3149
3150	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152	$w = $min_size if $w < $min_size;
3153	$h = $min_size if $h < $min_size;
3154
3155	$widget->{req_w} = $w;
3156	$widget->{req_h} = $h;
3157
3158	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160	push @queue, $widget->{parent}
3161	if $widget->{parent};
3162	}
3163	}
3164
3165	while (my $size_alloc = delete $self->{size_alloc}) {
3166	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167	values %$size_alloc;
3168
3169	while () {
3170	my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172	$w = $widget->{w} || $widget->{req_w} unless defined $w;
3173	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3174		3660
3175	$w = 0 if $w < 0;	3661	$w = 0 if $w < 0;
3176	$h = 0 if $h < 0;	3662	$h = 0 if $h < 0;
3177		3663
3178	$w = int $w + 0.5;	3664	$w = int $w + 0.5;
3179	$h = int $h + 0.5;	3665	$h = int $h + 0.5;
3180		3666
3181	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3667	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3668	$widget->{old_w} = $widget->{w};
		3669	$widget->{old_h} = $widget->{h};
3182		3670
3183	$widget->{w} = $w;	3671	$widget->{w} = $w;
3184	$widget->{h} = $h;	3672	$widget->{h} = $h;
3185		3673
3186	$widget->emit (size_allocate => $w, $h, $changed);	3674	$widget->emit (size_allocate => $w, $h);
		3675	}
3187	}	3676	}
3188	}	3677	}
3189		3678
3190	while ($self->{post_alloc_hook}) {	3679	while ($self->{post_alloc_hook}) {
3191	$_->()	3680	$_->()
3192	for values %{delete $self->{post_alloc_hook}};	3681	for values %{delete $self->{post_alloc_hook}};
3193	}	3682	}
		3683
3194		3684
3195	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3685	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3686	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197	glClear GL_COLOR_BUFFER_BIT;	3687	glClear GL_COLOR_BUFFER_BIT;
3198		3688
…		…
3200	glLoadIdentity;	3690	glLoadIdentity;
3201	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3691	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3202	glMatrixMode GL_MODELVIEW;	3692	glMatrixMode GL_MODELVIEW;
3203	glLoadIdentity;	3693	glLoadIdentity;
3204		3694
		3695	{
		3696	package CFClient::UI::Base;
		3697
		3698	($draw_x, $draw_y, $draw_w, $draw_h) =
		3699	(0, 0, $self->{w}, $self->{h});
		3700	}
		3701
3205	$self->_draw;	3702	$self->_draw;
3206	}	3703	}
3207		3704
3208	#############################################################################	3705	#############################################################################
3209		3706

Diff Legend

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