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.358 by root, Fri Dec 8 14:59:54 2006 UTC vs.
Revision 1.418 by elmex, Tue Jul 24 18:39:39 2007 UTC

1	package CFPlus::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFPlus;	9	use CFPlus;
11	use CFPlus::Pod;	10	use CFPlus::Pod;
…		…
23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24	if (!$GRAB) {	23	if (!$GRAB) {
25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
27	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28	$TOOLTIP->hide;	28	$TOOLTIP->hide;
29		29
30	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31		32
32	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
33		34
34	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
35		36
…		…
43	}	44	}
44	}	45	}
45	}	46	}
46		47
47	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
49	});	51	});
50		52
51	sub get_layout {	53	sub get_layout {
52	my $layout;	54	my $layout;
…		…
111	}	113	}
112		114
113	if ($GRAB) {	115	if ($GRAB) {
114	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
115	# mousewheel	117	# mousewheel
116	$ev->{dx} = 0;
117	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
118	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
119	} else {	125	} else {
120	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
121	}	127	}
122	}	128	}
…		…
235	h => undef,	241	h => undef,
236	can_events => 1,	242	can_events => 1,
237	@_	243	@_
238	}, $class;	244	}, $class;
239		245
240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241		247
242	for (keys %$self) {	248	for (keys %$self) {
243	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
244	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
245	}	251	}
…		…
262		268
263	sub destroy {	269	sub destroy {
264	my ($self) = @_;	270	my ($self) = @_;
265		271
266	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
267	%$self = ();	274	%$self = ();
		275	}
		276
		277	sub TO_JSON {
		278	{ __w_ => $_[0]{s_id} }
268	}	279	}
269		280
270	sub show {	281	sub show {
271	my ($self) = @_;	282	my ($self) = @_;
272		283
…		…
313	sub set_visibility {	324	sub set_visibility {
314	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
315		326
316	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
317		328
318	$visible ? $self->hide	329	$visible ? $self->show
319	: $self->show;	330	: $self->hide;
320	}	331	}
321		332
322	sub toggle_visibility {	333	sub toggle_visibility {
323	my ($self) = @_;	334	my ($self) = @_;
324		335
…		…
502		513
503	defined wantarray and CFPlus::guard {	514	defined wantarray and CFPlus::guard {
504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505	@{ $self->{signal_cb}{$signal} };	516	@{ $self->{signal_cb}{$signal} };
506	}	517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
507	}	524	}
508		525
509	my %has_coords = (	526	my %has_coords = (
510	button_down => 1,	527	button_down => 1,
511	button_up => 1,	528	button_up => 1,
…		…
523	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
524	: ();	541	: ();
525		542
526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527		544
528	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
532	}	554	}
533		555
534	sub find_widget {	556	#sub find_widget {
535	my ($self, $x, $y) = @_;	557	# in .xs
536
537	return () unless $self->{can_events};
538
539	return $self
540	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543	()
544	}
545		558
546	sub set_parent {	559	sub set_parent {
547	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
548		561
549	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
550	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
551	}	564	}
552		565
553	sub realloc {	566	sub realloc {
554	my ($self) = @_;	567	my ($self) = @_;
…		…
580		593
581	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
582	# functions seems pointless.	595	# functions seems pointless.
583	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
584		597
585	sub draw {	598	#sub draw {
586	my ($self) = @_;	599	#CFPlus.xs
587
588	return unless $self->{h} && $self->{w};
589
590	# update screen rectangle
591	local $draw_x = $draw_x + $self->{x};
592	local $draw_y = $draw_y + $self->{y};
593
594	# skip widgets that are entirely outside the drawing area
595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
597
598	glPushMatrix;
599	glTranslate $self->{x}, $self->{y}, 0;
600
601	if ($self == $HOVER && $self->{can_hover}) {
602	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
603	glEnable GL_BLEND;
604	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605	glBegin GL_QUADS;
606	glVertex 0 , 0;
607	glVertex $self->{w}, 0;
608	glVertex $self->{w}, $self->{h};
609	glVertex 0 , $self->{h};
610	glEnd;
611	glDisable GL_BLEND;
612	}
613
614	if ($ENV{CFPLUS_DEBUG} & 1) {
615	glPushMatrix;
616	glColor 1, 1, 0, 1;
617	glTranslate 0.375, 0.375;
618	glBegin GL_LINE_LOOP;
619	glVertex 0 , 0;
620	glVertex $self->{w} - 1, 0;
621	glVertex $self->{w} - 1, $self->{h} - 1;
622	glVertex 0 , $self->{h} - 1;
623	glEnd;
624	glPopMatrix;
625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
626	}
627
628	$self->_draw;
629	glPopMatrix;
630	}
631		600
632	sub _draw {	601	sub _draw {
633	my ($self) = @_;	602	my ($self) = @_;
634		603
635	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
…		…
637		606
638	sub DESTROY {	607	sub DESTROY {
639	my ($self) = @_;	608	my ($self) = @_;
640		609
641	return if CFPlus::in_destruct;	610	return if CFPlus::in_destruct;
642
643	delete $WIDGET{$self+0};
644		611
645	eval { $self->destroy };	612	eval { $self->destroy };
646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		614
		615	delete $WIDGET{$self+0};
647	}	616	}
648		617
649	#############################################################################	618	#############################################################################
650		619
651	package CFPlus::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
…		…
727	can_events => 0,	696	can_events => 0,
728	%arg,	697	%arg,
729	);	698	);
730		699
731	$self->add (@$children)	700	$self->add (@$children)
732	if $children;	701	if $children && @$children;
733		702
734	$self	703	$self
735	}	704	}
736		705
737	sub realloc {	706	sub realloc {
…		…
746	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
747		716
748	$_->set_parent ($self)	717	$_->set_parent ($self)
749	for @widgets;	718	for @widgets;
750		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
751	use sort 'stable';	721	use sort 'stable';
752		722
753	$self->{children} = [	723	$self->{children} = [
754	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
755	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
756	];	726	];
757		727
758	$self->realloc;	728	$self->realloc;
		729
		730	$self->emit (c_add => \@widgets);
		731
		732	map $_+0, @widgets
759	}	733	}
760		734
761	sub children {	735	sub children {
762	@{ $_[0]{children} }	736	@{ $_[0]{children} }
763	}	737	}
764		738
765	sub remove {	739	sub remove {
766	my ($self, $child) = @_;	740	my ($self, @widgets) = @_;
767		741
		742	$self->emit (c_remove => \@widgets);
		743
		744	for my $child (@widgets) {
768	delete $child->{parent};	745	delete $child->{parent};
769	$child->hide;	746	$child->hide;
770
771	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	747	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		748	}
772		749
773	$self->realloc;	750	$self->realloc;
774	}	751	}
775		752
776	sub clear {	753	sub clear {
777	my ($self) = @_;	754	my ($self) = @_;
778		755
779	my $children = delete $self->{children};	756	my $children = $self->{children};
780	$self->{children} = [];	757	$self->{children} = [];
781		758
782	for (@$children) {	759	for (@$children) {
783	delete $_->{parent};	760	delete $_->{parent};
784	$_->hide;	761	$_->hide;
…		…
804	}	781	}
805		782
806	sub _draw {	783	sub _draw {
807	my ($self) = @_;	784	my ($self) = @_;
808		785
809	$_->draw for @{$self->{children}};	786	$_->draw for $self->visible_children;
810	}	787	}
811		788
812	#############################################################################	789	#############################################################################
813		790
814	package CFPlus::UI::Bin;	791	package CFPlus::UI::Bin;
…		…
824	}	801	}
825		802
826	sub add {	803	sub add {
827	my ($self, $child) = @_;	804	my ($self, $child) = @_;
828		805
829	$self->SUPER::remove ($_) for @{ $self->{children} };	806	$self->clear;
830	$self->SUPER::add ($child);	807	$self->SUPER::add ($child);
831	}	808	}
832		809
833	sub remove {	810	sub remove {
834	my ($self, $widget) = @_;	811	my ($self, $widget) = @_;
…		…
924	}	901	}
925		902
926	#############################################################################	903	#############################################################################
927		904
928	package CFPlus::UI::ViewPort;	905	package CFPlus::UI::ViewPort;
		906
		907	use List::Util qw(min max);
929		908
930	our @ISA = CFPlus::UI::Window::;	909	our @ISA = CFPlus::UI::Window::;
931		910
932	sub new {	911	sub new {
933	my $class = shift;	912	my $class = shift;
…		…
942	sub size_request {	921	sub size_request {
943	my ($self) = @_;	922	my ($self) = @_;
944		923
945	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	924	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946		925
947	$w = 10 if $self->{scroll_x};	926	$w = 1 if $self->{scroll_x};
948	$h = 10 if $self->{scroll_y};	927	$h = 1 if $self->{scroll_y};
949		928
950	($w, $h)	929	($w, $h)
951	}	930	}
952		931
953	sub invoke_size_allocate {	932	sub invoke_size_allocate {
…		…
965	}	944	}
966		945
967	sub set_offset {	946	sub set_offset {
968	my ($self, $x, $y) = @_;	947	my ($self, $x, $y) = @_;
969		948
		949	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		950	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		951
		952	if ($x != $self->{view_x} or $y != $self->{view_y}) {
970	$self->{view_x} = int $x;	953	$self->{view_x} = $x;
971	$self->{view_y} = int $y;	954	$self->{view_y} = $y;
972		955
		956	$self->emit (changed => $x, $y);
973	$self->update;	957	$self->update;
		958	}
		959	}
		960
		961	sub set_center {
		962	my ($self, $x, $y) = @_;
		963
		964	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		965	}
		966
		967	sub make_visible {
		968	my ($self, $x, $y, $border) = @_;
		969
		970	if ( $x < $self->{view_x} + $self->{w} * $border
		971	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		972	|| $y < $self->{view_y} + $self->{h} * $border
		973	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		974	) {
		975	$self->set_center ($x, $y);
		976	}
974	}	977	}
975		978
976	# hmm, this does not work for topleft of $self... but we should not ask for that	979	# hmm, this does not work for topleft of $self... but we should not ask for that
977	sub coord2local {	980	sub coord2local {
978	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
…		…
993	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
994		997
995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	998	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	999	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
997	) {	1000	) {
998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1001	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999	} else {	1002	} else {
1000	$self->CFPlus::UI::Base::find_widget ($x, $y)	1003	$self->CFPlus::UI::Base::find_widget ($x, $y)
1001	}	1004	}
1002	}	1005	}
1003		1006
…		…
1014		1017
1015	#############################################################################	1018	#############################################################################
1016		1019
1017	package CFPlus::UI::ScrolledWindow;	1020	package CFPlus::UI::ScrolledWindow;
1018		1021
1019	our @ISA = CFPlus::UI::HBox::;	1022	our @ISA = CFPlus::UI::Table::;
1020		1023
1021	sub new {	1024	sub new {
1022	my ($class, %arg) = @_;	1025	my ($class, %arg) = @_;
1023		1026
1024	my $child = delete $arg{child};	1027	my $child = delete $arg{child};
1025		1028
1026	my $self;	1029	my $self;
1027		1030
1028	my $slider = new CFPlus::UI::Slider	1031	my $hslider = new CFPlus::UI::Slider
		1032	col => 0,
		1033	row => 1,
		1034	vertical => 0,
		1035	range => [0, 0, 1, 0.01], # HACK fix
		1036	on_changed => sub {
		1037	$self->{hpos} = $_[1];
		1038	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1039	},
		1040	;
		1041
		1042	my $vslider = new CFPlus::UI::Slider
		1043	col => 1,
		1044	row => 0,
1029	vertical => 1,	1045	vertical => 1,
1030	range => [0, 0, 1, 0.01], # HACK fix	1046	range => [0, 0, 1, 0.01], # HACK fix
1031	on_changed => sub {	1047	on_changed => sub {
1032	$self->{vp}->set_offset (0, $_[1]);	1048	$self->{vpos} = $_[1];
		1049	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033	},	1050	},
1034	;	1051	;
1035		1052
1036	$self = $class->SUPER::new (	1053	$self = $class->SUPER::new (
1037	vp => (new CFPlus::UI::ViewPort expand => 1),	1054	scroll_x => 0,
		1055	scroll_y => 1,
1038	can_events => 1,	1056	can_events => 1,
1039	slider => $slider,	1057	hslider => $hslider,
		1058	vslider => $vslider,
		1059	col_expand => [1, 0],
		1060	row_expand => [1, 0],
1040	%arg,	1061	%arg,
1041	);	1062	);
1042		1063
		1064	$self->{vp} = new CFPlus::UI::ViewPort
		1065	col => 0,
		1066	row => 0,
		1067	expand => 1,
		1068	scroll_x => $self->{scroll_x},
		1069	scroll_y => $self->{scroll_y},
		1070	on_changed => sub {
		1071	my ($vp, $x, $y) = @_;
		1072
		1073	$vp->{parent}{hslider}->set_value ($x);
		1074	$vp->{parent}{vslider}->set_value ($y);
		1075
		1076	0
		1077	},
		1078	on_size_allocate => sub {
		1079	my ($vp, $w, $h) = @_;
		1080	$vp->{parent}->update_slider;
		1081	0
		1082	},
		1083	;
		1084
1043	$self->SUPER::add ($self->{vp}, $self->{slider});	1085	$self->SUPER::add ($self->{vp});
		1086
1044	$self->add ($child) if $child;	1087	$self->add ($child) if $child;
1045		1088
1046	$self	1089	$self
1047	}	1090	}
1048
1049	#TODO# update range on size_allocate depending on child
1050		1091
1051	sub add {	1092	sub add {
1052	my ($self, $widget) = @_;	1093	my ($self, $widget) = @_;
1053		1094
1054	$self->{vp}->add ($self->{child} = $widget);	1095	$self->{vp}->add ($self->{child} = $widget);
1055	}	1096	}
1056		1097
		1098	sub set_offset { shift->{vp}->set_offset (@_) }
		1099	sub set_center { shift->{vp}->set_center (@_) }
		1100	sub make_visible { shift->{vp}->make_visible (@_) }
		1101
		1102	sub update_slider {
		1103	my ($self) = @_;
		1104
		1105	my $child = ($self->{vp} or return)->child;
		1106
		1107	if ($self->{scroll_x}) {
		1108	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1109	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1110
		1111	my $visible = $w1 > $w2;
		1112	if ($visible != $self->{hslider_visible}) {
		1113	$self->{hslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{hslider})
		1115	: $self->SUPER::remove ($self->{hslider});
		1116	}
		1117	}
		1118
		1119	if ($self->{scroll_y}) {
		1120	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1121	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1122
		1123	my $visible = $h1 > $h2;
		1124	if ($visible != $self->{vslider_visible}) {
		1125	$self->{vslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{vslider})
		1127	: $self->SUPER::remove ($self->{vslider});
		1128	}
		1129	}
		1130	}
		1131
		1132	sub start_dragging {
		1133	my ($self, $ev) = @_;
		1134
		1135	$self->grab_focus;
		1136
		1137	my $ox = $self->{vp}{view_x};
		1138	my $oy = $self->{vp}{view_y};
		1139
		1140	$self->{motion} = sub {
		1141	my ($ev, $x, $y) = @_;
		1142
		1143	$ox -= $ev->{xrel};
		1144	$oy -= $ev->{yrel};
		1145
		1146	$self->{vp}->set_offset ($ox, $oy);
		1147	};
		1148	}
		1149
1057	sub invoke_mouse_wheel {	1150	sub invoke_mouse_wheel {
1058	my ($self, $ev) = @_;	1151	my ($self, $ev) = @_;
1059		1152
1060	return 0 unless $ev->{dy}; # only vertical movements
1061
1062	$self->{slider}->emit (mouse_wheel => $ev);	1153	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1154	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063		1155
1064	1	1156	1
1065	}	1157	}
1066		1158
1067	sub update_slider {	1159	sub invoke_button_down {
1068	my ($self) = @_;	1160	my ($self, $ev, $x, $y) = @_;
1069		1161
1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1162	if ($ev->{button} == 2) {
1071	}	1163	$self->start_dragging ($ev);
		1164	return 1;
		1165	}
1072		1166
1073	sub update {	1167	0
1074	my ($self) = @_;	1168	}
1075		1169
1076	$self->SUPER::update;	1170	sub invoke_button_up {
		1171	my ($self, $ev, $x, $y) = @_;
1077		1172
1078	$self->update_slider;	1173	if (delete $self->{motion}) {
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
1079	}	1189	}
1080		1190
1081	sub invoke_size_allocate {	1191	sub invoke_size_allocate {
1082	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1083		1193
1084	$self->update_slider;	1194	$self->update_slider;
1085
1086	$self->SUPER::invoke_size_allocate ($w, $h)	1195	$self->SUPER::invoke_size_allocate ($w, $h)
1087	}	1196	}
1088		1197
1089	#############################################################################	1198	#############################################################################
1090		1199
…		…
1240		1349
1241	my @border =	1350	my @border =
1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1351	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244		1353
		1354	my @icon =
		1355	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1356	qw(x1_move.png x1_resize.png);
		1357
1245	sub new {	1358	sub new {
1246	my ($class, %arg) = @_;	1359	my ($class, %arg) = @_;
1247		1360
1248	my $self = $class->SUPER::new (	1361	my $self = $class->SUPER::new (
1249	bg => [1, 1, 1, 1],	1362	bg => [1, 1, 1, 1],
…		…
1417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418		1531
1419	my $border = $self->border;	1532	my $border = $self->border;
1420		1533
1421	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1422	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1539
		1540	# move
		1541	my $w2 = ($w - $border) * .5;
		1542	my $h2 = ($h - $border) * .5;
		1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1546
		1547	# resize
		1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1550	unless $self->{has_close_button};
		1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426		1553
1427	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1429		1556
1430	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1451		1578
1452	#############################################################################	1579	#############################################################################
1453		1580
1454	package CFPlus::UI::Table;	1581	package CFPlus::UI::Table;
1455		1582
1456	our @ISA = CFPlus::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1457		1584
1458	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1459		1586
1460	use CFPlus::OpenGL;	1587	use CFPlus::OpenGL;
1461		1588
1462	sub new {	1589	sub new {
1463	my $class = shift;	1590	my $class = shift;
1464		1591
1465	$class->SUPER::new (	1592	$class->SUPER::new (
1466	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1467	@_,	1595	@_,
1468	)	1596	)
1469	}	1597	}
1470		1598
1471	sub children {
1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473	}
1474
1475	sub add {	1599	sub add {
		1600	my ($self, @widgets) = @_;
		1601
		1602	for my $child (@widgets) {
		1603	$child->{rowspan} ||= 1;
		1604	$child->{colspan} ||= 1;
		1605	}
		1606
		1607	$self->SUPER::add (@widgets);
		1608	}
		1609
		1610	sub add_at {
1476	my ($self) = shift;	1611	my $self = shift;
		1612
		1613	my @widgets;
1477		1614
1478	while (@_) {	1615	while (@_) {
1479	my ($x, $y, $child) = splice @_, 0, 3, ();	1616	my ($col, $row, $child) = splice @_, 0, 3, ();
1480	$child->set_parent ($self);
1481	$self->{children}[$y][$x] = $child;
1482	}
1483		1617
1484	$self->{force_realloc} = 1;	1618	$child->{row} = $row;
1485	$self->{force_size_alloc} = 1;	1619	$child->{col} = $col;
1486	$self->realloc;
1487	}
1488		1620
1489	sub remove {	1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1490	my ($self, $child) = @_;	1628	my ($self) = @_;
1491		1629
1492	# TODO: not yet implemented	1630	my (@w, @h);
1493	}
1494
1495	# TODO: move to container class maybe? send children a signal on removal?
1496	sub clear {
1497	my ($self) = @_;
1498		1631
1499	my @children = $self->children;	1632	my @children = $self->children;
1500	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1637
		1638	my $sw = sum @w[$c .. $c + $cs - 1];
		1639
		1640	if ($w > $sw) {
		1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1642	}
1501		1643	}
1502	for (@children) {
1503	delete $_->{parent};
1504	$_->hide;
1505	}
1506		1644
1507	$self->realloc;	1645	# second pass, rows
1508	}	1646	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1509
1510	sub get_wh {
1511	my ($self) = @_;
1512
1513	my (@w, @h);
1514
1515	for my $y (0 .. $#{$self->{children}}) {
1516	my $row = $self->{children}[$y]
1517	or next;
1518
1519	for my $x (0 .. $#$row) {
1520	my $widget = $row->[$x]
1521	or next;
1522	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1523		1648
1524	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1525	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526	}	1653	}
1527	}	1654	}
1528		1655
1529	(\@w, \@h)	1656	(\@w, \@h)
1530	}	1657	}
…		…
1546	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1547		1674
1548	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1549	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1550		1677
1551	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1552	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1553	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1554	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1555		1682
1556	# linearly scale sizes
1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559		1684
1560	CFPlus::UI::harmonize $ws;	1685	CFPlus::UI::harmonize $ws;
		1686
		1687	my @row_expand = @{$self->{row_expand}};
		1688	@row_expand = (1) x @$ws unless @row_expand;
		1689	my $row_expand = (sum @row_expand) || 1;
		1690
		1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1692
1561	CFPlus::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1562		1694
1563	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564		1697
1565	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1566	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1567	or next;
1568		1700
1569	my $x = 0;	1701	$widget->configure (
1570	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571		1704	);
1572	for my $c (0 .. $#$row) {	1705	}
1573	my $col_w = $ws->[$c];
1574		1706
1575	if (my $widget = $row->[$c]) {	1707	1
1576	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1577	}
1578		1709
1579	$x += $col_w;	1710	#############################################################################
		1711
		1712	package CFPlus::UI::Fixed;
		1713
		1714	use List::Util qw(min max);
		1715
		1716	our @ISA = CFPlus::UI::Container::;
		1717
		1718	sub _scale($$$) {
		1719	my ($rel, $val, $max) = @_;
		1720
		1721	$rel ? $val * $max : $val
		1722	}
		1723
		1724	sub size_request {
		1725	my ($self) = @_;
		1726
		1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1728
		1729	# determine overall size by querying abs widgets
		1730	for my $child ($self->visible_children) {
		1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
		1734
		1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1580	}	1737	}
		1738	}
1581		1739
1582	$y += $row_h;	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
		1742
		1743	# now layout remaining widgets
		1744	for my $child ($self->visible_children) {
		1745	if ($child->{c_rel}) {
		1746	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1747	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1751	}
		1752	}
		1753
		1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	($W, $H)
		1758	}
		1759
		1760	sub invoke_size_allocate {
		1761	my ($self, $W, $H) = @_;
		1762
		1763	for my $child ($self->visible_children) {
		1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1766
		1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
		1769
		1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1583	}	1771	}
1584		1772
1585	1	1773	1
1586	}	1774	}
1587		1775
1588	sub find_widget {
1589	my ($self, $x, $y) = @_;
1590
1591	$x -= $self->{x};
1592	$y -= $self->{y};
1593
1594	my $res;
1595
1596	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1597	$res = $_->find_widget ($x, $y)
1598	and return $res;
1599	}
1600
1601	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1602	}
1603
1604	sub _draw {
1605	my ($self) = @_;
1606
1607	for (grep $_, @{$self->{children}}) {
1608	$_->draw for grep $_, @$_;
1609	}
1610	}
1611
1612	#############################################################################	1776	#############################################################################
1613		1777
1614	package CFPlus::UI::Box;	1778	package CFPlus::UI::Box;
1615		1779
1616	our @ISA = CFPlus::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1617		1781
1618	sub size_request {	1782	sub size_request {
1619	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1620		1786
1621	$self->{vertical}	1787	$self->{vertical}
1622	? (	1788	? (
1623	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1624	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1625	)	1791	)
1626	: (	1792	: (
1627	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1628	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1629	)	1795	)
1630	}	1796	}
1631		1797
1632	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1633	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2040	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2041	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1876	: ($self->{h} - $size->[1]) * 0.5);	2042	: ($self->{h} - $size->[1]) * 0.5);
1877	};	2043	};
1878		2044
1879	my $w = List::Util::min $self->{w} + 4, $size->[0];	2045	# unless ($self->{list}) {
1880	my $h = List::Util::min $self->{h} + 2, $size->[1];	2046	# $self->{list} = CFPlus::OpenGL::glGenList;
		2047	# CFPlus::OpenGL::glNewList $self->{list};
		2048	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2049	# CFPlus::OpenGL::glEndList;
		2050	# }
		2051	#
		2052	# CFPlus::OpenGL::glCallList $self->{list};
