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.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 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
372	delete $self->{max_w}; $self->{max_w} = $w if $w;	386	$self->{max_w} = int $w if defined $w;
373	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	$self->{max_h} = int $h if defined $h;
		388
		389	$self->realloc;
374	}	390	}
375		391
376	sub set_tooltip {	392	sub set_tooltip {
377	my ($self, $tooltip) = @_;	393	my ($self, $tooltip) = @_;
378		394
…		…
430		446
431	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	447	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
432	unless $FOCUS;	448	unless $FOCUS;
433	}	449	}
434		450
435	sub mouse_motion { }	451	sub mouse_motion { 0 }
436	sub button_up { }	452	sub button_up { 0 }
437	sub key_down { }	453	sub key_down { 0 }
438	sub key_up { }	454	sub key_up { 0 }
439		455
440	sub button_down {	456	sub button_down {
441	my ($self, $ev, $x, $y) = @_;	457	my ($self, $ev, $x, $y) = @_;
442		458
443	$self->focus_in;	459	$self->focus_in;
444	}
445		460
446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	461	0
447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	462	}
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		463
452	sub find_widget {	464	sub find_widget {
453	my ($self, $x, $y) = @_;	465	my ($self, $x, $y) = @_;
454		466
455	return () unless $self->{can_events};	467	return () unless $self->{can_events};
…		…
463		475
464	sub set_parent {	476	sub set_parent {
465	my ($self, $parent) = @_;	477	my ($self, $parent) = @_;
466		478
467	Scalar::Util::weaken ($self->{parent} = $parent);	479	Scalar::Util::weaken ($self->{parent} = $parent);
468
469	$self->set_visible if $parent->{visible};	480	$self->set_visible if $parent->{visible};
470	}	481	}
471		482
472	sub connect {	483	sub connect {
473	my ($self, $signal, $cb) = @_;	484	my ($self, $signal, $cb) = @_;
…		…
494		505
495	sub realloc {	506	sub realloc {
496	my ($self) = @_;	507	my ($self) = @_;
497		508
498	if ($self->{visible}) {	509	if ($self->{visible}) {
499	return if $self->{root}{realloc}{$self};	510	return if $self->{root}{realloc}{$self+0};
500		511
501	$self->{root}{realloc}{$self} = $self;	512	$self->{root}{realloc}{$self+0} = $self;
502	$self->{root}->update;	513	$self->{root}->update;
503	} else {	514	} else {
504	delete $self->{req_w};	515	delete $self->{req_w};
		516	delete $self->{req_h};
505	}	517	}
506	}	518	}
507		519
508	sub update {	520	sub update {
509	my ($self) = @_;	521	my ($self) = @_;
…		…
517		529
518	$self->realloc;	530	$self->realloc;
519	$self->update;	531	$self->update;
520	}	532	}
521		533
		534	# using global variables seems a bit hacky, but passing through all drawing
		535	# functions seems pointless.
		536	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		537
522	sub draw {	538	sub draw {
523	my ($self) = @_;	539	my ($self) = @_;
524		540
525	return unless $self->{h} && $self->{w};	541	return unless $self->{h} && $self->{w};
		542
		543	# update screen rectangle
		544	local $draw_x = $draw_x + $self->{x};
		545	local $draw_y = $draw_y + $self->{y};
		546	local $draw_w = $draw_x + $self->{w};
		547	local $draw_h = $draw_y + $self->{h};
		548
		549	# skip widgets that are entirely outside the drawing area
		550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526		552
527	glPushMatrix;	553	glPushMatrix;
528	glTranslate $self->{x}, $self->{y}, 0;	554	glTranslate $self->{x}, $self->{y}, 0;
529	$self->_draw;
530	glPopMatrix;
531		555
532	if ($self == $HOVER && $self->{can_hover}) {	556	if ($self == $HOVER && $self->{can_hover}) {
533	my ($x, $y) = @$self{qw(x y)};
534
535	glColor 1, 0.8, 0.5, 0.2;	557	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536	glEnable GL_BLEND;	558	glEnable GL_BLEND;
537	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538	glBegin GL_QUADS;	560	glBegin GL_QUADS;
539	glVertex $x , $y;	561	glVertex 0 , 0;
540	glVertex $x + $self->{w}, $y;	562	glVertex $self->{w}, 0;
541	glVertex $x + $self->{w}, $y + $self->{h};	563	glVertex $self->{w}, $self->{h};
542	glVertex $x , $y + $self->{h};	564	glVertex 0 , $self->{h};
543	glEnd;	565	glEnd;
544	glDisable GL_BLEND;	566	glDisable GL_BLEND;
545	}	567	}
546		568
547	if ($ENV{CFPLUS_DEBUG}) {	569	if ($ENV{CFPLUS_DEBUG} & 1) {
548	glPushMatrix;	570	glPushMatrix;
549	glColor 1, 1, 0, 1;	571	glColor 1, 1, 0, 1;
550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	572	glTranslate 0.375, 0.375;
551	glBegin GL_LINE_LOOP;	573	glBegin GL_LINE_LOOP;
552	glVertex 0 , 0;	574	glVertex 0 , 0;
553	glVertex $self->{w} - 1, 0;	575	glVertex $self->{w} - 1, 0;
554	glVertex $self->{w} - 1, $self->{h} - 1;	576	glVertex $self->{w} - 1, $self->{h} - 1;
555	glVertex 0 , $self->{h} - 1;	577	glVertex 0 , $self->{h} - 1;
556	glEnd;	578	glEnd;
557	glPopMatrix;	579	glPopMatrix;
558	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559	}	581	}
		582
		583	$self->_draw;
		584	glPopMatrix;
560	}	585	}
561		586
562	sub _draw {	587	sub _draw {
563	my ($self) = @_;	588	my ($self) = @_;
564		589
…		…
602		627
603	if ($color && (@$color < 4 || $color->[3])) {	628	if ($color && (@$color < 4 || $color->[3])) {
604	my ($w, $h) = @$self{qw(w h)};	629	my ($w, $h) = @$self{qw(w h)};
605		630
606	glEnable GL_BLEND;	631	glEnable GL_BLEND;
607	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	632	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608	glColor @$color;	633	glColor_premultiply @$color;
609		634
610	glBegin GL_QUADS;	635	glBegin GL_QUADS;
611	glVertex 0 , 0;	636	glVertex 0 , 0;
612	glVertex 0 , $h;	637	glVertex 0 , $h;
613	glVertex $w, $h;	638	glVertex $w, $h;
…		…
644	our @ISA = CFClient::UI::Base::;	669	our @ISA = CFClient::UI::Base::;
645		670
646	sub new {	671	sub new {
647	my ($class, %arg) = @_;	672	my ($class, %arg) = @_;
648		673
649	my $children = delete $arg{children} || [];	674	my $children = delete $arg{children};
650		675
651	my $self = $class->SUPER::new (	676	my $self = $class->SUPER::new (
652	children => [],	677	children => [],
653	can_events => 0,	678	can_events => 0,
654	%arg,	679	%arg,
655	);	680	);
		681
656	$self->add ($_) for @$children;	682	$self->add (@$children)
		683	if $children;
657		684
658	$self	685	$self
659	}	686	}
660		687
661	sub add {	688	sub add {
…		…
709	$x -= $self->{x};	736	$x -= $self->{x};
710	$y -= $self->{y};	737	$y -= $self->{y};
711		738
712	my $res;	739	my $res;
713		740
714	for (reverse @{ $self->{children} }) {	741	for (reverse $self->visible_children) {
715	$res = $_->find_widget ($x, $y)	742	$res = $_->find_widget ($x, $y)
716	and return $res;	743	and return $res;
717	}	744	}
718		745
719	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	746	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
761	sub size_request {	788	sub size_request {
762	$_[0]{children}[0]->size_request	789	$_[0]{children}[0]->size_request
763	}	790	}
764		791
765	sub size_allocate {	792	sub size_allocate {
766	my ($self, $w, $h, $changed) = @_;	793	my ($self, $w, $h) = @_;
767		794
768	$self->{children}[0]->configure (0, 0, $w, $h);	795	$self->{children}[0]->configure (0, 0, $w, $h);
769	}	796	}
770		797
771	#############################################################################	798	#############################################################################
		799
		800	# back-buffered drawing area
772		801
773	package CFClient::UI::Window;	802	package CFClient::UI::Window;
774		803
775	our @ISA = CFClient::UI::Bin::;	804	our @ISA = CFClient::UI::Bin::;
776		805
…		…
788	$ROOT->on_post_alloc ($self => sub { $self->render_child });	817	$ROOT->on_post_alloc ($self => sub { $self->render_child });
789	$self->SUPER::update;	818	$self->SUPER::update;
790	}	819	}
791		820
792	sub size_allocate {	821	sub size_allocate {
793	my ($self, $w, $h, $changed) = @_;	822	my ($self, $w, $h) = @_;
794		823
795	$self->SUPER::size_allocate ($w, $h, $changed);	824	$self->SUPER::size_allocate ($w, $h);
796	$self->update	825	$self->update;
797	if $changed;
798	}	826	}
799		827
800	sub _render {	828	sub _render {
		829	my ($self) = @_;
		830
801	$_[0]{children}[0]->draw;	831	$self->{children}[0]->draw;
802	}	832	}
803		833
804	sub render_child {	834	sub render_child {
805	my ($self) = @_;	835	my ($self) = @_;
806		836
807	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808	glClearColor 0, 0, 0, 0;	838	glClearColor 0, 0, 0, 0;
809	glClear GL_COLOR_BUFFER_BIT;	839	glClear GL_COLOR_BUFFER_BIT;
810		840
		841	{
		842	package CFClient::UI::Base;
		843
		844	($draw_x, $draw_y, $draw_w, $draw_h) =
		845	(0, 0, $self->{w}, $self->{h});
		846	}
		847
811	$self->_render;	848	$self->_render;
812	};	849	};
813	}	850	}
814		851
815	sub _draw {	852	sub _draw {
816	my ($self) = @_;	853	my ($self) = @_;
817		854
818	my ($w, $h) = ($self->w, $self->h);	855	my ($w, $h) = @$self{qw(w h)};
819		856
820	my $tex = $self->{texture}	857	my $tex = $self->{texture}
821	or return;	858	or return;
822		859
823	glEnable GL_TEXTURE_2D;	860	glEnable GL_TEXTURE_2D;
824	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
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_alpha_premultiplied (0, 0, $w, $h);
828		865
829	glDisable GL_TEXTURE_2D;	866	glDisable GL_TEXTURE_2D;
830	}	867	}
…		…
846	}	883	}
847		884
848	sub size_request {	885	sub size_request {
849	my ($self) = @_;	886	my ($self) = @_;
850		887
851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852		889
853	$w = 10 if $self->{scroll_x};	890	$w = 10 if $self->{scroll_x};
854	$h = 10 if $self->{scroll_y};	891	$h = 10 if $self->{scroll_y};
855		892
856	($w, $h)	893	($w, $h)
857	}	894	}
858		895
859	sub size_allocate {	896	sub size_allocate {
860	my ($self, $w, $h, $changed) = @_;	897	my ($self, $w, $h) = @_;
861		898
		899	my $child = $self->child;
		900
862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864		903
865	$self->child->configure (0, 0, $w, $h);	904	$self->child->configure (0, 0, $w, $h);
866	$self->update;	905	$self->update;
867	}	906	}
868		907
…		…
904	}	943	}
905		944
906	sub _render {	945	sub _render {
907	my ($self) = @_;	946	my ($self) = @_;
908		947
		948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		950
909	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910		952
911	$self->SUPER::_render;	953	$self->SUPER::_render;
912	}	954	}
913		955
…		…
916	package CFClient::UI::ScrolledWindow;	958	package CFClient::UI::ScrolledWindow;
917		959
918	our @ISA = CFClient::UI::HBox::;	960	our @ISA = CFClient::UI::HBox::;
919		961
920	sub new {	962	sub new {
921	my $class = shift;	963	my ($class, %arg) = @_;
		964
		965	my $child = delete $arg{child};
922		966
923	my $self;	967	my $self;
924		968
925	my $slider = new CFClient::UI::Slider	969	my $slider = new CFClient::UI::Slider
926	vertical => 1,	970	vertical => 1,
…		…
931	;	975	;
932		976
933	$self = $class->SUPER::new (	977	$self = $class->SUPER::new (
934	vp => (new CFClient::UI::ViewPort expand => 1),	978	vp => (new CFClient::UI::ViewPort expand => 1),
935	slider => $slider,	979	slider => $slider,
936	@_,	980	%arg,
937	);	981	);
938		982
939	$self->{vp}->add ($self->{scrolled});
940	$self->add ($self->{vp});
941	$self->add ($self->{slider});	983	$self->SUPER::add ($self->{vp}, $self->{slider});
		984	$self->add ($child) if $child;
942		985
943	$self	986	$self
		987	}
		988
		989	sub add {
		990	my ($self, $widget) = @_;
		991
		992	$self->{vp}->add ($self->{child} = $widget);
944	}	993	}
945		994
946	sub update {	995	sub update {
947	my ($self) = @_;	996	my ($self) = @_;
948		997
…		…
952	my $child = $self->{vp}->child;	1001	my $child = $self->{vp}->child;
953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954	}	1003	}
955		1004
956	sub size_allocate {	1005	sub size_allocate {
957	my ($self, $w, $h, $changed) = @_;	1006	my ($self, $w, $h) = @_;
958		1007
959	$self->SUPER::size_allocate ($w, $h, $changed);	1008	$self->SUPER::size_allocate ($w, $h);
960		1009
961	my $child = $self->{vp}->child;	1010	my $child = $self->{vp}->child;
962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963	}	1012	}
964		1013
…		…
987		1036
988	if ($self->{bg}) {	1037	if ($self->{bg}) {
989	my ($w, $h) = @$self{qw(w h)};	1038	my ($w, $h) = @$self{qw(w h)};
990		1039
991	glEnable GL_BLEND;	1040	glEnable GL_BLEND;
992	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
993	glColor @{ $self->{bg} };	1042	glColor_premultiply @{ $self->{bg} };
994		1043
995	glBegin GL_QUADS;	1044	glBegin GL_QUADS;
996	glVertex 0 , 0;	1045	glVertex 0 , 0;
997	glVertex 0 , $h;	1046	glVertex 0 , $h;
998	glVertex $w, $h;	1047	glVertex $w, $h;
…		…
1020	my @border =	1069	my @border =
1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1070	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);	1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023		1072
1024	sub new {	1073	sub new {
1025	my $class = shift;	1074	my ($class, %arg) = @_;
		1075
		1076	my $title = delete $arg{title};
1026		1077
1027	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
1028	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
1029	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
1030	border => 0.6,	1081	border => 0.6,
1031	can_events => 1,	1082	can_events => 1,
1032	@_	1083	min_w => 16,
		1084	min_h => 16,
		1085	%arg,
1033	);	1086	);
1034		1087
1035	$self->{title} &&= new CFClient::UI::Label	1088	$self->{title} = new CFClient::UI::Label
1036	align => 0,	1089	align => 0,
1037	valign => 1,	1090	valign => 1,
1038	text => $self->{title},	1091	text => $title,
1039	fontsize => $self->{border};	1092	fontsize => $self->{border}
		1093	if defined $title;
1040		1094
1041	$self	1095	$self
		1096	}
		1097
		1098	sub add {
		1099	my ($self, @widgets) = @_;
		1100
		1101	$self->SUPER::add (@widgets);
		1102	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1042	}	1103	}
1043		1104
1044	sub border {	1105	sub border {
1045	int $_[0]{border} * $::FONTSIZE	1106	int $_[0]{border} * $::FONTSIZE
1046	}	1107	}
1047		1108
1048	sub size_request {	1109	sub size_request {
1049	my ($self) = @_;	1110	my ($self) = @_;
		1111
		1112	$self->{title}->size_request
		1113	if $self->{title};
1050		1114
1051	my ($w, $h) = $self->SUPER::size_request;	1115	my ($w, $h) = $self->SUPER::size_request;
1052		1116
1053	(	1117	(
1054	$w + $self->border * 2,	1118	$w + $self->border * 2,
1055	$h + $self->border * 2,	1119	$h + $self->border * 2,
1056	)	1120	)
1057	}	1121	}
1058		1122
1059	sub size_allocate {	1123	sub size_allocate {
1060	my ($self, $w, $h, $changed) = @_;	1124	my ($self, $w, $h) = @_;
1061		1125
1062	return unless $changed;	1126	if ($self->{title}) {
		1127	$self->{title}{w} = $w;
		1128	$self->{title}{h} = $h;
		1129	$self->{title}->size_allocate ($w, $h);
		1130	}
1063		1131
		1132	my $border = $self->border;
		1133
1064	$h -= List::Util::max 0, $self->border * 2;	1134	$h -= List::Util::max 0, $border * 2;
1065	$w -= List::Util::max 0, $self->border * 2;	1135	$w -= List::Util::max 0, $border * 2;
1066		1136
1067	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1068	if $self->{title};
1069
1070	$self->child->configure ($self->border, $self->border, $w, $h);	1137	$self->child->configure ($border, $border, $w, $h);
1071	}	1138	}
1072		1139
1073	sub button_down {	1140	sub button_down {
1074	my ($self, $ev, $x, $y) = @_;	1141	my ($self, $ev, $x, $y) = @_;
1075		1142
…		…
1094	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1095		1162
1096	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1097	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1098		1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1099	$self->realloc;	1167	$self->realloc;
1100	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1101	};	1168	};
1102		1169
1103	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1104	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1105	my ($bx, $by) = ($self->{x}, $self->{y});	1172	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1108	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1109		1176
1110	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1111		1178
1112	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1180	# HACK: the next line is required to enforce placement
		1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1113	};	1182	};
		1183	} else {
		1184	return 0;
		1185	}
		1186