1881		2053
1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2054	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1883	}	2055	}
		2056
		2057	#sub destroy {
		2058	# my ($self) = @_;
		2059	#
		2060	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2061	#
		2062	# $self->SUPER::destroy;
		2063	#}
1884		2064
1885	#############################################################################	2065	#############################################################################
1886		2066
1887	package CFPlus::UI::EntryBase;	2067	package CFPlus::UI::EntryBase;
1888		2068
…		…
1894	my $class = shift;	2074	my $class = shift;
1895		2075
1896	$class->SUPER::new (	2076	$class->SUPER::new (
1897	fg => [1, 1, 1],	2077	fg => [1, 1, 1],
1898	bg => [0, 0, 0, 0.2],	2078	bg => [0, 0, 0, 0.2],
1899	active_bg => [1, 1, 1, 0.5],	2079	active_bg => [0, 0, 1, .2],
1900	active_fg => [0, 0, 0],	2080	active_fg => [1, 1, 1],
		2081	active_outline => [1, 1, 0],
1901	can_hover => 1,	2082	can_hover => 1,
1902	can_focus => 1,	2083	can_focus => 1,
1903	valign => 0,	2084	valign => 0,
1904	can_events => 1,	2085	can_events => 1,
1905	ellipsise => 0,	2086	ellipsise => 0,
…		…
1955	my $sym = $ev->{sym};	2136	my $sym = $ev->{sym};
1956	my $uni = $ev->{unicode};	2137	my $uni = $ev->{unicode};
1957		2138
1958	my $text = $self->get_text;	2139	my $text = $self->get_text;
1959		2140
		2141	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2142
1960	if ($uni == 8) {	2143	if ($uni == 8) {
1961	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2144	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1962	} elsif ($uni == 127) {	2145	} elsif ($uni == 127) {
1963	substr $text, $self->{cursor}, 1, "";	2146	substr $text, $self->{cursor}, 1, "";
1964	} elsif ($sym == CFPlus::SDLK_LEFT) {	2147	} elsif ($sym == CFPlus::SDLK_LEFT) {
1965	--$self->{cursor} if $self->{cursor};	2148	--$self->{cursor} if $self->{cursor};
1966	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2149	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1967	++$self->{cursor} if $self->{cursor} < length $self->{text};	2150	++$self->{cursor} if $self->{cursor} < length $self->{text};
1968	} elsif ($sym == CFPlus::SDLK_HOME) {	2151	} elsif ($sym == CFPlus::SDLK_HOME) {
		2152	# what a hack
1969	$self->{cursor} = 0;	2153	$self->{cursor} =
		2154	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2155	? length $1
		2156	: 0;
1970	} elsif ($sym == CFPlus::SDLK_END) {	2157	} elsif ($sym == CFPlus::SDLK_END) {
		2158	# uh, again
		2159	$self->{cursor} =
		2160	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1971	$self->{cursor} = length $text;	2161	? $self->{cursor} + length $1
		2162	: length $self->{text};
1972	} elsif ($uni == 21) { # ctrl-u	2163	} elsif ($uni == 21) { # ctrl-u
1973	$text = "";	2164	$text = "";
1974	$self->{cursor} = 0;	2165	$self->{cursor} = 0;
1975	} elsif ($uni == 27) {	2166	} elsif ($uni == 27) {
1976	$self->emit ('escape');	2167	$self->emit ('escape');
		2168	} elsif ($uni == 0x0d) {
		2169	substr $text, $self->{cursor}++, 0, "\012";
1977	} elsif ($uni >= 0x20) {	2170	} elsif ($uni >= 0x20) {
1978	substr $text, $self->{cursor}++, 0, chr $uni;	2171	substr $text, $self->{cursor}++, 0, chr $uni;
1979	} else {	2172	} else {
1980	return 0;	2173	return 0;
1981	}	2174	}
…		…
2050		2243
2051	unless (exists $self->{cur_h}) {	2244	unless (exists $self->{cur_h}) {
2052	my $text = substr $self->{text}, 0, $self->{cursor};	2245	my $text = substr $self->{text}, 0, $self->{cursor};
2053	utf8::encode $text;	2246	utf8::encode $text;
2054		2247
2055	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2248	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2056	}	2249	}
2057		2250
		2251	glColor_premultiply @{$self->{active_fg}};
2058	glBegin GL_LINES;	2252	glBegin GL_LINES;
2059	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2253	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2060	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2254	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2061	glEnd;	2255	glEnd;
		2256
		2257	glLineWidth 3;
		2258	glColor @{$self->{active_outline}};
		2259	glTranslate -.375, -.375;
		2260	glBegin GL_LINE_LOOP;
		2261	glVertex 0, 0;
		2262	glVertex $self->{w}, 0;
		2263	glVertex $self->{w}, $self->{h};
		2264	glVertex 0, $self->{h};
		2265	glEnd;
		2266	glLineWidth 1;
2062	}	2267	}
2063	}	2268	}
2064		2269
2065	#############################################################################	2270	#############################################################################
2066		2271
…		…
2073	sub invoke_key_down {	2278	sub invoke_key_down {
2074	my ($self, $ev) = @_;	2279	my ($self, $ev) = @_;
2075		2280
2076	my $sym = $ev->{sym};	2281	my $sym = $ev->{sym};
2077		2282
2078	if ($sym == 13) {	2283	if ($ev->{uni} == 0x0d || $sym == 13) {
2079	unshift @{$self->{history}},	2284	unshift @{$self->{history}},
2080	my $txt = $self->get_text;	2285	my $txt = $self->get_text;
2081		2286
2082	$self->{history_pointer} = -1;	2287	$self->{history_pointer} = -1;
2083	$self->{history_saveback} = '';	2288	$self->{history_saveback} = '';
…		…
2124	sub move_cursor_ver {	2329	sub move_cursor_ver {
2125	my ($self, $dy) = @_;	2330	my ($self, $dy) = @_;
2126		2331
2127	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2332	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2128		2333
2129	do {	2334	$y += $dy;
		2335
2130	if (defined (my $index = $self->{layout}->line_x_to_index ($y + $dy, $x))) {	2336	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2131	$self->{cursor} = $index;	2337	$self->{cursor} = $index;
2132	delete $self->{cur_h};	2338	delete $self->{cur_h};
2133	$self->update;	2339	$self->update;
2134	return;	2340	return;
2135	}	2341	}
2136	} while --$x >= 0;
2137	}	2342	}
2138		2343
2139	sub invoke_key_down {	2344	sub invoke_key_down {
2140	my ($self, $ev) = @_;	2345	my ($self, $ev) = @_;
2141		2346
…		…
2152	1	2357	1
2153	}	2358	}
2154		2359
2155	#############################################################################	2360	#############################################################################
2156		2361
2157	package CFPlus::UI::Button;	2362	package CFPlus::UI::ButtonBin;
2158		2363
2159	our @ISA = CFPlus::UI::Label::;	2364	our @ISA = CFPlus::UI::Bin::;
2160		2365
2161	use CFPlus::OpenGL;	2366	use CFPlus::OpenGL;
2162		2367
2163	my @tex =	2368	my @tex =
2164	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2369	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165	qw(b1_button_active.png);	2370	qw(b1_button_inactive.png b1_button_active.png);
2166		2371
2167	sub new {	2372	sub new {
2168	my $class = shift;	2373	my $class = shift;
2169		2374
2170	$class->SUPER::new (	2375	$class->SUPER::new (
2171	padding_x => 4,
2172	padding_y => 4,
2173	fg => [1, 1, 1],
2174	active_fg => [0, 0, 1],
2175	can_hover => 1,	2376	can_hover => 1,
2176	align => 0,	2377	align => 0,
2177	valign => 0,	2378	valign => 0,
2178	can_events => 1,	2379	can_events => 1,
2179	@_	2380	@_
…		…
2191	}	2392	}
2192		2393
2193	sub _draw {	2394	sub _draw {
2194	my ($self) = @_;	2395	my ($self) = @_;
2195		2396
2196	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2197
2198	glEnable GL_TEXTURE_2D;	2397	glEnable GL_TEXTURE_2D;
2199	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2398	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2200	glColor 0, 0, 0, 1;	2399	glColor 0, 0, 0, 1;
2201		2400
		2401	my $tex = $tex[$GRAB == $self];
2202	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2402	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2403
		2404	glDisable GL_TEXTURE_2D;
		2405
		2406	$self->SUPER::_draw;
		2407	}
		2408
		2409	#############################################################################
		2410
		2411	package CFPlus::UI::Button;
		2412
		2413	our @ISA = CFPlus::UI::Label::;
		2414
		2415	use CFPlus::OpenGL;
		2416
		2417	my @tex =
		2418	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2419	qw(b1_button_inactive.png b1_button_active.png);
		2420
		2421	sub new {
		2422	my $class = shift;
		2423
		2424	$class->SUPER::new (
		2425	padding_x => 4,
		2426	padding_y => 4,
		2427	fg => [1.0, 1.0, 1.0],
		2428	active_fg => [0.8, 0.8, 0.8],
		2429	can_hover => 1,
		2430	align => 0,
		2431	valign => 0,
		2432	can_events => 1,
		2433	@_
		2434	)
		2435	}
		2436
		2437	sub invoke_button_up {
		2438	my ($self, $ev, $x, $y) = @_;
		2439
		2440	$self->emit ("activate")
		2441	if $x >= 0 && $x < $self->{w}
		2442	&& $y >= 0 && $y < $self->{h};
		2443
		2444	1
		2445	}
		2446
		2447	sub _draw {
		2448	my ($self) = @_;
		2449
		2450	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2451
		2452	glEnable GL_TEXTURE_2D;
		2453	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2454	glColor 0, 0, 0, 1;
		2455
		2456	my $tex = $tex[$GRAB == $self];
		2457	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2203		2458
2204	glDisable GL_TEXTURE_2D;	2459	glDisable GL_TEXTURE_2D;
2205		2460
2206	$self->SUPER::_draw;	2461	$self->SUPER::_draw;
2207	}	2462	}
…		…
2294	sub new {	2549	sub new {
2295	my $class = shift;	2550	my $class = shift;
2296		2551
2297	my $self = $class->SUPER::new (	2552	my $self = $class->SUPER::new (
2298	can_events => 0,	2553	can_events => 0,
		2554	scale => 1,
2299	@_,	2555	@_,
2300	);	2556	);
2301		2557
2302	$self->{path} || $self->{tex}	2558	$self->{path} || $self->{tex}
2303	or Carp::croak "'path' or 'tex' attributes required";	2559	or Carp::croak "'path' or 'tex' attributes required";
2304		2560
2305	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2561	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2306	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2562	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2307		2563
2308	Scalar::Util::weaken $texture_cache{$self->{path}};	2564	CFPlus::weaken $texture_cache{$self->{path}};
2309		2565
2310	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2566	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2311		2567
2312	$self	2568	$self
2313	}	2569	}
…		…
2328	}	2584	}
2329		2585
2330	sub size_request {	2586	sub size_request {
2331	my ($self) = @_;	2587	my ($self) = @_;
2332		2588
2333	($self->{tex}{w}, $self->{tex}{h})	2589	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2334	}	2590	}
2335		2591
2336	sub _draw {	2592	sub _draw {
2337	my ($self) = @_;	2593	my ($self) = @_;
2338		2594
…		…
2348	}	2604	}
2349		2605
2350	glEnable GL_TEXTURE_2D;	2606	glEnable GL_TEXTURE_2D;
2351	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2607	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2352		2608
2353	$tex->draw_quad (0, 0, $w, $h);	2609	$tex->draw_quad_alpha (0, 0, $w, $h);
2354		2610
2355	glDisable GL_TEXTURE_2D;	2611	glDisable GL_TEXTURE_2D;
2356	}	2612	}
2357		2613
2358	#############################################################################	2614	#############################################################################
…		…
2660		2916
2661	$self->SUPER::invoke_button_down ($ev, $x, $y);	2917	$self->SUPER::invoke_button_down ($ev, $x, $y);
2662		2918
2663	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2919	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2664		2920
2665	$self->invoke_mouse_motion ($ev, $x, $y)	2921	$self->invoke_mouse_motion ($ev, $x, $y);
		2922
		2923	1
2666	}	2924	}
2667		2925
2668	sub invoke_mouse_motion {	2926	sub invoke_mouse_motion {
2669	my ($self, $ev, $x, $y) = @_;	2927	my ($self, $ev, $x, $y) = @_;
2670		2928
…		…
2686	sub invoke_mouse_wheel {	2944	sub invoke_mouse_wheel {
2687	my ($self, $ev) = @_;	2945	my ($self, $ev) = @_;
2688		2946
2689	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2947	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2690		2948
		2949	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2950
2691	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2951	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2692		2952
2693	! ! $delta	2953	1
2694	}	2954	}
2695		2955
2696	sub update {	2956	sub update {
2697	my ($self) = @_;	2957	my ($self) = @_;
2698		2958
…		…
2806	#font => default_font	3066	#font => default_font
2807	@_,	3067	@_,
2808		3068
2809	layout => (new CFPlus::Layout),	3069	layout => (new CFPlus::Layout),
2810	par => [],	3070	par => [],
		3071	max_par => 0,
2811	height => 0,	3072	height => 0,
2812	children => [	3073	children => [
2813	(new CFPlus::UI::Empty expand => 1),	3074	(new CFPlus::UI::Empty expand => 1),
2814	(new CFPlus::UI::Slider vertical => 1),	3075	(new CFPlus::UI::Slider vertical => 1),
2815	],	3076	],
…		…
2828	}	3089	}
2829		3090
2830	sub size_request {	3091	sub size_request {
2831	my ($self) = @_;	3092	my ($self) = @_;
2832		3093
2833	my ($empty, $slider) = @{ $self->{children} };	3094	my ($empty, $slider) = $self->visible_children;
2834		3095
2835	local $self->{children} = [$empty, $slider];	3096	local $self->{children} = [$empty, $slider];
2836	$self->SUPER::size_request	3097	$self->SUPER::size_request
2837	}	3098	}
2838		3099
…		…
2938	wrapped => 1,	3199	wrapped => 1,
2939	};	3200	};
2940		3201
2941	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3202	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2942	push @{$self->{par}}, $para;	3203	push @{$self->{par}}, $para;
		3204	}
		3205
		3206	if (my $max = $self->{max_par}) {
		3207	shift @{$self->{par}} while @{$self->{par}} > $max;
2943	}	3208	}
2944		3209
2945	$self->{need_reflow}++;	3210	$self->{need_reflow}++;
2946	$self->update;	3211	$self->update;
2947	}	3212	}
…		…
3255		3520
3256	sub new {	3521	sub new {
3257	my $class = shift;	3522	my $class = shift;
3258		3523
3259	my $self = $class->SUPER::new (	3524	my $self = $class->SUPER::new (
		3525	size_w => 32,
		3526	size_h => 8,
3260	aspect => 1,	3527	aspect => 1,
3261	can_events => 0,	3528	can_events => 0,
3262	@_,	3529	@_,
3263	);	3530	);
3264		3531
3265	if ($self->{anim} && $self->{animspeed}) {	3532	if ($self->{anim} && $self->{animspeed}) {
3266	Scalar::Util::weaken (my $widget = $self);	3533	CFPlus::weaken (my $widget = $self);
3267		3534
		3535	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3536	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3268	$self->{timer} = Event->timer (	3537	$self->{timer} = Event->timer (
3269	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3270	hard => 1,	3538	parked => 1,
3271	interval => $self->{animspeed},
3272	cb => sub {	3539	cb => sub {
		3540	return unless $::CONN && $widget;
		3541
3273	++$widget->{frame};	3542	++$widget->{frame};
		3543	$widget->update_face;
3274	$widget->update;	3544	$widget->update;
		3545
		3546	$widget->update_timer;
3275	},	3547	},
3276	);	3548	);
		3549
		3550	$self->update_face;
		3551	$self->update_timer;
3277	}	3552	}
3278		3553
3279	$self	3554	$self
3280	}	3555	}
3281		3556
		3557	sub update_timer {
		3558	my ($self) = @_;
		3559
		3560	return unless $self->{timer};
		3561
		3562	if ($self->{visible}) {
		3563	$self->{timer}->at (
		3564	$self->{anim_start}
		3565	+ $self->{animspeed}
		3566	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3567	);
		3568	$self->{timer}->start;
		3569	} else {
		3570	$self->{timer}->stop;
		3571	}
		3572	}
		3573
		3574	sub update_face {
		3575	my ($self) = @_;
		3576
		3577	return unless $::CONN;
		3578
		3579	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3580	if ($anim && @$anim) {
		3581	delete $self->{wait_face};
		3582	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3583	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3584	}
		3585	}
		3586	}
		3587