1114	}	1187	1
1115	}	1188	}
1116		1189
1117	sub button_up {	1190	sub button_up {
1118	my ($self, $ev, $x, $y) = @_;	1191	my ($self, $ev, $x, $y) = @_;
1119		1192
1120	delete $self->{motion};	1193	!!delete $self->{motion}
1121	}	1194	}
1122		1195
1123	sub mouse_motion {	1196	sub mouse_motion {
1124	my ($self, $ev, $x, $y) = @_;	1197	my ($self, $ev, $x, $y) = @_;
1125		1198
1126	$self->{motion}->($ev, $x, $y) if $self->{motion};	1199	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1200
		1201	!!$self->{motion}
1127	}	1202	}
1128		1203
1129	sub _draw {	1204	sub _draw {
1130	my ($self) = @_;	1205	my ($self) = @_;
1131		1206
		1207	my $child = $self->{children}[0];
		1208
1132	my ($w, $h ) = ($self->{w}, $self->{h});	1209	my ($w, $h ) = ($self->{w}, $self->{h});
1133	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1210	my ($cw, $ch) = ($child->{w}, $child->{h});
1134		1211
1135	glEnable GL_TEXTURE_2D;	1212	glEnable GL_TEXTURE_2D;
1136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137		1214
1138	my $border = $self->border;	1215	my $border = $self->border;
…		…
1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1230	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154	}	1231	}
1155		1232
1156	glDisable GL_TEXTURE_2D;	1233	glDisable GL_TEXTURE_2D;
1157		1234
1158	$self->{title}->draw if $self->{title};
1159
1160	$self->child->draw;	1235	$child->draw;
		1236
		1237	if ($self->{title}) {
		1238	glTranslate 0, $border - $self->{h};
		1239	$self->{title}->_draw;
		1240	}