3282	sub size_request {	3588	sub size_request {
3283	(32, 8)	3589	my ($self) = @_;
		3590
		3591	if ($::CONN) {
		3592	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3593	if (my $tex = $::CONN->{texture}[$faceid]) {
		3594	$self->{tex} = $tex;
		3595	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3596	} else {
		3597	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3598	$self->realloc;
		3599	});
		3600	}
		3601	}
		3602	}
		3603
		3604	($self->{size_w} || 8, $self->{size_h} || 8)
3284	}	3605	}
3285		3606
3286	sub update {	3607	sub update {
3287	my ($self) = @_;	3608	my ($self) = @_;
3288		3609
3289	return unless $self->{visible};	3610	return unless $self->{visible};
3290		3611
3291	$self->SUPER::update;	3612	$self->SUPER::update;
3292	}	3613	}
3293		3614
		3615	sub invoke_visibility_change {
		3616	my ($self) = @_;
		3617
		3618	$self->update_timer;
		3619
		3620	0
		3621	}
		3622
3294	sub _draw {	3623	sub _draw {
3295	my ($self) = @_;	3624	my ($self) = @_;
3296		3625
3297	return unless $::CONN;
3298
3299	$self->SUPER::_draw;	3626	$self->SUPER::_draw;
3300		3627
3301	my $face;	3628	if (my $tex = $self->{tex}) {
3302
3303	if ($self->{frame}) {
3304	my $anim = $::CONN->{anim}[$self->{anim}];
3305
3306	$face = $anim->[ $self->{frame} % @$anim ]
3307	if $anim && @$anim;
3308	}
3309
3310	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3311
3312	if ($tex) {
3313	glEnable GL_TEXTURE_2D;	3629	glEnable GL_TEXTURE_2D;
3314	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3630	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3315	glColor 0, 0, 0, 1;	3631	glColor 0, 0, 0, 1;
3316	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3632	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3317	glDisable GL_TEXTURE_2D;	3633	glDisable GL_TEXTURE_2D;
…		…
3319	}	3635	}
3320		3636
3321	sub destroy {	3637	sub destroy {
3322	my ($self) = @_;	3638	my ($self) = @_;
3323		3639
3324	$self->{timer}->cancel	3640	(delete $self->{timer})->cancel
3325	if $self->{timer};	3641	if $self->{timer};
3326		3642
3327	$self->SUPER::destroy;	3643	$self->SUPER::destroy;
3328	}	3644	}
3329		3645
…		…
3369	children => [	3685	children => [
3370	(new CFPlus::UI::Label markup => $left, expand => 1),	3686	(new CFPlus::UI::Label markup => $left, expand => 1),
3371	(new CFPlus::UI::Label markup => $right, align => +1),	3687	(new CFPlus::UI::Label markup => $right, align => +1),
3372	],	3688	],
3373	;	3689	;
3374		3690
3375	} else {	3691	} else {
3376	$widget = new CFPlus::UI::Label	3692	$widget = new CFPlus::UI::Label
3377	can_hover => 1,	3693	can_hover => 1,
3378	can_events => 1,	3694	can_events => 1,
3379	markup => $widget,	3695	markup => $widget,
…		…
3515	buttonbar => (new CFPlus::UI::Buttonbar),	3831	buttonbar => (new CFPlus::UI::Buttonbar),
3516	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3832	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3517	# filter => # will be put between multiplexer and $self	3833	# filter => # will be put between multiplexer and $self
3518	@_,	3834	@_,
3519	);	3835	);
3520		3836
3521	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3837	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3522	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3838	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3523		3839
		3840	{
		3841	Scalar::Util::weaken (my $wself = $self);
		3842
		3843	$self->{multiplexer}->connect (c_add => sub {
		3844	my ($mplex, $widgets) = @_;
		3845
		3846	for my $child (@$widgets) {
		3847	Scalar::Util::weaken $child;
		3848	$child->{c_tab_} ||= do {
		3849	my $tab =
		3850	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3851	? $child->{c_tab}
		3852	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3853
		3854	$tab->connect (activate => sub {
		3855	$wself->set_current_page ($child);
		3856	});
		3857
		3858	$tab
		3859	};
		3860
		3861	$self->{buttonbar}->add ($child->{c_tab_});
		3862	}
		3863	});
		3864
		3865	$self->{multiplexer}->connect (c_remove => sub {
		3866	my ($mplex, $widgets) = @_;
		3867
		3868	for my $child (@$widgets) {
		3869	$wself->{buttonbar}->remove ($child->{c_tab_});
		3870	}
		3871	});
		3872	}
		3873