1161	}	1241	}
1162		1242
1163	#############################################################################	1243	#############################################################################
1164		1244
1165	package CFClient::UI::Table;	1245	package CFClient::UI::Table;
…		…
1239	(sum @$hs),	1319	(sum @$hs),
1240	)	1320	)
1241	}	1321	}
1242		1322
1243	sub size_allocate {	1323	sub size_allocate {
1244	my ($self, $w, $h, $changed) = @_;	1324	my ($self, $w, $h) = @_;
1245		1325
1246	my ($ws, $hs) = $self->get_wh;	1326	my ($ws, $hs) = $self->get_wh;
1247		1327
1248	my $req_w = (sum @$ws) || 1;	1328	my $req_w = (sum @$ws) || 1;
1249	my $req_h = (sum @$hs) || 1;	1329	my $req_h = (sum @$hs) || 1;
…		…
1327	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1328	)	1408	)
1329	}	1409	}
1330		1410
1331	sub size_allocate {	1411	sub size_allocate {
1332	my ($self, $w, $h, $changed) = @_;	1412	my ($self, $w, $h) = @_;
1333		1413
1334	my $space = $self->{vertical} ? $h : $w;	1414	my $space = $self->{vertical} ? $h : $w;
1335	my $children = $self->{children};	1415	my $children = $self->{children};
1336		1416
1337	my @req;	1417	my @req;
…		…
1420	ellipsise => 3, # end	1500	ellipsise => 3, # end
1421	layout => (new CFClient::Layout),	1501	layout => (new CFClient::Layout),
1422	fontsize => 1,	1502	fontsize => 1,
1423	align => -1,	1503	align => -1,
1424	valign => -1,	1504	valign => -1,
1425	padding => 2,	1505	padding_x => 2,
		1506	padding_y => 2,
1426	can_events => 0,	1507	can_events => 0,
1427	%arg	1508	%arg
1428	);	1509	);
1429		1510
1430	if (exists $self->{template}) {	1511	if (exists $self->{template}) {
…		…
1457		1538
1458	delete $self->{texture};	1539	delete $self->{texture};
1459	$self->SUPER::update;	1540	$self->SUPER::update;
1460	}	1541	}
1461		1542
		1543	sub realloc {
		1544	my ($self) = @_;
		1545
		1546	delete $self->{ox};
		1547	$self->SUPER::realloc;
		1548	}
		1549
1462	sub set_text {	1550	sub set_text {
1463	my ($self, $text) = @_;	1551	my ($self, $text) = @_;
1464		1552
1465	return if $self->{text} eq "T$text";	1553	return if $self->{text} eq "T$text";
1466	$self->{text} = "T$text";	1554	$self->{text} = "T$text";
1467		1555
1468	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1556	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1469	$self->{layout}->set_text ($text);	1557	$self->{layout}->set_text ($text);
		1558	delete $self->{req_h};
1470		1559
1471	$self->realloc;	1560	$self->realloc;
1472	$self->update;	1561	$self->update;
1473	}	1562	}
1474		1563
…		…
1480		1569
1481	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1570	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1482		1571
1483	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1572	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1484	$self->{layout}->set_markup ($markup);	1573	$self->{layout}->set_markup ($markup);
		1574	delete $self->{req_h};
1485		1575
1486	$self->realloc;	1576	$self->realloc;
1487	$self->update;	1577	$self->update;
1488	}	1578	}
1489		1579
1490	sub size_request {	1580	sub size_request {
1491	my ($self) = @_;	1581	my ($self) = @_;
1492		1582
		1583	if (exists $self->{req_h}) {
		1584	@$self{qw(req_w req_h)}
		1585	} else {
1493	$self->{layout}->set_font ($self->{font}) if $self->{font};	1586	$self->{layout}->set_font ($self->{font}) if $self->{font};
1494	$self->{layout}->set_width ($self->{max_w} || -1);	1587	$self->{layout}->set_width ($self->{max_w} || -1);
1495	$self->{layout}->set_ellipsise ($self->{ellipsise});	1588	$self->{layout}->set_ellipsise ($self->{ellipsise});
1496	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1589	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1590	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498		1591
1499	my ($w, $h) = $self->{layout}->size;	1592	my ($w, $h) = $self->{layout}->size;
1500		1593
1501	if (exists $self->{template}) {	1594	if (exists $self->{template}) {
1502	$self->{template}->set_font ($self->{font}) if $self->{font};	1595	$self->{template}->set_font ($self->{font}) if $self->{font};
1503	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1596	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504		1597
1505	my ($w2, $h2) = $self->{template}->size;	1598	my ($w2, $h2) = $self->{template}->size;
1506		1599
1507	$w = List::Util::max $w, $w2;	1600	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1601	$h = List::Util::max $h, $h2;
1509	}	1602	}
1510		1603
		1604	($w, $h)
1511	(	1605	}
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1606	}
1516		1607
1517	sub size_allocate {	1608	sub size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1609	my ($self, $w, $h) = @_;
		1610
		1611	delete $self->{ox};
1519		1612
1520	delete $self->{texture}	1613	delete $self->{texture}
1521	if $changed;	1614	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1615	}
1523		1616
1524	sub set_fontsize {	1617	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1618	my ($self, $fontsize) = @_;
1526		1619
…		…
1541	$self->{layout}->set_width ($self->{w});	1634	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	1635	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1636	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1637	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1638
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1639	new_from_layout CFClient::Texture $self->{layout}
		1640	};
1547		1641
		1642	unless (exists $self->{ox}) {
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1643	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1644	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550	: ($self->{w} - $tex->{w}) * 0.5);	1645	: ($self->{w} - $tex->{w}) * 0.5);
1551		1646
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1647	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1648	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554	: ($self->{h} - $tex->{h}) * 0.5);	1649	: ($self->{h} - $tex->{h}) * 0.5);
1555
1556	$tex
1557	};	1650	};
1558		1651
1559	glEnable GL_TEXTURE_2D;	1652	glEnable GL_TEXTURE_2D;
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561		1654
		1655	glColor_premultiply @{$self->{fg}}
1562	if ($tex->{format} == GL_ALPHA) {	1656	if $tex->{format} == GL_ALPHA;
1563	glColor @{$self->{fg}};	1657
1564	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1565	} else {
1566	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1658	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1567	}
1568		1659
1569	glDisable GL_TEXTURE_2D;	1660	glDisable GL_TEXTURE_2D;
1570	}	1661	}
1571		1662
1572	#############################################################################	1663	#############################################################################
…		…
1599		1690
1600	delete $self->{cur_h};	1691	delete $self->{cur_h};
1601		1692
1602	return if $self->{text} eq $text;	1693	return if $self->{text} eq $text;
1603		1694
1604	delete $self->{texture};
1605
1606	$self->{last_activity} = $::NOW;	1695	$self->{last_activity} = $::NOW;
1607	$self->{text} = $text;	1696	$self->{text} = $text;
1608		1697
1609	$text =~ s/./*/g if $self->{hidden};	1698	$text =~ s/./*/g if $self->{hidden};
1610	$self->{layout}->set_text ("$text ");	1699	$self->{layout}->set_text ("$text ");
		1700	delete $self->{req_h};
1611		1701
1612	$self->_emit (changed => $self->{text});	1702	$self->_emit (changed => $self->{text});
		1703
		1704	$self->realloc;
		1705	$self->update;
1613	}	1706	}
1614		1707
1615	sub set_text {	1708	sub set_text {
1616	my ($self, $text) = @_;	1709	my ($self, $text) = @_;
1617		1710
1618	$self->{cursor} = length $text;	1711	$self->{cursor} = length $text;
1619	$self->_set_text ($text);	1712	$self->_set_text ($text);
1620
1621	$self->realloc;
1622	}	1713	}
1623		1714
1624	sub get_text {	1715	sub get_text {
1625	$_[0]{text}	1716	$_[0]{text}
1626	}	1717	}
…		…
1656	$self->{cursor} = length $text;	1747	$self->{cursor} = length $text;
1657	} elsif ($uni == 27) {	1748	} elsif ($uni == 27) {
1658	$self->_emit ('escape');	1749	$self->_emit ('escape');
1659	} elsif ($uni) {	1750	} elsif ($uni) {
1660	substr $text, $self->{cursor}++, 0, chr $uni;	1751	substr $text, $self->{cursor}++, 0, chr $uni;
		1752	} else {
		1753	return 0;
1661	}	1754	}
1662		1755
1663	$self->_set_text ($text);	1756	$self->_set_text ($text);
1664		1757
1665	$self->realloc;	1758	$self->realloc;
		1759
		1760	1
1666	}	1761	}
1667		1762
1668	sub focus_in {	1763	sub focus_in {
1669	my ($self) = @_;	1764	my ($self) = @_;
1670		1765
…		…
1685	utf8::encode $text;	1780	utf8::encode $text;
1686	$self->{cursor} = length substr $text, 0, $idx;	1781	$self->{cursor} = length substr $text, 0, $idx;
1687		1782
1688	$self->_set_text ($self->{text});	1783	$self->_set_text ($self->{text});
1689	$self->update;	1784	$self->update;
		1785
		1786	1
1690	}	1787	}
1691		1788
1692	sub mouse_motion {	1789	sub mouse_motion {
1693	my ($self, $ev, $x, $y) = @_;	1790	my ($self, $ev, $x, $y) = @_;
1694	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1791	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1792
		1793	0
1695	}	1794	}
1696		1795
1697	sub _draw {	1796	sub _draw {
1698	my ($self) = @_;	1797	my ($self) = @_;
1699		1798
1700	local $self->{fg} = $self->{fg};	1799	local $self->{fg} = $self->{fg};
1701		1800
1702	if ($FOCUS == $self) {	1801	if ($FOCUS == $self) {
1703	glColor @{$self->{active_bg}};	1802	glColor_premultiply @{$self->{active_bg}};
1704	$self->{fg} = $self->{active_fg};	1803	$self->{fg} = $self->{active_fg};
1705	} else {	1804	} else {
1706	glColor @{$self->{bg}};	1805	glColor_premultiply @{$self->{bg}};
1707	}	1806	}
1708		1807
1709	glEnable GL_BLEND;	1808	glEnable GL_BLEND;
1710	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1809	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711	glBegin GL_QUADS;	1810	glBegin GL_QUADS;
1712	glVertex 0 , 0;	1811	glVertex 0 , 0;
1713	glVertex 0 , $self->{h};	1812	glVertex 0 , $self->{h};
1714	glVertex $self->{w}, $self->{h};	1813	glVertex $self->{w}, $self->{h};
1715	glVertex $self->{w}, 0;	1814	glVertex $self->{w}, 0;
…		…
1776	} else {	1875	} else {
1777	$self->set_text ($self->{history_saveback});	1876	$self->set_text ($self->{history_saveback});
1778	}	1877	}
1779		1878
1780	} else {	1879	} else {
1781	$self->SUPER::key_down ($ev);	1880	return $self->SUPER::key_down ($ev)
		1881	}
		1882