3524	$self	3874	$self
3525	}	3875	}
3526		3876
3527	sub add {	3877	sub add {
		3878	my ($self, @widgets) = @_;
		3879
		3880	$self->{multiplexer}->add (@widgets)
		3881	}
		3882
		3883	sub remove {
		3884	my ($self, @widgets) = @_;
		3885
		3886	$self->{multiplexer}->remove (@widgets)
		3887	}
		3888
		3889	sub pages {
		3890	my ($self) = @_;
		3891	$self->{multiplexer}->children
		3892	}
		3893
		3894	sub add_tab {
3528	my ($self, $title, $widget, $tooltip) = @_;	3895	my ($self, $title, $widget, $tooltip) = @_;
3529		3896
3530	Scalar::Util::weaken $self;	3897	$title = [$title, $tooltip] unless ref $title;
		3898	$widget->{c_tab} = $title;
3531		3899
3532	$self->{buttonbar}->add (new CFPlus::UI::Button
3533	markup => $title,
3534	tooltip => $tooltip,
3535	on_activate => sub { $self->set_current_page ($widget) },
3536	);
3537
3538	$self->{multiplexer}->add ($widget);	3900	$self->add ($widget);
3539	}	3901	}
3540		3902
3541	sub get_current_page {	3903	sub get_current_page {
3542	my ($self) = @_;	3904	my ($self) = @_;
3543		3905
…		…
3619	my $self = $class->SUPER::new (	3981	my $self = $class->SUPER::new (
3620	fontsize => 0.8,	3982	fontsize => 0.8,
3621	@_,	3983	@_,
3622	);	3984	);
3623		3985
3624	Scalar::Util::weaken (my $this = $self);	3986	CFPlus::weaken (my $this = $self);
3625		3987
3626	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3988	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3627		3989
3628	$self	3990	$self
3629	}	3991	}
…		…
3752	$self->SUPER::destroy;	4114	$self->SUPER::destroy;
3753	}	4115	}
3754		4116
3755	#############################################################################	4117	#############################################################################
3756		4118
3757	package CFPlus::UI::Inventory;
3758
3759	our @ISA = CFPlus::UI::Table::;
3760
3761	sub new {
3762	my $class = shift;
3763
3764	my $self = $class->SUPER::new (
3765	col_expand => [0, 1, 0],
3766	items => [],
3767	@_,
3768	);
3769
3770	$self->set_sort_order (undef);
3771
3772	$self
3773	}
3774
3775	sub update_items {
3776	my ($self) = @_;
3777
3778	$self->clear;
3779
3780	my @item = $self->{sort}->(@{ $self->{items} });
3781
3782	my @adds;
3783	my $row = 0;
3784	for my $item ($self->{sort}->(@{ $self->{items} })) {
3785	CFPlus::Item::update_widgets $item;
3786
3787	push @adds, 0, $row, $item->{face_widget};
3788	push @adds, 1, $row, $item->{desc_widget};
3789	push @adds, 2, $row, $item->{weight_widget};
3790
3791	$row++;
3792	}
3793
3794	$self->add (@adds);
3795	}
3796
3797	sub set_sort_order {
3798	my ($self, $order) = @_;
3799
3800	$self->{sort} = $order ||= sub {
3801	sort {
3802	$a->{type} <=> $b->{type}
3803	or $a->{name} cmp $b->{name}
3804	} @_
3805	};
3806
3807	$self->update_items;
3808	}
3809
3810	sub set_items {
3811	my ($self, $items) = @_;
3812
3813	$self->{items} = [$items ? values %$items : ()];
3814	$self->update_items;
3815	}
3816
3817	#############################################################################
3818
3819	package CFPlus::UI::SpellList;
3820
3821	our @ISA = CFPlus::UI::Table::;
3822
3823	sub new {
3824	my $class = shift;
3825
3826	my $self = $class->SUPER::new (
3827	binding => [],
3828	commands => [],
3829	@_,
3830	)
3831	}
3832
3833	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3834
3835	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3836	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3837	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3838	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3839	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3840	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3841	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3842	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3843	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3844	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3845
3846	sub rebuild_spell_list {
3847	my ($self) = @_;
3848
3849	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3850	$self->clear;
3851
3852	return unless $::CONN;
3853
3854	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3855	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3856	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3857	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3858	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3859
3860	my $row = 0;
3861
3862	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3863	my $spell = $self->{spell}{$_};
3864
3865	$row++;
3866
3867	my $spell_cb = sub {
3868	my ($widget, $ev) = @_;
3869
3870	if ($ev->{button} == 1) {
3871	$::CONN->user_send ("cast $spell->{name}");
3872	} elsif ($ev->{button} == 2) {
3873	$::CONN->user_send ("invoke $spell->{name}");
3874	} elsif ($ev->{button} == 3) {
3875	my $shortname = CFPlus::shorten $spell->{name}, 14;
3876	(new CFPlus::UI::Menu
3877	items => [
3878	["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3879	["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3880	],
3881	)->popup ($ev);
3882	} else {
3883	return 0;
3884	}
3885
3886	1
3887	};
3888
3889	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3890
3891	#TODO: add path info to tooltip
3892	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3893
3894	$self->add (0, $row, new CFPlus::UI::Face
3895	face => $spell->{face},
3896	can_hover => 1,
3897	can_events => 1,
3898	tooltip => $tooltip,
3899	on_button_down => $spell_cb,
3900	);
3901
3902	$self->add (1, $row, new CFPlus::UI::Label
3903	expand => 1,
3904	text => $spell->{name},
3905	can_hover => 1,
3906	can_events => 1,
3907	tooltip => $tooltip,
3908	on_button_down => $spell_cb,
3909	);
3910
3911	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3912	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3913	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3914	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3915	}
3916	});
3917	}
3918
3919	sub add_spell {
3920	my ($self, $spell) = @_;
3921
3922	$self->{spell}->{$spell->{name}} = $spell;
3923	$self->rebuild_spell_list;
3924	}
3925
3926	sub remove_spell {
3927	my ($self, $spell) = @_;
3928
3929	delete $self->{spell}->{$spell->{name}};
3930	$self->rebuild_spell_list;
3931	}
3932
3933	sub clear_spells {
3934	my ($self) = @_;
3935
3936	$self->{spell} = {};
3937	$self->rebuild_spell_list;
3938	}
3939
3940	#############################################################################
3941
3942	package CFPlus::UI::Root;	4119	package CFPlus::UI::Root;
3943		4120
3944	our @ISA = CFPlus::UI::Container::;	4121	our @ISA = CFPlus::UI::Container::;
3945		4122
3946	use List::Util qw(min max);	4123	use List::Util qw(min max);
…		…
3953	my $self = $class->SUPER::new (	4130	my $self = $class->SUPER::new (
3954	visible => 1,	4131	visible => 1,
3955	@_,	4132	@_,
3956	);	4133	);
3957		4134
3958	Scalar::Util::weaken ($self->{root} = $self);	4135	CFPlus::weaken ($self->{root} = $self);
3959		4136
3960	$self	4137	$self
3961	}	4138	}
3962		4139
3963	sub size_request {	4140	sub size_request {
…		…
4058	while ($self->{refresh_hook}) {	4235	while ($self->{refresh_hook}) {
4059	$_->()	4236	$_->()
4060	for values %{delete $self->{refresh_hook}};	4237	for values %{delete $self->{refresh_hook}};
4061	}	4238	}
4062		4239
4063	if ($self->{realloc}) {	4240	while ($self->{realloc}) {
4064	my %queue;	4241	my %queue;
4065	my @queue;	4242	my @queue;
4066	my $widget;	4243	my $widget;
4067		4244
4068	outer:	4245	outer:
…		…
4115	}	4292	}
4116	}	4293	}
4117		4294
4118	delete $self->{realloc}{$widget+0};	4295	delete $self->{realloc}{$widget+0};
4119	}	4296	}
4120	}
4121		4297
4122	while (my $size_alloc = delete $self->{size_alloc}) {	4298	while (my $size_alloc = delete $self->{size_alloc}) {
4123	my @queue = sort { $b->{visible} <=> $a->{visible} }	4299	my @queue = sort { $a->{visible} <=> $b->{visible} }
4124	values %$size_alloc;	4300	values %$size_alloc;
4125		4301
4126	while () {	4302	while () {
4127	my $widget = pop @queue || last;	4303	my $widget = pop @queue || last;
4128		4304
4129	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4305	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4130		4306
4131	$w = 0 if $w < 0;
4132	$h = 0 if $h < 0;
4133
4134	$w = max $widget->{min_w}, $w;	4307	$w = max $widget->{min_w}, $w;
4135	$h = max $widget->{min_h}, $h;	4308	$h = max $widget->{min_h}, $h;
4136		4309
4137	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4310	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4138	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4311	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4139		4312
4140	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4313	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4141	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4314	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4142		4315
4143	$w = int $w + 0.5;	4316	$w = int $w + 0.5;
4144	$h = int $h + 0.5;	4317	$h = int $h + 0.5;
4145		4318
4146	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4319	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4147	$widget->{old_w} = $widget->{w};	4320	$widget->{old_w} = $widget->{w};
4148	$widget->{old_h} = $widget->{h};	4321	$widget->{old_h} = $widget->{h};
4149		4322
4150	$widget->{w} = $w;	4323	$widget->{w} = $w;
4151	$widget->{h} = $h;	4324	$widget->{h} = $h;
4152		4325
4153	$widget->emit (size_allocate => $w, $h);	4326	$widget->emit (size_allocate => $w, $h);
		4327	}
4154	}	4328	}
4155	}	4329	}
4156	}	4330	}
4157		4331
4158	while ($self->{post_alloc_hook}) {	4332	while ($self->{post_alloc_hook}) {
4159	$_->()	4333	$_->()
4160	for values %{delete $self->{post_alloc_hook}};	4334	for values %{delete $self->{post_alloc_hook}};
4161	}	4335	}
4162
4163		4336
4164	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4337	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4165	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4338	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4166	glClear GL_COLOR_BUFFER_BIT;	4339	glClear GL_COLOR_BUFFER_BIT;
4167		4340

Diff Legend

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