1782	}	1883	1
1783
1784	}	1884	}
1785		1885
1786	#############################################################################	1886	#############################################################################
1787		1887
1788	package CFClient::UI::Button;	1888	package CFClient::UI::Button;
…		…
1797		1897
1798	sub new {	1898	sub new {
1799	my $class = shift;	1899	my $class = shift;
1800		1900
1801	$class->SUPER::new (	1901	$class->SUPER::new (
1802	padding => 4,	1902	padding_x => 4,
		1903	padding_y => 4,
1803	fg => [1, 1, 1],	1904	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	1905	active_fg => [0, 0, 1],
1805	can_hover => 1,	1906	can_hover => 1,
1806	align => 0,	1907	align => 0,
1807	valign => 0,	1908	valign => 0,
…		…
1816	my ($self, $ev, $x, $y) = @_;	1917	my ($self, $ev, $x, $y) = @_;
1817		1918
1818	$self->emit ("activate")	1919	$self->emit ("activate")
1819	if $x >= 0 && $x < $self->{w}	1920	if $x >= 0 && $x < $self->{w}
1820	&& $y >= 0 && $y < $self->{h};	1921	&& $y >= 0 && $y < $self->{h};
		1922
		1923	1
1821	}	1924	}
1822		1925
1823	sub _draw {	1926	sub _draw {
1824	my ($self) = @_;	1927	my ($self) = @_;
1825		1928
1826	local $self->{fg} = $self->{fg};	1929	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828	if ($GRAB == $self) {
1829	$self->{fg} = $self->{active_fg};
1830	}
1831		1930
1832	glEnable GL_TEXTURE_2D;	1931	glEnable GL_TEXTURE_2D;
1833	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834	glColor 0, 0, 0, 1;	1933	glColor 0, 0, 0, 1;
1835		1934
…		…
1854		1953
1855	sub new {	1954	sub new {
1856	my $class = shift;	1955	my $class = shift;
1857		1956
1858	$class->SUPER::new (	1957	$class->SUPER::new (
1859	padding => 2,	1958	padding_x => 2,
		1959	padding_y => 2,
1860	fg => [1, 1, 1],	1960	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	1961	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	1962	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	1963	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	1964	state => 0,
…		…
1868	}	1968	}
1869		1969
1870	sub size_request {	1970	sub size_request {
1871	my ($self) = @_;	1971	my ($self) = @_;
1872		1972
1873	($self->{padding} * 2 + 6) x 2	1973	(6) x 2
1874	}	1974	}
1875		1975
1876	sub button_down {	1976	sub button_down {
1877	my ($self, $ev, $x, $y) = @_;	1977	my ($self, $ev, $x, $y) = @_;
1878		1978
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1979	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1980	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	1981	$self->{state} = !$self->{state};
1882	$self->_emit (changed => $self->{state});	1982	$self->_emit (changed => $self->{state});
		1983	} else {
		1984	return 0
		1985	}
		1986
1883	}	1987	1
1884	}	1988	}
1885		1989
1886	sub _draw {	1990	sub _draw {
1887	my ($self) = @_;	1991	my ($self) = @_;
1888		1992
1889	$self->SUPER::_draw;	1993	$self->SUPER::_draw;
1890		1994
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1995	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		1996
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1997	my ($w, $h) = @$self{qw(w h)};
		1998
		1999	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		2000
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2001	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		2002
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	2003	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		2004
…		…
2053		2159
2054	my $h1 = $self->{h} * (1 - $ycut1);	2160	my $h1 = $self->{h} * (1 - $ycut1);
2055	my $h2 = $self->{h} * (1 - $ycut2);	2161	my $h2 = $self->{h} * (1 - $ycut2);
2056		2162
2057	glEnable GL_BLEND;	2163	glEnable GL_BLEND;
2058	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2164	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2165	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059	glEnable GL_TEXTURE_2D;	2166	glEnable GL_TEXTURE_2D;
2060	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061		2168
2062	glBindTexture GL_TEXTURE_2D, $t1->{name};	2169	glBindTexture GL_TEXTURE_2D, $t1->{name};
2063	glBegin GL_QUADS;	2170	glBegin GL_QUADS;
…		…
2224		2331
2225	$self->SUPER::button_down ($ev, $x, $y);	2332	$self->SUPER::button_down ($ev, $x, $y);
2226		2333
2227	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2334	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228		2335
2229	$self->mouse_motion ($ev, $x, $y);	2336	$self->mouse_motion ($ev, $x, $y)
2230	}	2337	}
2231		2338
2232	sub mouse_motion {	2339	sub mouse_motion {
2233	my ($self, $ev, $x, $y) = @_;	2340	my ($self, $ev, $x, $y) = @_;
2234		2341
…		…
2238	my (undef, $lo, $hi, $page) = @{$self->{range}};	2345	my (undef, $lo, $hi, $page) = @{$self->{range}};
2239		2346
2240	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2347	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2241		2348
2242	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2349	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2350	} else {
		2351	return 0;
		2352	}
		2353
2243	}	2354	1
2244	}	2355	}
2245		2356
2246	sub update {	2357	sub update {
2247	my ($self) = @_;	2358	my ($self) = @_;
2248		2359
2249	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2360	delete $self->{knob_w};
		2361	$self->SUPER::update;
		2362	}
		2363
		2364	sub _draw {
		2365	my ($self) = @_;
		2366
		2367	unless ($self->{knob_w}) {
2250	$self->set_value ($self->{range}[0]);	2368	$self->set_value ($self->{range}[0]);
2251		2369
2252	my ($value, $lo, $hi, $page) = @{$self->{range}};	2370	my ($value, $lo, $hi, $page) = @{$self->{range}};
2253	my $range = ($hi - $page - $lo) || 1e-100;	2371	my $range = ($hi - $page - $lo) || 1e-100;
2254		2372
…		…
2260	$value = ($value - $lo) / $range;	2378	$value = ($value - $lo) / $range;
2261	$value = $value * $self->{scale} + $self->{offset};	2379	$value = $value * $self->{scale} + $self->{offset};
2262		2380
2263	$self->{knob_x} = $value - $knob_w * 0.5;	2381	$self->{knob_x} = $value - $knob_w * 0.5;
2264	$self->{knob_w} = $knob_w;	2382	$self->{knob_w} = $knob_w;
2265	});	2383	}
2266
2267	$self->SUPER::update;
2268	}
2269
2270	sub _draw {
2271	my ($self) = @_;
2272		2384
2273	$self->SUPER::_draw ();	2385	$self->SUPER::_draw ();
2274		2386
2275	glScale $self->{w}, $self->{h};	2387	glScale $self->{w}, $self->{h};
2276		2388
…		…
2374	$self->{fontsize} = $fontsize;	2486	$self->{fontsize} = $fontsize;
2375	$self->reflow;	2487	$self->reflow;
2376	}	2488	}
2377		2489
2378	sub size_allocate {	2490	sub size_allocate {
2379	my ($self, $w, $h, $changed) = @_;	2491	my ($self, $w, $h) = @_;
2380		2492
2381	$self->SUPER::size_allocate ($w, $h, $changed);	2493	$self->SUPER::size_allocate ($w, $h);
2382
2383	return unless $changed;
2384		2494
2385	$self->{layout}->set_font ($self->{font}) if $self->{font};	2495	$self->{layout}->set_font ($self->{font}) if $self->{font};
2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387	$self->{layout}->set_width ($self->{children}[0]{w});	2497	$self->{layout}->set_width ($self->{children}[0]{w});
2388		2498
…		…
2472		2582
2473	delete $self->{texture};	2583	delete $self->{texture};
2474	}	2584	}
2475		2585
2476	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2586	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477	glClearColor 0.5, 0.5, 0.5, 0;	2587	glClearColor 0, 0, 0, 0;
2478	glClear GL_COLOR_BUFFER_BIT;	2588	glClear GL_COLOR_BUFFER_BIT;
2479		2589
2480	my $top = int $self->{children}[1]{range}[0];	2590	my $top = int $self->{children}[1]{range}[0];
2481		2591
2482	my $y0 = $top;	2592	my $y0 = $top;
…		…
2517	sub _draw {	2627	sub _draw {
2518	my ($self) = @_;	2628	my ($self) = @_;
2519		2629
2520	glEnable GL_TEXTURE_2D;	2630	glEnable GL_TEXTURE_2D;
2521	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2631	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522	glColor 1, 1, 1, 1;	2632	glColor 0, 0, 0, 1;
2523	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2633	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524	glDisable GL_TEXTURE_2D;	2634	glDisable GL_TEXTURE_2D;
2525		2635
2526	$self->{children}[1]->draw;	2636	$self->{children}[1]->draw;
2527		2637
2528	}	2638	}
…		…
2611	}	2721	}
2612		2722
2613	sub set_tooltip_from {	2723	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	2724	my ($self, $widget) = @_;
2615		2725
		2726	my $tooltip = $widget->{tooltip};
		2727
		2728	if ($ENV{CFPLUS_DEBUG} & 2) {
		2729	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2730	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2731	. "req $widget->{req_w} $widget->{req_h}\n"
		2732	. "visible $widget->{visible}";
		2733	}
		2734
2616	$self->add (new CFClient::UI::Label	2735	$self->add (new CFClient::UI::Label
2617	markup => $widget->{tooltip},	2736	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2737	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619	fontsize => 0.8,	2738	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	2739	fg => [0, 0, 0, 1],
2621	ellipsise => 0,	2740	ellipsise => 0,
2622	font => ($widget->{tooltip_font} || $::FONT_PROP),	2741	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2630		2749
2631	($w + 4, $h + 4)	2750	($w + 4, $h + 4)
2632	}	2751	}
2633		2752
2634	sub size_allocate {	2753	sub size_allocate {
2635	my ($self, $w, $h, $changed) = @_;	2754	my ($self, $w, $h) = @_;
2636		2755
2637	return unless $changed;
2638
2639	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2756	$self->SUPER::size_allocate ($w - 4, $h - 4);
2640	}	2757	}
2641		2758
2642	sub visibility_change {	2759	sub visibility_change {
2643	my ($self, $visible) = @_;	2760	my ($self, $visible) = @_;
2644		2761
…		…
2748	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2865	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2749		2866
2750	if ($tex) {	2867	if ($tex) {
2751	glEnable GL_TEXTURE_2D;	2868	glEnable GL_TEXTURE_2D;
2752	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2869	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2753	glColor 1, 1, 1, 1;	2870	glColor 0, 0, 0, 1;
2754	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2871	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2755	glDisable GL_TEXTURE_2D;	2872	glDisable GL_TEXTURE_2D;
2756	}	2873	}
2757	}	2874	}
2758		2875
…		…
2765	$self->SUPER::DESTROY;	2882	$self->SUPER::DESTROY;
2766	}	2883	}
2767		2884
2768	#############################################################################	2885	#############################################################################
2769		2886
2770	package CFClient::UI::Inventory;	2887	package CFClient::UI::Buttonbar;
2771		2888
2772	our @ISA = CFClient::UI::ScrolledWindow::;	2889	our @ISA = CFClient::UI::HBox::;
2773		2890
2774	sub new {	2891	# TODO: should actualyl wrap buttons and other goodies.
2775	my $class = shift;
2776
2777	my $self = $class->SUPER::new (
2778	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779	@_,
2780	);
2781
2782	$self
2783	}
2784
2785	sub set_items {
2786	my ($self, $items) = @_;
2787
2788	$self->{scrolled}->clear;
2789	return unless $items;
2790
2791	my @items = sort {
2792	($a->{type} <=> $b->{type})
2793	or ($a->{name} cmp $b->{name})
2794	} @$items;
2795
2796	$self->{real_items} = \@items;
2797
2798	my $row = 0;
2799	for my $item (@items) {
2800	CFClient::Item::update_widgets $item;
2801
2802	$self->{scrolled}->add (0, $row, $item->{face_widget});
2803	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2804	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2805
2806	$row++;
2807	}
2808	}
2809		2892
2810	#############################################################################	2893	#############################################################################
2811		2894
2812	package CFClient::UI::Menu;	2895	package CFClient::UI::Menu;
2813		2896
…		…
2854	# maybe save $GRAB? must be careful about events...	2937	# maybe save $GRAB? must be careful about events...
2855	$GRAB = $self;	2938	$GRAB = $self;
2856	$self->{button} = $ev->{button};	2939	$self->{button} = $ev->{button};
2857		2940
2858	$self->show;	2941	$self->show;
2859	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2942	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860	}	2943	}
2861		2944
2862	sub mouse_motion {	2945	sub mouse_motion {
2863	my ($self, $ev, $x, $y) = @_;	2946	my ($self, $ev, $x, $y) = @_;
2864		2947
2865	# TODO: should use vbox->find_widget or so	2948	# TODO: should use vbox->find_widget or so
2866	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2949	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867	$self->{hover} = $self->{item}{$HOVER};	2950	$self->{hover} = $self->{item}{$HOVER};
		2951
		2952	0
2868	}	2953	}
2869		2954
2870	sub button_up {	2955	sub button_up {
2871	my ($self, $ev, $x, $y) = @_;	2956	my ($self, $ev, $x, $y) = @_;
2872		2957
…		…
2874	undef $GRAB;	2959	undef $GRAB;
2875	$self->hide;	2960	$self->hide;
2876		2961
2877	$self->_emit ("popdown");	2962	$self->_emit ("popdown");
2878	$self->{hover}[1]->() if $self->{hover};	2963	$self->{hover}[1]->() if $self->{hover};
		2964	} else {
		2965	return 0
		2966	}
		2967
2879	}	2968	1
2880	}	2969	}
2881		2970
2882	#############################################################################	2971	#############################################################################
2883		2972
2884	package CFClient::UI::Statusbox;	2973	package CFClient::UI::Multiplexer;
2885		2974
2886	our @ISA = CFClient::UI::VBox::;	2975	our @ISA = CFClient::UI::Container::;
2887		2976
2888	sub new {	2977	sub new {
2889	my $class = shift;	2978	my $class = shift;
2890		2979
2891	$class->SUPER::new (	2980	my $self = $class->SUPER::new (
		2981	@_,
		2982	);
		2983
		2984	$self->{current} = $self->{children}[0]
		2985	if @{ $self->{children} };
		2986
		2987	$self
		2988	}
		2989
		2990	sub add {
		2991	my ($self, @widgets) = @_;
		2992
		2993	$self->SUPER::add (@widgets);
		2994
		2995	$self->{current} = $self->{children}[0]
		2996	if @{ $self->{children} };
		2997	}
		2998
		2999	sub set_current_page {
		3000	my ($self, $page_or_widget) = @_;
		3001
		3002	my $widget = ref $page_or_widget
		3003	? $page_or_widget
		3004	: $self->{children}[$page_or_widget];
		3005
		3006	$self->{current} = $widget;
		3007	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3008
		3009	$self->_emit (page_changed => $self->{current});
		3010
		3011	$self->realloc;
		3012	}
		3013
		3014	sub visible_children {
		3015	$_[0]{current}
		3016	}
		3017
		3018	sub size_request {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->size_request
		3022	}
		3023
		3024	sub size_allocate {
		3025	my ($self, $w, $h) = @_;
		3026
		3027	$self->{current}->configure (0, 0, $w, $h);
		3028	}
		3029
		3030	sub _draw {
		3031	my ($self) = @_;
		3032
		3033	$self->{current}->draw;
		3034	}
		3035
		3036	#############################################################################
		3037
		3038	package CFClient::UI::Notebook;
		3039
		3040	our @ISA = CFClient::UI::VBox::;
		3041
		3042	sub new {
		3043	my $class = shift;
		3044
		3045	my $self = $class->SUPER::new (
		3046	buttonbar => (new CFClient::UI::Buttonbar),
		3047	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3048	# filter => # will be put between multiplexer and $self
		3049	@_,
		3050	);
		3051
		3052	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3053	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3054
		3055	$self
		3056	}
		3057
		3058	sub add {
		3059	my ($self, $title, $widget, $tooltip) = @_;
		3060
		3061	Scalar::Util::weaken $self;
		3062
		3063	$self->{buttonbar}->add (new CFClient::UI::Button
		3064	markup => $title,
		3065	tooltip => $tooltip,
		3066	on_activate => sub { $self->set_current_page ($widget) },
		3067	);
		3068
		3069	$self->{multiplexer}->add ($widget);
		3070	}
		3071
		3072	sub set_current_page {
		3073	my ($self, $page) = @_;
		3074
		3075	$self->{multiplexer}->set_current_page ($page);
		3076	$self->_emit (page_changed => $self->{multiplexer}{current});
		3077	}
		3078
		3079	#############################################################################
		3080
		3081	package CFClient::UI::Statusbox;
		3082
		3083	our @ISA = CFClient::UI::VBox::;
		3084
		3085	sub new {
		3086	my $class = shift;
		3087
		3088	my $self = $class->SUPER::new (
2892	fontsize => 0.8,	3089	fontsize => 0.8,
2893	@_,	3090	@_,
2894	)	3091	);
		3092
		3093	Scalar::Util::weaken (my $this = $self);
		3094
		3095	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3096
		3097	$self
2895	}	3098	}
2896		3099
2897	sub reorder {	3100	sub reorder {
2898	my ($self) = @_;	3101	my ($self) = @_;
2899	my $NOW = time;	3102	my $NOW = Time::HiRes::time;
		3103
		3104	# freeze display when hovering over any label
		3105	return if $CFClient::UI::TOOLTIP->{owner}
		3106	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3107	values %{ $self->{item} };
2900		3108
2901	while (my ($k, $v) = each %{ $self->{item} }) {	3109	while (my ($k, $v) = each %{ $self->{item} }) {
2902	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3110	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2903	}	3111	}
2904		3112
…		…
2907	my @items = sort {	3115	my @items = sort {
2908	$a->{pri} <=> $b->{pri}	3116	$a->{pri} <=> $b->{pri}
2909	or $b->{id} <=> $a->{id}	3117	or $b->{id} <=> $a->{id}
2910	} values %{ $self->{item} };	3118	} values %{ $self->{item} };
2911		3119
		3120	$self->{timer}->interval (1);
		3121
2912	my $count = 10 + 1;	3122	my $count = 10 + 1;
2913	for my $item (@items) {	3123	for my $item (@items) {
2914	last unless --$count;	3124	last unless --$count;
2915		3125
2916	push @widgets, $item->{label} ||= do {	3126	my $label = $item->{label} ||= do {
2917	# TODO: doesn't handle markup well (read as: at all)	3127	# TODO: doesn't handle markup well (read as: at all)
2918	my $short = $item->{count} > 1	3128	my $short = $item->{count} > 1
2919	? "<b>$item->{count} ×</b> $item->{text}"	3129	? "<b>$item->{count} ×</b> $item->{text}"
2920	: $item->{text};	3130	: $item->{text};
2921		3131
…		…
2929	tooltip => $item->{tooltip},	3139	tooltip => $item->{tooltip},
2930	tooltip_font => $::FONT_PROP,	3140	tooltip_font => $::FONT_PROP,
2931	tooltip_width => 0.67,	3141	tooltip_width => 0.67,
2932	fontsize => $item->{fontsize} || $self->{fontsize},	3142	fontsize => $item->{fontsize} || $self->{fontsize},
2933	max_w => $::WIDTH * 0.44,	3143	max_w => $::WIDTH * 0.44,
2934	fg => $item->{fg},	3144	fg => [@{ $item->{fg} }],
2935	can_events => 1,	3145	can_events => 1,
2936	can_hover => 1	3146	can_hover => 1
2937	};	3147	};
		3148
		3149	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3150	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3151	$label->update;
		3152	$label->set_max_size (undef, $label->{req_h} * $diff)
		3153	if $diff < 1;
		3154	$self->{timer}->interval (1/30);
		3155	} else {
		3156	$label->{fg}[3] = $item->{fg}[3] || 1;
		3157	}
		3158
		3159	push @widgets, $label;
2938	}	3160	}
2939		3161
2940	$self->clear;	3162	$self->clear;
2941	$self->SUPER::add (reverse @widgets);	3163	$self->SUPER::add (reverse @widgets);
2942	}	3164	}
…		…
2947	$text =~ s/^\s+//;	3169	$text =~ s/^\s+//;
2948	$text =~ s/\s+$//;	3170	$text =~ s/\s+$//;
2949		3171
2950	return unless $text;	3172	return unless $text;
2951		3173
2952	my $timeout = time + ((delete $arg{timeout}) || 60);	3174	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2953		3175
2954	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3176	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2955		3177
2956	if (my $item = $self->{item}{$group}) {	3178	if (my $item = $self->{item}{$group}) {
2957	if ($item->{text} eq $text) {	3179	if ($item->{text} eq $text) {
…		…
2987		3209
2988	$self->reorder;	3210	$self->reorder;
2989	$self->SUPER::reconfigure;	3211	$self->SUPER::reconfigure;
2990	}	3212	}
2991		3213
		3214	sub DESTROY {
		3215	my ($self) = @_;
		3216
		3217	$self->{timer}->cancel;
		3218
		3219	$self->SUPER::DESTROY;
		3220	}
		3221
2992	#############################################################################	3222	#############################################################################
2993		3223
		3224	package CFClient::UI::Inventory;
		3225
		3226	our @ISA = CFClient::UI::ScrolledWindow::;
		3227
		3228	sub new {
		3229	my $class = shift;
		3230
		3231	my $self = $class->SUPER::new (
		3232	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3233	@_,
		3234	);
		3235
		3236	$self
		3237	}
		3238
		3239	sub set_items {
		3240	my ($self, $items) = @_;
		3241
		3242	$self->{child}->clear;
		3243	return unless $items;
		3244
		3245	my @items = sort {
		3246	($a->{type} <=> $b->{type})
		3247	or ($a->{name} cmp $b->{name})
		3248	} @$items;
		3249
		3250	$self->{real_items} = \@items;
		3251
		3252	my $row = 0;
		3253	for my $item (@items) {
		3254	CFClient::Item::update_widgets $item;
		3255
		3256	$self->{child}->add (0, $row, $item->{face_widget});
		3257	$self->{child}->add (1, $row, $item->{desc_widget});
		3258	$self->{child}->add (2, $row, $item->{weight_widget});
		3259
		3260	$row++;
		3261	}
		3262	}
		3263
		3264	#############################################################################
		3265
		3266	package CFClient::UI::BindEditor;
		3267
		3268	our @ISA = CFClient::UI::FancyFrame::;
		3269
		3270	sub new {
		3271	my $class = shift;
		3272
		3273	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3274
		3275	$self->add (my $vb = new CFClient::UI::VBox);
		3276
		3277
		3278	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3279	text => "start recording",
		3280	tooltip => "Start/Stops recording of actions."
		3281	."All subsequent actions after the recording started will be captured."
		3282	."The actions are displayed after the record was stopped."
		3283	."To bind the action you have to click on the 'Bind' button",
		3284	on_activate => sub {
		3285	unless ($self->{recording}) {
		3286	$self->start;
		3287	} else {
		3288	$self->stop;
		3289	}
		3290	});
		3291
		3292	$vb->add (new CFClient::UI::Label text => "Actions:");
		3293	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3294
		3295	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3296	$vb->add (my $hb = new CFClient::UI::HBox);
		3297	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3298	$hb->add (new CFClient::UI::Button
		3299	text => "bind",
		3300	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3301	on_activate => sub {
		3302	$self->ask_for_bind;
		3303	});
		3304
		3305	$vb->add (my $hb = new CFClient::UI::HBox);
		3306	$hb->add (new CFClient::UI::Button
		3307	text => "ok",
		3308	expand => 1,
		3309	tooltip => "This closes the binding editor and saves the binding",
		3310	on_activate => sub {
		3311	$self->hide;
		3312	$self->commit;
		3313	});
		3314
		3315	$hb->add (new CFClient::UI::Button
		3316	text => "cancel",
		3317	expand => 1,
		3318	tooltip => "This closes the binding editor without saving",
		3319	on_activate => sub {
		3320	$self->hide;
		3321	$self->{binding_cancel}->()
		3322	if $self->{binding_cancel};
		3323	});
		3324
		3325	$self->update_binding_widgets;
		3326
		3327	$self
		3328	}
		3329
		3330	sub commit {
		3331	my ($self) = @_;
		3332	my ($mod, $sym, $cmds) = $self->get_binding;
		3333	if ($sym != 0 && @$cmds > 0) {
		3334	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3335	."'. Don't forget 'Save Config'!");
		3336	$self->{binding_change}->($mod, $sym, $cmds)
		3337	if $self->{binding_change};
		3338	} else {
		3339	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3340	$self->{binding_cancel}->()
		3341	if $self->{binding_cancel};
		3342	}
		3343	}
		3344
		3345	sub start {
		3346	my ($self) = @_;
		3347
		3348	$self->{rec_btn}->set_text ("stop recording");
		3349	$self->{recording} = 1;
		3350	$self->clear_command_list;
		3351	$::CONN->start_record if $::CONN;
		3352	}
		3353
		3354	sub stop {
		3355	my ($self) = @_;
		3356
		3357	$self->{rec_btn}->set_text ("start recording");
		3358	$self->{recording} = 0;
		3359
		3360	my $rec;
		3361	$rec = $::CONN->stop_record if $::CONN;
		3362	return unless ref $rec eq 'ARRAY';
		3363	$self->set_command_list ($rec);
		3364	}
		3365
		3366
		3367	sub ask_for_bind_and_commit {
		3368	my ($self) = @_;
		3369	$self->ask_for_bind (1);
		3370	}
		3371
		3372	sub ask_for_bind {
		3373	my ($self, $commit) = @_;
		3374
		3375	CFClient::Binder::open_binding_dialog (sub {
		3376	my ($mod, $sym) = @_;
		3377	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3378	$self->update_binding_widgets;
		3379	$self->commit if $commit;
		3380	});
		3381	}
		3382
		3383	# $mod and $sym are the modifiers and key symbol
		3384	# $cmds is a array ref of strings (the commands)
		3385	# $cb is the callback that is executed on OK
		3386	# $ccb is the callback that is executed on CANCEL and
		3387	# when the binding was unsuccessful on OK
		3388	sub set_binding {
		3389	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3390
		3391	$self->clear_command_list;
		3392	$self->{recording} = 0;
		3393	$self->{rec_btn}->set_text ("start recording");
		3394
		3395	$self->{binding} = [$mod, $sym];
		3396	$self->{commands} = $cmds;
		3397
		3398	$self->{binding_change} = $cb;
		3399	$self->{binding_cancel} = $ccb;
		3400
		3401	$self->update_binding_widgets;
		3402	}
		3403
		3404	# this is a shortcut method that asks for a binding
		3405	# and then just binds it.
		3406	sub do_quick_binding {
		3407	my ($self, $cmds) = @_;
		3408	$self->set_binding (undef, undef, $cmds, sub {
		3409	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3410	});
		3411	$self->ask_for_bind (1);
		3412	}
		3413
		3414	sub update_binding_widgets {
		3415	my ($self) = @_;
		3416	my ($mod, $sym, $cmds) = $self->get_binding;
		3417	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3418	$self->set_command_list ($cmds);
		3419	}
		3420
		3421	sub get_binding {
		3422	my ($self) = @_;
		3423	return (
		3424	$self->{binding}->[0],
		3425	$self->{binding}->[1],
		3426	[ grep { defined $_ } @{$self->{commands}} ]
		3427	);
		3428	}
		3429
		3430	sub clear_command_list {
		3431	my ($self) = @_;
		3432	$self->{cmdbox}->clear ();
		3433	}
		3434
		3435	sub set_command_list {
		3436	my ($self, $cmds) = @_;
		3437
		3438	$self->{cmdbox}->clear ();
		3439	$self->{commands} = $cmds;
		3440
		3441	my $idx = 0;
		3442
		3443	for (@$cmds) {
		3444	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3445
		3446	my $i = $idx;
		3447	$hb->add (new CFClient::UI::Label text => $_);
		3448	$hb->add (new CFClient::UI::Button
		3449	text => "delete",
		3450	tooltip => "Deletes the action from the record",
		3451	on_activate => sub {
		3452	$self->{cmdbox}->remove ($hb);
		3453	$cmds->[$i] = undef;
		3454	});
		3455
		3456
		3457	$idx++
		3458	}
		3459	}
		3460
		3461	#############################################################################
		3462
		3463	package CFClient::UI::SpellList;
		3464
		3465	our @ISA = CFClient::UI::Table::;
		3466
		3467	sub new {
		3468	my $class = shift;
		3469
		3470	my $self = $class->SUPER::new (
		3471	binding => [],
		3472	commands => [],
		3473	@_,
		3474	)
		3475	}
		3476
		3477	# XXX: Do sorting? Argl...
		3478	sub add_spell {
		3479	my ($self, $spell) = @_;
		3480	$self->{spells}->{$spell->{name}} = $spell;
		3481
		3482	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3483	face => $spell->{face},
		3484	can_hover => 1,
		3485	can_events => 1,
		3486	tooltip => $spell->{message});
		3487
		3488	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3489	text => $spell->{name},
		3490	can_hover => 1,
		3491	can_events => 1,
		3492	tooltip => $spell->{message},
		3493	expand => 1);
		3494
		3495	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3496	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3497	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3498	expand => 1);
		3499
		3500	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3501	text => "bind to key",
		3502	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3503	}
		3504
		3505	sub rebuild_spell_list {
		3506	my ($self) = @_;
		3507	$self->{tbl_idx} = 0;
		3508	$self->add_spell ($_) for values %{$self->{spells}};
		3509	}
		3510
		3511	sub remove_spell {
		3512	my ($self, $spell) = @_;
		3513	delete $self->{spells}->{$spell->{name}};
		3514	$self->rebuild_spell_list;
		3515	}
		3516
		3517	#############################################################################
		3518
2994	package CFClient::UI::Root;	3519	package CFClient::UI::Root;
2995		3520
2996	our @ISA = CFClient::UI::Container::;	3521	our @ISA = CFClient::UI::Container::;
		3522
		3523	use List::Util qw(min max);
2997		3524
2998	use CFClient::OpenGL;	3525	use CFClient::OpenGL;
2999		3526
3000	sub new {	3527	sub new {
3001	my $class = shift;	3528	my $class = shift;
…		…
3008	Scalar::Util::weaken ($self->{root} = $self);	3535	Scalar::Util::weaken ($self->{root} = $self);
3009		3536
3010	$self	3537	$self
3011	}	3538	}
3012		3539
3013	sub configure {
3014	my ($self, $x, $y, $w, $h) = @_;
3015
3016	$self->{w} = $w;
3017	$self->{h} = $h;
3018	}
3019
3020	sub reconfigure {
3021	my ($self) = @_;
3022
3023	$self->SUPER::reconfigure;
3024
3025	$self->size_allocate ($self->{w}, $self->{h}, 1)
3026	if $self->{w};
3027	}
3028
3029	sub size_request {	3540	sub size_request {
3030	my ($self) = @_;	3541	my ($self) = @_;
3031		3542
3032	($self->{w}, $self->{h})	3543	($self->{w}, $self->{h})
3033	}	3544	}
…		…
3045		3556
3046	int $coord + 0.5	3557	int $coord + 0.5
3047	}	3558	}
3048		3559
3049	sub size_allocate {	3560	sub size_allocate {
3050	my ($self, $w, $h, $changed) = @_;	3561	my ($self, $w, $h) = @_;
3051		3562
3052	for my $child ($self->children) {	3563	for my $child ($self->children) {
3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3564	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054		3565
3055	$X = $child->{force_x} if exists $child->{force_x};	3566	$X = $child->{force_x} if exists $child->{force_x};
…		…
3123	$_->()	3634	$_->()
3124	for values %{delete $self->{refresh_hook}};	3635	for values %{delete $self->{refresh_hook}};
3125	}	3636	}
3126		3637
3127	if ($self->{realloc}) {	3638	if ($self->{realloc}) {
		3639	my %queue;
3128	my @queue;	3640	my @queue;
		3641	my $widget;
3129		3642
		3643	outer:
3130	while () {	3644	while () {
3131	if ($self->{realloc}) {	3645	if (my $realloc = delete $self->{realloc}) {
3132	#TODO use array-of-depth approach	3646	for $widget (values %$realloc) {
		3647	$widget->{visible} or next; # do not resize invisible widgets
3133		3648
3134	@queue = sort { $a->{visible} <=> $b->{visible} }	3649	$queue{$widget+0}++ and next; # duplicates are common
3135	@queue, values %{delete $self->{realloc}};	3650
		3651	push @{ $queue[$widget->{visible}] }, $widget;
		3652	}
3136	}	3653	}
3137		3654
		3655	while () {
		3656	@queue or last outer;
		3657
3138	my $widget = pop @queue || last;	3658	$widget = pop @{ $queue[-1] || [] }
		3659	and last;
		3660
		3661	pop @queue;
		3662	}
3139		3663
3140	$widget->{visible} or last; # do not resize invisible widgets	3664	delete $queue{$widget+0};
3141		3665
3142	my ($w, $h) = $widget->size_request;	3666	my ($w, $h) = $widget->size_request;
3143		3667
3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;	3668	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3669	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3145		3670
3146	$w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;	3671	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3147	$h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h;	3672	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3148		3673
3149	$w = $widget->{force_w} if exists $widget->{force_w};	3674	$w = $widget->{force_w} if exists $widget->{force_w};
3150	$h = $widget->{force_h} if exists $widget->{force_h};	3675	$h = $widget->{force_h} if exists $widget->{force_h};
3151		3676
		3677	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3678	|| delete $widget->{force_realloc}) {
3152	$widget->{req_w} = $w;	3679	$widget->{req_w} = $w;
3153	$widget->{req_h} = $h;	3680	$widget->{req_h} = $h;
3154		3681
3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3682	$self->{size_alloc}{$widget+0} = $widget;
3156		3683
3157	push @queue, $widget->{parent}	3684	if (my $parent = $widget->{parent}) {
3158	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	3685	$self->{realloc}{$parent+0} = $parent
		3686	unless $queue{$parent+0};
		3687
		3688	$parent->{force_size_alloc} = 1;
		3689	$self->{size_alloc}{$parent+0} = $parent;
		3690	}
		3691	}
		3692
		3693	delete $self->{realloc}{$widget+0};
3159	}	3694	}
3160	}	3695	}
3161		3696
3162	while (my $size_alloc = delete $self->{size_alloc}) {	3697	while (my $size_alloc = delete $self->{size_alloc}) {
3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3698	my @queue = sort { $b->{visible} <=> $a->{visible} }
3164	values %$size_alloc;	3699	values %$size_alloc;
3165		3700
3166	while () {	3701	while () {
3167	my ($widget, $w, $h) = @{ pop @queue or last };	3702	my $widget = pop @queue || last;
3168		3703
3169	$w = $widget->{w} || $widget->{req_w} unless defined $w;	3704	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3171		3705
3172	$w = 0 if $w < 0;	3706	$w = 0 if $w < 0;
3173	$h = 0 if $h < 0;	3707	$h = 0 if $h < 0;
3174		3708
3175	$w = int $w + 0.5;	3709	$w = int $w + 0.5;
3176	$h = int $h + 0.5;	3710	$h = int $h + 0.5;
3177		3711
3178	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3712	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3713	$widget->{old_w} = $widget->{w};
		3714	$widget->{old_h} = $widget->{h};
3179		3715
3180	$widget->{w} = $w;	3716	$widget->{w} = $w;
3181	$widget->{h} = $h;	3717	$widget->{h} = $h;
3182		3718
3183	$widget->emit (size_allocate => $w, $h, $changed);	3719	$widget->emit (size_allocate => $w, $h);
		3720	}
3184	}	3721	}
3185	}	3722	}
3186		3723
3187	while ($self->{post_alloc_hook}) {	3724	while ($self->{post_alloc_hook}) {
3188	$_->()	3725	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3726	for values %{delete $self->{post_alloc_hook}};
3190	}	3727	}
		3728
3191		3729
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3730	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3731	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3732	glClear GL_COLOR_BUFFER_BIT;
3195		3733
…		…
3197	glLoadIdentity;	3735	glLoadIdentity;
3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3736	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199	glMatrixMode GL_MODELVIEW;	3737	glMatrixMode GL_MODELVIEW;
3200	glLoadIdentity;	3738	glLoadIdentity;
3201		3739
		3740	{
		3741	package CFClient::UI::Base;
		3742
		3743	($draw_x, $draw_y, $draw_w, $draw_h) =
		3744	(0, 0, $self->{w}, $self->{h});
		3745	}
		3746
3202	$self->_draw;	3747	$self->_draw;
3203	}	3748	}
3204		3749
3205	#############################################################################	3750	#############################################################################
3206		3751

Diff Legend

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