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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
10	use CFClient::Texture;	11	use CFClient::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
…		…
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	68	my ($layout) = @_;
40		69
41	$LAYOUT = $layout;	70	$LAYOUT = $layout;
42	}	71	}
43		72
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	73	# class methods for events
73	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	76	if $FOCUS;
76	}	77	}
…		…
88	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
89		90
90	$GRAB = $widget;	91	$GRAB = $widget;
91	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
92		93
93	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
94	}	95	}
95		96
96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
97		98
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
…		…
113	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	116	$grab->update if $grab;
116	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
117		118
118	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
119	}	120	}
120	}	121	}
121		122
122	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
123	my ($ev) = @_;	124	my ($ev) = @_;
…		…
129	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
130		131
131	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
132	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
133		134
134	check_tooltip;	135	$TOOLTIP_WATCHER->start;
135	}	136	}
136		137
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	139	if $HOVER;
139	}	140	}
…		…
271		272
272	return unless $self->{visible};	273	return unless $self->{visible};
273		274
274	$_->set_invisible for $self->children;	275	$_->set_invisible for $self->children;
275		276
		277	delete $self->{visible};
276	delete $self->{root};	278	delete $self->{root};
277	delete $self->{visible};
278		279
279	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
281		282
282	CFClient::UI::check_tooltip	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
284		285
285	$self->focus_out;	286	$self->focus_out;
286		287
287	$self->emit (visibility_change => 0);	288	$self->emit (visibility_change => 0);
…		…
314	}	315	}
315		316
316	sub move_abs {	317	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	318	my ($self, $x, $y, $z) = @_;
318		319
319	$self->{x} = List::Util::max 0, int $x;	320	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320	$self->{y} = List::Util::max 0, int $y;	321	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321	$self->{z} = $z if defined $z;	322	$self->{z} = $z if defined $z;
322		323
323	$self->update;	324	$self->update;
324	}	325	}
325		326
…		…
371	sub size_allocate {	372	sub size_allocate {
372	# nothing to be done	373	# nothing to be done
373	}	374	}
374		375
375	sub children {	376	sub children {
		377	# nop
		378	}
		379
		380	sub visible_children {
		381	$_[0]->children
376	}	382	}
377		383
378	sub set_max_size {	384	sub set_max_size {
379	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
380		386
381	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
382	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
383	}	391	}
384		392
385	sub set_tooltip {	393	sub set_tooltip {
386	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
387		395
…		…
392		400
393	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
394		402
395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
397	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
398	}	406	}
399	}	407	}
400		408
401	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
402	sub coord2local {	410	sub coord2local {
…		…
439		447
440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441	unless $FOCUS;	449	unless $FOCUS;
442	}	450	}
443		451
444	sub mouse_motion { }	452	sub mouse_motion { 0 }
445	sub button_up { }	453	sub button_up { 0 }
446	sub key_down { }	454	sub key_down { 0 }
447	sub key_up { }	455	sub key_up { 0 }
448		456
449	sub button_down {	457	sub button_down {
450	my ($self, $ev, $x, $y) = @_;	458	my ($self, $ev, $x, $y) = @_;
451		459
452	$self->focus_in;	460	$self->focus_in;
		461
		462	0
453	}	463	}
454		464
455	sub find_widget {	465	sub find_widget {
456	my ($self, $x, $y) = @_;	466	my ($self, $x, $y) = @_;
457		467
…		…
541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543		553
544	glPushMatrix;	554	glPushMatrix;
545	glTranslate $self->{x}, $self->{y}, 0;	555	glTranslate $self->{x}, $self->{y}, 0;
546	$self->_draw;
547	glPopMatrix;
548		556
549	if ($self == $HOVER && $self->{can_hover}) {	557	if ($self == $HOVER && $self->{can_hover}) {
550	my ($x, $y) = @$self{qw(x y)};
551
552	glColor 1, 0.8, 0.5, 0.2;	558	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553	glEnable GL_BLEND;	559	glEnable GL_BLEND;
554	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555	glBegin GL_QUADS;	561	glBegin GL_QUADS;
556	glVertex $x , $y;	562	glVertex 0 , 0;
557	glVertex $x + $self->{w}, $y;	563	glVertex $self->{w}, 0;
558	glVertex $x + $self->{w}, $y + $self->{h};	564	glVertex $self->{w}, $self->{h};
559	glVertex $x , $y + $self->{h};	565	glVertex 0 , $self->{h};
560	glEnd;	566	glEnd;
561	glDisable GL_BLEND;	567	glDisable GL_BLEND;
562	}	568	}
563		569
564	if ($ENV{CFPLUS_DEBUG} & 1) {	570	if ($ENV{CFPLUS_DEBUG} & 1) {
565	glPushMatrix;	571	glPushMatrix;
566	glColor 1, 1, 0, 1;	572	glColor 1, 1, 0, 1;
567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	573	glTranslate 0.375, 0.375;
568	glBegin GL_LINE_LOOP;	574	glBegin GL_LINE_LOOP;
569	glVertex 0 , 0;	575	glVertex 0 , 0;
570	glVertex $self->{w} - 1, 0;	576	glVertex $self->{w} - 1, 0;
571	glVertex $self->{w} - 1, $self->{h} - 1;	577	glVertex $self->{w} - 1, $self->{h} - 1;
572	glVertex 0 , $self->{h} - 1;	578	glVertex 0 , $self->{h} - 1;
573	glEnd;	579	glEnd;
574	glPopMatrix;	580	glPopMatrix;
575	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
576	}	582	}
		583
		584	$self->_draw;
		585	glPopMatrix;
577	}	586	}
578		587
579	sub _draw {	588	sub _draw {
580	my ($self) = @_;	589	my ($self) = @_;
581		590
…		…
584		593
585	sub DESTROY {	594	sub DESTROY {
586	my ($self) = @_;	595	my ($self) = @_;
587		596
588	delete $WIDGET{$self+0};	597	delete $WIDGET{$self+0};
589	#$self->deactivate;	598
		599	eval { $self->destroy };
		600	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
590	}	601	}
591		602
592	#############################################################################	603	#############################################################################
593		604
594	package CFClient::UI::DrawBG;	605	package CFClient::UI::DrawBG;
…		…
619		630
620	if ($color && (@$color < 4 || $color->[3])) {	631	if ($color && (@$color < 4 || $color->[3])) {
621	my ($w, $h) = @$self{qw(w h)};	632	my ($w, $h) = @$self{qw(w h)};
622		633
623	glEnable GL_BLEND;	634	glEnable GL_BLEND;
624	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	635	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625	glColor @$color;	636	glColor_premultiply @$color;
626		637
627	glBegin GL_QUADS;	638	glBegin GL_QUADS;
628	glVertex 0 , 0;	639	glVertex 0 , 0;
629	glVertex 0 , $h;	640	glVertex 0 , $h;
630	glVertex $w, $h;	641	glVertex $w, $h;
…		…
661	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFClient::UI::Base::;
662		673
663	sub new {	674	sub new {
664	my ($class, %arg) = @_;	675	my ($class, %arg) = @_;
665		676
666	my $children = delete $arg{children} || [];	677	my $children = delete $arg{children};
667		678
668	my $self = $class->SUPER::new (	679	my $self = $class->SUPER::new (
669	children => [],	680	children => [],
670	can_events => 0,	681	can_events => 0,
671	%arg,	682	%arg,
672	);	683	);
		684
673	$self->add ($_) for @$children;	685	$self->add (@$children)
		686	if $children;
674		687
675	$self	688	$self
676	}	689	}
677		690
678	sub add {	691	sub add {
…		…
726	$x -= $self->{x};	739	$x -= $self->{x};
727	$y -= $self->{y};	740	$y -= $self->{y};
728		741
729	my $res;	742	my $res;
730		743
731	for (reverse @{ $self->{children} }) {	744	for (reverse $self->visible_children) {
732	$res = $_->find_widget ($x, $y)	745	$res = $_->find_widget ($x, $y)
733	and return $res;	746	and return $res;
734	}	747	}
735		748
736	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	749	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
757	}	770	}
758		771
759	sub add {	772	sub add {
760	my ($self, $child) = @_;	773	my ($self, $child) = @_;
761		774
762	$self->{children} = [];	775	$self->SUPER::remove ($_) for @{ $self->{children} };
763
764	$self->SUPER::add ($child);	776	$self->SUPER::add ($child);
765	}	777	}
766		778
767	sub remove {	779	sub remove {
768	my ($self, $widget) = @_;	780	my ($self, $widget) = @_;
…		…
784		796
785	$self->{children}[0]->configure (0, 0, $w, $h);	797	$self->{children}[0]->configure (0, 0, $w, $h);
786	}	798	}
787		799
788	#############################################################################	800	#############################################################################
		801
		802	# back-buffered drawing area
789		803
790	package CFClient::UI::Window;	804	package CFClient::UI::Window;
791		805
792	our @ISA = CFClient::UI::Bin::;	806	our @ISA = CFClient::UI::Bin::;
793		807
…		…
845	my $tex = $self->{texture}	859	my $tex = $self->{texture}
846	or return;	860	or return;
847		861
848	glEnable GL_TEXTURE_2D;	862	glEnable GL_TEXTURE_2D;
849	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850	glColor 1, 1, 1, 1;	864	glColor 0, 0, 0, 1;
851		865
852	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853		867
854	glDisable GL_TEXTURE_2D;	868	glDisable GL_TEXTURE_2D;
855	}	869	}
…		…
946	package CFClient::UI::ScrolledWindow;	960	package CFClient::UI::ScrolledWindow;
947		961
948	our @ISA = CFClient::UI::HBox::;	962	our @ISA = CFClient::UI::HBox::;
949		963
950	sub new {	964	sub new {
951	my $class = shift;	965	my ($class, %arg) = @_;
		966
		967	my $child = delete $arg{child};
952		968
953	my $self;	969	my $self;
954		970
955	my $slider = new CFClient::UI::Slider	971	my $slider = new CFClient::UI::Slider
956	vertical => 1,	972	vertical => 1,
…		…
961	;	977	;
962		978
963	$self = $class->SUPER::new (	979	$self = $class->SUPER::new (
964	vp => (new CFClient::UI::ViewPort expand => 1),	980	vp => (new CFClient::UI::ViewPort expand => 1),
965	slider => $slider,	981	slider => $slider,
966	@_,	982	%arg,
967	);	983	);
968		984
969	$self->{vp}->add ($self->{scrolled});
970	$self->add ($self->{vp});
971	$self->add ($self->{slider});	985	$self->SUPER::add ($self->{vp}, $self->{slider});
		986	$self->add ($child) if $child;
972		987
973	$self	988	$self
		989	}
		990
		991	sub add {
		992	my ($self, $widget) = @_;
		993
		994	$self->{vp}->add ($self->{child} = $widget);
974	}	995	}
975		996
976	sub update {	997	sub update {
977	my ($self) = @_;	998	my ($self) = @_;
978		999
…		…
1017		1038
1018	if ($self->{bg}) {	1039	if ($self->{bg}) {
1019	my ($w, $h) = @$self{qw(w h)};	1040	my ($w, $h) = @$self{qw(w h)};
1020		1041
1021	glEnable GL_BLEND;	1042	glEnable GL_BLEND;
1022	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1043	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023	glColor @{ $self->{bg} };	1044	glColor_premultiply @{ $self->{bg} };
1024		1045
1025	glBegin GL_QUADS;	1046	glBegin GL_QUADS;
1026	glVertex 0 , 0;	1047	glVertex 0 , 0;
1027	glVertex 0 , $h;	1048	glVertex 0 , $h;
1028	glVertex $w, $h;	1049	glVertex $w, $h;
…		…
1050	my @border =	1071	my @border =
1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1073	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053		1074
1054	sub new {	1075	sub new {
1055	my $class = shift;	1076	my ($class, %arg) = @_;
1056		1077
1057	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
1058	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
1059	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
1060	border => 0.6,	1081	border => 0.6,
1061	can_events => 1,	1082	can_events => 1,
1062	min_w => 16,	1083	min_w => 16,
1063	min_h => 16,	1084	min_h => 16,
1064	@_	1085	%arg,
1065	);	1086	);
1066		1087
1067	$self->{title} &&= new CFClient::UI::Label	1088	$self->{title_widget} = new CFClient::UI::Label
1068	align => 0,	1089	align => 0,
1069	valign => 1,	1090	valign => 1,
1070	text => $self->{title},	1091	text => $self->{title},
1071	fontsize => $self->{border};	1092	fontsize => $self->{border},
		1093	if exists $self->{title};
1072		1094
1073	$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_widget}) if $self->{title_widget};
1074	}	1103	}
1075		1104
1076	sub border {	1105	sub border {
1077	int $_[0]{border} * $::FONTSIZE	1106	int $_[0]{border} * $::FONTSIZE
1078	}	1107	}
1079		1108
1080	sub size_request {	1109	sub size_request {
1081	my ($self) = @_;	1110	my ($self) = @_;
		1111
		1112	$self->{title_widget}->size_request
		1113	if $self->{title_widget};
1082		1114
1083	my ($w, $h) = $self->SUPER::size_request;	1115	my ($w, $h) = $self->SUPER::size_request;
1084		1116
1085	(	1117	(
1086	$w + $self->border * 2,	1118	$w + $self->border * 2,
…		…
1089	}	1121	}
1090		1122
1091	sub size_allocate {	1123	sub size_allocate {
1092	my ($self, $w, $h) = @_;	1124	my ($self, $w, $h) = @_;
1093		1125
		1126	if ($self->{title_widget}) {
		1127	$self->{title_widget}{w} = $w;
		1128	$self->{title_widget}{h} = $h;
		1129	$self->{title_widget}->size_allocate ($w, $h);
		1130	}
		1131
		1132	my $border = $self->border;
		1133
1094	$h -= List::Util::max 0, $self->border * 2;	1134	$h -= List::Util::max 0, $border * 2;
1095	$w -= List::Util::max 0, $self->border * 2;	1135	$w -= List::Util::max 0, $border * 2;
1096		1136
1097	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1098	if $self->{title};
1099
1100	$self->child->configure ($self->border, $self->border, $w, $h);	1137	$self->child->configure ($border, $border, $w, $h);
1101	}	1138	}
1102		1139
1103	sub button_down {	1140	sub button_down {
1104	my ($self, $ev, $x, $y) = @_;	1141	my ($self, $ev, $x, $y) = @_;
1105		1142
…		…
1124	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1125		1162
1126	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1127	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128		1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129	$self->realloc;	1167	$self->realloc;
1130	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1131	};	1168	};
1132		1169
1133	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1134	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1135	my ($bx, $by) = ($self->{x}, $self->{y});	1172	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1138	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1139		1176
1140	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1141		1178
1142	$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});
1143	};	1182	};
		1183	} else {
		1184	return 0;
		1185	}
		1186
1144	}	1187	1
1145	}	1188	}
1146		1189
1147	sub button_up {	1190	sub button_up {
1148	my ($self, $ev, $x, $y) = @_;	1191	my ($self, $ev, $x, $y) = @_;
1149		1192
1150	delete $self->{motion};	1193	!!delete $self->{motion}
1151	}	1194	}
1152		1195
1153	sub mouse_motion {	1196	sub mouse_motion {
1154	my ($self, $ev, $x, $y) = @_;	1197	my ($self, $ev, $x, $y) = @_;
1155		1198
1156	$self->{motion}->($ev, $x, $y) if $self->{motion};	1199	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1200
		1201	!!$self->{motion}
1157	}	1202	}
1158		1203
1159	sub _draw {	1204	sub _draw {
1160	my ($self) = @_;	1205	my ($self) = @_;
1161		1206
		1207	my $child = $self->{children}[0];
		1208
1162	my ($w, $h ) = ($self->{w}, $self->{h});	1209	my ($w, $h ) = ($self->{w}, $self->{h});
1163	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1210	my ($cw, $ch) = ($child->{w}, $child->{h});
1164		1211
1165	glEnable GL_TEXTURE_2D;	1212	glEnable GL_TEXTURE_2D;
1166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1167		1214
1168	my $border = $self->border;	1215	my $border = $self->border;
…		…
1183	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1230	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184	}	1231	}
1185		1232
1186	glDisable GL_TEXTURE_2D;	1233	glDisable GL_TEXTURE_2D;
1187		1234
1188	$self->{title}->draw if $self->{title};
1189
1190	$self->child->draw;	1235	$child->draw;
		1236
		1237	if ($self->{title_widget}) {
		1238	glTranslate 0, $border - $self->{h};
		1239	$self->{title_widget}->_draw;
		1240	}
1191	}	1241	}
1192		1242
1193	#############################################################################	1243	#############################################################################
1194		1244
1195	package CFClient::UI::Table;	1245	package CFClient::UI::Table;
…		…
1218		1268
1219	$child->set_parent ($self);	1269	$child->set_parent ($self);
1220	$self->{children}[$y][$x] = $child;	1270	$self->{children}[$y][$x] = $child;
1221		1271
1222	$self->realloc;	1272	$self->realloc;
		1273	}
		1274
		1275	sub remove {
		1276	my ($self, $child) = @_;
		1277
		1278	# TODO: not yet implemented
1223	}	1279	}
1224		1280
1225	# TODO: move to container class maybe? send children a signal on removal?	1281	# TODO: move to container class maybe? send children a signal on removal?
1226	sub clear {	1282	sub clear {
1227	my ($self) = @_;	1283	my ($self) = @_;
…		…
1488		1544
1489	delete $self->{texture};	1545	delete $self->{texture};
1490	$self->SUPER::update;	1546	$self->SUPER::update;
1491	}	1547	}
1492		1548
		1549	sub realloc {
		1550	my ($self) = @_;
		1551
		1552	delete $self->{ox};
		1553	$self->SUPER::realloc;
		1554	}
		1555
1493	sub set_text {	1556	sub set_text {
1494	my ($self, $text) = @_;	1557	my ($self, $text) = @_;
1495		1558
1496	return if $self->{text} eq "T$text";	1559	return if $self->{text} eq "T$text";
1497	$self->{text} = "T$text";	1560	$self->{text} = "T$text";
1498		1561
1499	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1562	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1500	$self->{layout}->set_text ($text);	1563	$self->{layout}->set_text ($text);
1501		1564
		1565	delete $self->{size_req};
1502	$self->realloc;	1566	$self->realloc;
1503	$self->update;	1567	$self->update;
1504	}	1568	}
1505		1569
1506	sub set_markup {	1570	sub set_markup {
…		…
1512	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1576	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1513		1577
1514	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1578	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1515	$self->{layout}->set_markup ($markup);	1579	$self->{layout}->set_markup ($markup);
1516		1580
		1581	delete $self->{size_req};
1517	$self->realloc;	1582	$self->realloc;
1518	$self->update;	1583	$self->update;
1519	}	1584	}
1520		1585
1521	sub size_request {	1586	sub size_request {
1522	my ($self) = @_;	1587	my ($self) = @_;
1523		1588
		1589	$self->{size_req} ||= do {
1524	$self->{layout}->set_font ($self->{font}) if $self->{font};	1590	$self->{layout}->set_font ($self->{font}) if $self->{font};
1525	$self->{layout}->set_width ($self->{max_w} || -1);	1591	$self->{layout}->set_width ($self->{max_w} || -1);
1526	$self->{layout}->set_ellipsise ($self->{ellipsise});	1592	$self->{layout}->set_ellipsise ($self->{ellipsise});
1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1593	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1594	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529		1595
1530	my ($w, $h) = $self->{layout}->size;	1596	my ($w, $h) = $self->{layout}->size;
1531		1597
1532	if (exists $self->{template}) {	1598	if (exists $self->{template}) {
1533	$self->{template}->set_font ($self->{font}) if $self->{font};	1599	$self->{template}->set_font ($self->{font}) if $self->{font};
1534	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1600	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1535		1601
1536	my ($w2, $h2) = $self->{template}->size;	1602	my ($w2, $h2) = $self->{template}->size;
1537		1603
1538	$w = List::Util::max $w, $w2;	1604	$w = List::Util::max $w, $w2;
1539	$h = List::Util::max $h, $h2;	1605	$h = List::Util::max $h, $h2;
		1606	}
		1607
		1608	[$w, $h]
1540	}	1609	};
1541		1610
1542	($w, $h)	1611	@{ $self->{size_req} }
1543	}	1612	}
1544		1613
1545	sub size_allocate {	1614	sub size_allocate {
1546	my ($self, $w, $h) = @_;	1615	my ($self, $w, $h) = @_;
1547		1616
		1617	delete $self->{ox};
		1618
1548	delete $self->{texture}	1619	delete $self->{texture}
1549	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1620	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1550	}	1621	}
1551		1622
1552	sub set_fontsize {	1623	sub set_fontsize {
…		…
1554		1625
1555	$self->{fontsize} = $fontsize;	1626	$self->{fontsize} = $fontsize;
1556	delete $self->{texture};	1627	delete $self->{texture};
1557		1628
1558	$self->realloc;	1629	$self->realloc;
		1630	}
		1631
		1632	sub reconfigure {
		1633	my ($self) = @_;
		1634
		1635	delete $self->{size_req};
		1636
		1637	$self->SUPER::reconfigure;
1559	}	1638	}
1560		1639
1561	sub _draw {	1640	sub _draw {
1562	my ($self) = @_;	1641	my ($self) = @_;
1563		1642
…		…
1569	$self->{layout}->set_width ($self->{w});	1648	$self->{layout}->set_width ($self->{w});
1570	$self->{layout}->set_ellipsise ($self->{ellipsise});	1649	$self->{layout}->set_ellipsise ($self->{ellipsise});
1571	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1650	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1572	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1651	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573		1652
1574	my $tex = new_from_layout CFClient::Texture $self->{layout};	1653	new_from_layout CFClient::Texture $self->{layout}
		1654	};
1575		1655
		1656	unless (exists $self->{ox}) {
1576	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1657	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1577	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1658	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1578	: ($self->{w} - $tex->{w}) * 0.5);	1659	: ($self->{w} - $tex->{w}) * 0.5);
1579		1660
1580	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1661	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1581	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1662	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1582	: ($self->{h} - $tex->{h}) * 0.5);	1663	: ($self->{h} - $tex->{h}) * 0.5);
1583
1584	$tex
1585	};	1664	};
1586		1665
1587	glEnable GL_TEXTURE_2D;	1666	glEnable GL_TEXTURE_2D;
1588	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1667
		1668	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1669	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1589		1670
1590	if ($tex->{format} == GL_ALPHA) {	1671	if ($tex->{format} == GL_ALPHA) {
		1672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1591	glColor @{$self->{fg}};	1673	glColor @{$self->{fg}};
1592	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1674	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1593	} else {	1675	} else {
		1676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1677	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1595	}	1678	}
1596		1679
1597	glDisable GL_TEXTURE_2D;	1680	glDisable GL_TEXTURE_2D;
1598	}	1681	}
1599		1682
…		…
1616	can_hover => 1,	1699	can_hover => 1,
1617	can_focus => 1,	1700	can_focus => 1,
1618	valign => 0,	1701	valign => 0,
1619	can_events => 1,	1702	can_events => 1,
1620	#text => ...	1703	#text => ...
		1704	#hidden => "*",
1621	@_	1705	@_
1622	)	1706	)
1623	}	1707	}
1624		1708
1625	sub _set_text {	1709	sub _set_text {
…		…
1627		1711
1628	delete $self->{cur_h};	1712	delete $self->{cur_h};
1629		1713
1630	return if $self->{text} eq $text;	1714	return if $self->{text} eq $text;
1631		1715
1632	delete $self->{texture};
1633
1634	$self->{last_activity} = $::NOW;	1716	$self->{last_activity} = $::NOW;
1635	$self->{text} = $text;	1717	$self->{text} = $text;
1636		1718
1637	$text =~ s/./*/g if $self->{hidden};	1719	$text =~ s/./*/g if $self->{hidden};
1638	$self->{layout}->set_text ("$text ");	1720	$self->{layout}->set_text ("$text ");
		1721	delete $self->{size_req};
1639		1722
1640	$self->_emit (changed => $self->{text});	1723	$self->_emit (changed => $self->{text});
		1724
		1725	$self->realloc;
		1726	$self->update;
1641	}	1727	}
1642		1728
1643	sub set_text {	1729	sub set_text {
1644	my ($self, $text) = @_;	1730	my ($self, $text) = @_;
1645		1731
1646	$self->{cursor} = length $text;	1732	$self->{cursor} = length $text;
1647	$self->_set_text ($text);	1733	$self->_set_text ($text);
1648
1649	$self->realloc;
1650	}	1734	}
1651		1735
1652	sub get_text {	1736	sub get_text {
1653	$_[0]{text}	1737	$_[0]{text}
1654	}	1738	}
…		…
1684	$self->{cursor} = length $text;	1768	$self->{cursor} = length $text;
1685	} elsif ($uni == 27) {	1769	} elsif ($uni == 27) {
1686	$self->_emit ('escape');	1770	$self->_emit ('escape');
1687	} elsif ($uni) {	1771	} elsif ($uni) {
1688	substr $text, $self->{cursor}++, 0, chr $uni;	1772	substr $text, $self->{cursor}++, 0, chr $uni;
		1773	} else {
		1774	return 0;
1689	}	1775	}
1690		1776
1691	$self->_set_text ($text);	1777	$self->_set_text ($text);
1692		1778
1693	$self->realloc;	1779	$self->realloc;
		1780
		1781	1
1694	}	1782	}
1695		1783
1696	sub focus_in {	1784	sub focus_in {
1697	my ($self) = @_;	1785	my ($self) = @_;
1698		1786
…		…
1713	utf8::encode $text;	1801	utf8::encode $text;
1714	$self->{cursor} = length substr $text, 0, $idx;	1802	$self->{cursor} = length substr $text, 0, $idx;
1715		1803
1716	$self->_set_text ($self->{text});	1804	$self->_set_text ($self->{text});
1717	$self->update;	1805	$self->update;
		1806
		1807	1
1718	}	1808	}
1719		1809
1720	sub mouse_motion {	1810	sub mouse_motion {
1721	my ($self, $ev, $x, $y) = @_;	1811	my ($self, $ev, $x, $y) = @_;
1722	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1812	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1813
		1814	0
1723	}	1815	}
1724		1816
1725	sub _draw {	1817	sub _draw {
1726	my ($self) = @_;	1818	my ($self) = @_;
1727		1819
1728	local $self->{fg} = $self->{fg};	1820	local $self->{fg} = $self->{fg};
1729		1821
1730	if ($FOCUS == $self) {	1822	if ($FOCUS == $self) {
1731	glColor @{$self->{active_bg}};	1823	glColor_premultiply @{$self->{active_bg}};
1732	$self->{fg} = $self->{active_fg};	1824	$self->{fg} = $self->{active_fg};
1733	} else {	1825	} else {
1734	glColor @{$self->{bg}};	1826	glColor_premultiply @{$self->{bg}};
1735	}	1827	}
1736		1828
1737	glEnable GL_BLEND;	1829	glEnable GL_BLEND;
1738	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1830	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1739	glBegin GL_QUADS;	1831	glBegin GL_QUADS;
1740	glVertex 0 , 0;	1832	glVertex 0 , 0;
1741	glVertex 0 , $self->{h};	1833	glVertex 0 , $self->{h};
1742	glVertex $self->{w}, $self->{h};	1834	glVertex $self->{w}, $self->{h};
1743	glVertex $self->{w}, 0;	1835	glVertex $self->{w}, 0;
…		…
1804	} else {	1896	} else {
1805	$self->set_text ($self->{history_saveback});	1897	$self->set_text ($self->{history_saveback});
1806	}	1898	}
1807		1899
1808	} else {	1900	} else {
1809	$self->SUPER::key_down ($ev);	1901	return $self->SUPER::key_down ($ev)
		1902	}
		1903
1810	}	1904	1
1811
1812	}	1905	}
1813		1906
1814	#############################################################################	1907	#############################################################################
1815		1908
1816	package CFClient::UI::Button;	1909	package CFClient::UI::Button;
…		…
1845	my ($self, $ev, $x, $y) = @_;	1938	my ($self, $ev, $x, $y) = @_;
1846		1939
1847	$self->emit ("activate")	1940	$self->emit ("activate")
1848	if $x >= 0 && $x < $self->{w}	1941	if $x >= 0 && $x < $self->{w}
1849	&& $y >= 0 && $y < $self->{h};	1942	&& $y >= 0 && $y < $self->{h};
		1943
		1944	1
1850	}	1945	}
1851		1946
1852	sub _draw {	1947	sub _draw {
1853	my ($self) = @_;	1948	my ($self) = @_;
1854		1949
1855	local $self->{fg} = $self->{fg};	1950	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1856
1857	if ($GRAB == $self) {
1858	$self->{fg} = $self->{active_fg};
1859	}
1860		1951
1861	glEnable GL_TEXTURE_2D;	1952	glEnable GL_TEXTURE_2D;
1862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1863	glColor 0, 0, 0, 1;	1954	glColor 0, 0, 0, 1;
1864		1955
…		…
1908		1999
1909	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2000	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1910	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2001	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1911	$self->{state} = !$self->{state};	2002	$self->{state} = !$self->{state};
1912	$self->_emit (changed => $self->{state});	2003	$self->_emit (changed => $self->{state});
		2004	} else {
		2005	return 0
		2006	}
		2007
1913	}	2008	1
1914	}	2009	}
1915		2010
1916	sub _draw {	2011	sub _draw {
1917	my ($self) = @_;	2012	my ($self) = @_;
1918		2013
…		…
2085		2180
2086	my $h1 = $self->{h} * (1 - $ycut1);	2181	my $h1 = $self->{h} * (1 - $ycut1);
2087	my $h2 = $self->{h} * (1 - $ycut2);	2182	my $h2 = $self->{h} * (1 - $ycut2);
2088		2183
2089	glEnable GL_BLEND;	2184	glEnable GL_BLEND;
2090	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2185	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2186	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2091	glEnable GL_TEXTURE_2D;	2187	glEnable GL_TEXTURE_2D;
2092	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2188	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2093		2189
2094	glBindTexture GL_TEXTURE_2D, $t1->{name};	2190	glBindTexture GL_TEXTURE_2D, $t1->{name};
2095	glBegin GL_QUADS;	2191	glBegin GL_QUADS;
…		…
2216	sub set_range {	2312	sub set_range {
2217	my ($self, $range) = @_;	2313	my ($self, $range) = @_;
2218		2314
2219	($range, $self->{range}) = ($self->{range}, $range);	2315	($range, $self->{range}) = ($self->{range}, $range);
2220		2316
2221	$self->update
2222	if "@$range" ne "@{$self->{range}}";	2317	if ("@$range" ne "@{$self->{range}}") {
		2318	$self->update;
		2319	$self->set_value ($self->{range}[0]);
		2320	}
2223	}	2321	}
2224		2322
2225	sub set_value {	2323	sub set_value {
2226	my ($self, $value) = @_;	2324	my ($self, $value) = @_;
2227		2325
…		…
2256		2354
2257	$self->SUPER::button_down ($ev, $x, $y);	2355	$self->SUPER::button_down ($ev, $x, $y);
2258		2356
2259	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2357	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260		2358
2261	$self->mouse_motion ($ev, $x, $y);	2359	$self->mouse_motion ($ev, $x, $y)
2262	}	2360	}
2263		2361
2264	sub mouse_motion {	2362	sub mouse_motion {
2265	my ($self, $ev, $x, $y) = @_;	2363	my ($self, $ev, $x, $y) = @_;
2266		2364
…		…
2270	my (undef, $lo, $hi, $page) = @{$self->{range}};	2368	my (undef, $lo, $hi, $page) = @{$self->{range}};
2271		2369
2272	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2370	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2273		2371
2274	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2372	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2373	} else {
		2374	return 0;
		2375	}
		2376
2275	}	2377	1
2276	}	2378	}
2277		2379
2278	sub update {	2380	sub update {
2279	my ($self) = @_;	2381	my ($self) = @_;
2280		2382
2281	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2383	delete $self->{knob_w};
		2384	$self->SUPER::update;
		2385	}
		2386
		2387	sub _draw {
		2388	my ($self) = @_;
		2389
		2390	unless ($self->{knob_w}) {
2282	$self->set_value ($self->{range}[0]);	2391	$self->set_value ($self->{range}[0]);
2283		2392
2284	my ($value, $lo, $hi, $page) = @{$self->{range}};	2393	my ($value, $lo, $hi, $page) = @{$self->{range}};
2285	my $range = ($hi - $page - $lo) || 1e-100;	2394	my $range = ($hi - $page - $lo) || 1e-100;
2286		2395
…		…
2292	$value = ($value - $lo) / $range;	2401	$value = ($value - $lo) / $range;
2293	$value = $value * $self->{scale} + $self->{offset};	2402	$value = $value * $self->{scale} + $self->{offset};
2294		2403
2295	$self->{knob_x} = $value - $knob_w * 0.5;	2404	$self->{knob_x} = $value - $knob_w * 0.5;
2296	$self->{knob_w} = $knob_w;	2405	$self->{knob_w} = $knob_w;
2297	});	2406	}
2298
2299	$self->SUPER::update;
2300	}
2301
2302	sub _draw {
2303	my ($self) = @_;
2304		2407
2305	$self->SUPER::_draw ();	2408	$self->SUPER::_draw ();
2306		2409
2307	glScale $self->{w}, $self->{h};	2410	glScale $self->{w}, $self->{h};
2308		2411
…		…
2369	sub set_range { shift->{slider}->set_range (@_) }	2472	sub set_range { shift->{slider}->set_range (@_) }
2370	sub set_value { shift->{slider}->set_value (@_) }	2473	sub set_value { shift->{slider}->set_value (@_) }
2371		2474
2372	#############################################################################	2475	#############################################################################
2373		2476
2374	package CFClient::UI::TextView;	2477	package CFClient::UI::TextScroller;
2375		2478
2376	our @ISA = CFClient::UI::HBox::;	2479	our @ISA = CFClient::UI::HBox::;
2377		2480
2378	use CFClient::OpenGL;	2481	use CFClient::OpenGL;
2379		2482
…		…
2381	my $class = shift;	2484	my $class = shift;
2382		2485
2383	my $self = $class->SUPER::new (	2486	my $self = $class->SUPER::new (
2384	fontsize => 1,	2487	fontsize => 1,
2385	can_events => 0,	2488	can_events => 0,
		2489	indent => 0,
2386	#font => default_font	2490	#font => default_font
2387	@_,	2491	@_,
2388		2492
2389	layout => (new CFClient::Layout 1),	2493	layout => (new CFClient::Layout 1),
2390	par => [],	2494	par => [],
…		…
2413	$self->SUPER::size_allocate ($w, $h);	2517	$self->SUPER::size_allocate ($w, $h);
2414		2518
2415	$self->{layout}->set_font ($self->{font}) if $self->{font};	2519	$self->{layout}->set_font ($self->{font}) if $self->{font};
2416	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2520	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2417	$self->{layout}->set_width ($self->{children}[0]{w});	2521	$self->{layout}->set_width ($self->{children}[0]{w});
		2522	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2418		2523
2419	$self->reflow;	2524	$self->reflow;
2420	}	2525	}
2421		2526
2422	sub text_size {	2527	sub text_size {
…		…
2424		2529
2425	my $layout = $self->{layout};	2530	my $layout = $self->{layout};
2426		2531
2427	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2532	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2428	$layout->set_width ($self->{children}[0]{w} - $indent);	2533	$layout->set_width ($self->{children}[0]{w} - $indent);
		2534	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2429	$layout->set_markup ($text);	2535	$layout->set_markup ($text);
2430		2536
2431	$layout->size	2537	$layout->size
2432	}	2538	}
2433		2539
…		…
2472		2578
2473	return unless $self->{h} > 0;	2579	return unless $self->{h} > 0;
2474		2580
2475	delete $self->{texture};	2581	delete $self->{texture};
2476		2582
2477	$ROOT->on_post_alloc ($self, sub {	2583	$ROOT->on_post_alloc ($self => sub {
2478	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2584	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479		2585
2480	if (delete $self->{need_reflow}) {	2586	if (delete $self->{need_reflow}) {
2481	my $height = 0;	2587	my $height = 0;
2482		2588
…		…
2485	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2591	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486		2592
2487	for (@{$self->{par}}) {	2593	for (@{$self->{par}}) {
2488	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2594	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2489	$layout->set_width ($W - $_->[3]);	2595	$layout->set_width ($W - $_->[3]);
		2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2490	$layout->set_markup ($_->[4]);	2597	$layout->set_markup ($_->[4]);
2491	my ($w, $h) = $layout->size;	2598	my ($w, $h) = $layout->size;
2492	$_->[0] = $w + $_->[3];	2599	$_->[0] = $w + $_->[3];
2493	$_->[1] = $h;	2600	$_->[1] = $h;
2494	}	2601	}
…		…
2497	}	2604	}
2498		2605
2499	$self->{height} = $height;	2606	$self->{height} = $height;
2500		2607
2501	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2608	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2502		2609
2503	delete $self->{texture};	2610	delete $self->{texture};
2504	}	2611	}
2505		2612
2506	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2613	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2507	glClearColor 0.5, 0.5, 0.5, 0;	2614	glClearColor 0, 0, 0, 0;
2508	glClear GL_COLOR_BUFFER_BIT;	2615	glClear GL_COLOR_BUFFER_BIT;
2509		2616
2510	my $top = int $self->{children}[1]{range}[0];	2617	my $top = int $self->{children}[1]{range}[0];
2511		2618
2512	my $y0 = $top;	2619	my $y0 = $top;
…		…
2526	my $h = $par->[1];	2633	my $h = $par->[1];
2527		2634
2528	if ($y0 < $y + $h && $y < $y1) {	2635	if ($y0 < $y + $h && $y < $y1) {
2529	$layout->set_foreground (@{ $par->[2] });	2636	$layout->set_foreground (@{ $par->[2] });
2530	$layout->set_width ($W - $par->[3]);	2637	$layout->set_width ($W - $par->[3]);
		2638	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2531	$layout->set_markup ($par->[4]);	2639	$layout->set_markup ($par->[4]);
2532		2640
2533	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2641	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2534		2642
2535	glRasterPos $par->[3], $y - $y0;	2643	glRasterPos $par->[3], $y - $y0;
…		…
2547	sub _draw {	2655	sub _draw {
2548	my ($self) = @_;	2656	my ($self) = @_;
2549		2657
2550	glEnable GL_TEXTURE_2D;	2658	glEnable GL_TEXTURE_2D;
2551	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2659	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552	glColor 1, 1, 1, 1;	2660	glColor 0, 0, 0, 1;
2553	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2661	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2554	glDisable GL_TEXTURE_2D;	2662	glDisable GL_TEXTURE_2D;
2555		2663
2556	$self->{children}[1]->draw;	2664	$self->{children}[1]->draw;
2557		2665
2558	}	2666	}
…		…
2649	$tooltip .= "\n\n" . (ref $widget) . "\n"	2757	$tooltip .= "\n\n" . (ref $widget) . "\n"
2650	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2758	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651	. "req $widget->{req_w} $widget->{req_h}\n"	2759	. "req $widget->{req_w} $widget->{req_h}\n"
2652	. "visible $widget->{visible}";	2760	. "visible $widget->{visible}";
2653	}	2761	}
		2762
		2763	$tooltip =~ s/^\n+//;
		2764	$tooltip =~ s/\n+$//;
2654		2765
2655	$self->add (new CFClient::UI::Label	2766	$self->add (new CFClient::UI::Label
2656	markup => $tooltip,	2767	markup => $tooltip,
2657	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2768	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2658	fontsize => 0.8,	2769	fontsize => 0.8,
…		…
2686	or return;	2797	or return;
2687		2798
2688	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2799	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689		2800
2690	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2801	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691	if $x + $self->{w} > $::WIDTH;	2802	if $x + $self->{w} > $self->{root}{w};
2692		2803
2693	$self->move_abs ($x, $y);	2804	$self->move_abs ($x, $y);
2694	});	2805	});
2695	}	2806	}
2696		2807
…		…
2785	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2896	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2786		2897
2787	if ($tex) {	2898	if ($tex) {
2788	glEnable GL_TEXTURE_2D;	2899	glEnable GL_TEXTURE_2D;
2789	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2900	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2790	glColor 1, 1, 1, 1;	2901	glColor 0, 0, 0, 1;
2791	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2902	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2792	glDisable GL_TEXTURE_2D;	2903	glDisable GL_TEXTURE_2D;
2793	}	2904	}
2794	}	2905	}
2795		2906
2796	sub DESTROY {	2907	sub destroy {
2797	my ($self) = @_;	2908	my ($self) = @_;
2798		2909
2799	$self->{timer}->cancel	2910	$self->{timer}->cancel
2800	if $self->{timer};	2911	if $self->{timer};
2801		2912
2802	$self->SUPER::DESTROY;	2913	$self->SUPER::destroy;
2803	}	2914	}
		2915
		2916	#############################################################################
		2917
		2918	package CFClient::UI::Buttonbar;
		2919
		2920	our @ISA = CFClient::UI::HBox::;
		2921
		2922	# TODO: should actualyl wrap buttons and other goodies.
2804		2923
2805	#############################################################################	2924	#############################################################################
2806		2925
2807	package CFClient::UI::Menu;	2926	package CFClient::UI::Menu;
2808		2927
…		…
2820	);	2939	);
2821		2940
2822	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2941	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2823		2942
2824	for my $item (@{ $self->{items} }) {	2943	for my $item (@{ $self->{items} }) {
2825	my ($widget, $cb) = @$item;	2944	my ($widget, $cb, $tooltip) = @$item;
2826		2945
2827	# handle various types of items, only text for now	2946	# handle various types of items, only text for now
2828	if (!ref $widget) {	2947	if (!ref $widget) {
2829	$widget = new CFClient::UI::Label	2948	$widget = new CFClient::UI::Label
2830	can_hover => 1,	2949	can_hover => 1,
2831	can_events => 1,	2950	can_events => 1,
2832	text => $widget;	2951	markup => $widget,
		2952	tooltip => $tooltip
2833	}	2953	}
2834		2954
2835	$self->{item}{$widget} = $item;	2955	$self->{item}{$widget} = $item;
2836		2956
2837	$self->{vbox}->add ($widget);	2957	$self->{vbox}->add ($widget);
…		…
2858	my ($self, $ev, $x, $y) = @_;	2978	my ($self, $ev, $x, $y) = @_;
2859		2979
2860	# TODO: should use vbox->find_widget or so	2980	# TODO: should use vbox->find_widget or so
2861	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2981	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2862	$self->{hover} = $self->{item}{$HOVER};	2982	$self->{hover} = $self->{item}{$HOVER};
		2983
		2984	0
2863	}	2985	}
2864		2986
2865	sub button_up {	2987	sub button_up {
2866	my ($self, $ev, $x, $y) = @_;	2988	my ($self, $ev, $x, $y) = @_;
2867		2989
…		…
2869	undef $GRAB;	2991	undef $GRAB;
2870	$self->hide;	2992	$self->hide;
2871		2993
2872	$self->_emit ("popdown");	2994	$self->_emit ("popdown");
2873	$self->{hover}[1]->() if $self->{hover};	2995	$self->{hover}[1]->() if $self->{hover};
		2996	} else {
		2997	return 0
		2998	}
		2999
2874	}	3000	1
2875	}	3001	}
2876		3002
2877	#############################################################################	3003	#############################################################################
2878		3004
2879	package CFClient::UI::Statusbox;	3005	package CFClient::UI::Multiplexer;
2880		3006
2881	our @ISA = CFClient::UI::VBox::;	3007	our @ISA = CFClient::UI::Container::;
2882		3008
2883	sub new {	3009	sub new {
2884	my $class = shift;	3010	my $class = shift;
2885		3011
2886	$class->SUPER::new (	3012	my $self = $class->SUPER::new (
		3013	@_,
		3014	);
		3015
		3016	$self->{current} = $self->{children}[0]
		3017	if @{ $self->{children} };
		3018
		3019	$self
		3020	}
		3021
		3022	sub add {
		3023	my ($self, @widgets) = @_;
		3024
		3025	$self->SUPER::add (@widgets);
		3026
		3027	$self->{current} = $self->{children}[0]
		3028	if @{ $self->{children} };
		3029	}
		3030
		3031	sub set_current_page {
		3032	my ($self, $page_or_widget) = @_;
		3033
		3034	my $widget = ref $page_or_widget
		3035	? $page_or_widget
		3036	: $self->{children}[$page_or_widget];
		3037
		3038	$self->{current} = $widget;
		3039	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3040
		3041	$self->_emit (page_changed => $self->{current});
		3042
		3043	$self->realloc;
		3044	}
		3045
		3046	sub visible_children {
		3047	$_[0]{current}
		3048	}
		3049
		3050	sub size_request {
		3051	my ($self) = @_;
		3052
		3053	$self->{current}->size_request
		3054	}
		3055
		3056	sub size_allocate {
		3057	my ($self, $w, $h) = @_;
		3058
		3059	$self->{current}->configure (0, 0, $w, $h);
		3060	}
		3061
		3062	sub _draw {
		3063	my ($self) = @_;
		3064
		3065	$self->{current}->draw;
		3066	}
		3067
		3068	#############################################################################
		3069
		3070	package CFClient::UI::Notebook;
		3071
		3072	our @ISA = CFClient::UI::VBox::;
		3073
		3074	sub new {
		3075	my $class = shift;
		3076
		3077	my $self = $class->SUPER::new (
		3078	buttonbar => (new CFClient::UI::Buttonbar),
		3079	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3080	# filter => # will be put between multiplexer and $self
		3081	@_,
		3082	);
		3083
		3084	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3085	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3086
		3087	$self
		3088	}
		3089
		3090	sub add {
		3091	my ($self, $title, $widget, $tooltip) = @_;
		3092
		3093	Scalar::Util::weaken $self;
		3094
		3095	$self->{buttonbar}->add (new CFClient::UI::Button
		3096	markup => $title,
		3097	tooltip => $tooltip,
		3098	on_activate => sub { $self->set_current_page ($widget) },
		3099	);
		3100
		3101	$self->{multiplexer}->add ($widget);
		3102	}
		3103
		3104	sub set_current_page {
		3105	my ($self, $page) = @_;
		3106
		3107	$self->{multiplexer}->set_current_page ($page);
		3108	$self->_emit (page_changed => $self->{multiplexer}{current});
		3109	}
		3110
		3111	#############################################################################
		3112
		3113	package CFClient::UI::Combobox;
		3114
		3115	use utf8;
		3116
		3117	our @ISA = CFClient::UI::Button::;
		3118
		3119	sub new {
		3120	my $class = shift;
		3121
		3122	my $self = $class->SUPER::new (
		3123	options => [], # [value, title, longdesc], ...
		3124	value => undef,
		3125	@_,
		3126	);
		3127
		3128	$self->_set_value ($self->{value});
		3129
		3130	$self
		3131	}
		3132
		3133	sub button_down {
		3134	my ($self, $ev) = @_;
		3135
		3136	my @menu_items;
		3137
		3138	for (@{ $self->{options} }) {
		3139	my ($value, $title, $tooltip) = @$_;
		3140
		3141	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3142	}
		3143
		3144	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3145	}
		3146
		3147	sub _set_value {
		3148	my ($self, $value) = @_;
		3149
		3150	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3151	or return;
		3152
		3153	$self->{value} = $item->[0];
		3154	$self->set_markup ("$item->[1] ⇓");
		3155	$self->set_tooltip ($item->[2]);
		3156	}
		3157
		3158	sub set_value {
		3159	my ($self, $value) = @_;
		3160
		3161	return unless $self->{value} ne $value;
		3162
		3163	$self->_set_value ($value);
		3164	$self->_emit (changed => $value);
		3165	}
		3166
		3167	#############################################################################
		3168
		3169	package CFClient::UI::Statusbox;
		3170
		3171	our @ISA = CFClient::UI::VBox::;
		3172
		3173	sub new {
		3174	my $class = shift;
		3175
		3176	my $self = $class->SUPER::new (
2887	fontsize => 0.8,	3177	fontsize => 0.8,
2888	@_,	3178	@_,
2889	)	3179	);
		3180
		3181	Scalar::Util::weaken (my $this = $self);
		3182
		3183	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3184
		3185	$self
2890	}	3186	}
2891		3187
2892	sub reorder {	3188	sub reorder {
2893	my ($self) = @_;	3189	my ($self) = @_;
2894	my $NOW = time;	3190	my $NOW = Time::HiRes::time;
		3191
		3192	# freeze display when hovering over any label
		3193	return if $CFClient::UI::TOOLTIP->{owner}
		3194	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3195	values %{ $self->{item} };
2895		3196
2896	while (my ($k, $v) = each %{ $self->{item} }) {	3197	while (my ($k, $v) = each %{ $self->{item} }) {
2897	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3198	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2898	}	3199	}
2899		3200
…		…
2902	my @items = sort {	3203	my @items = sort {
2903	$a->{pri} <=> $b->{pri}	3204	$a->{pri} <=> $b->{pri}
2904	or $b->{id} <=> $a->{id}	3205	or $b->{id} <=> $a->{id}
2905	} values %{ $self->{item} };	3206	} values %{ $self->{item} };
2906		3207
		3208	$self->{timer}->interval (1);
		3209
2907	my $count = 10 + 1;	3210	my $count = 10 + 1;
2908	for my $item (@items) {	3211	for my $item (@items) {
2909	last unless --$count;	3212	last unless --$count;
2910		3213
2911	push @widgets, $item->{label} ||= do {	3214	my $label = $item->{label} ||= do {
2912	# TODO: doesn't handle markup well (read as: at all)	3215	# TODO: doesn't handle markup well (read as: at all)
2913	my $short = $item->{count} > 1	3216	my $short = $item->{count} > 1
2914	? "<b>$item->{count} ×</b> $item->{text}"	3217	? "<b>$item->{count} ×</b> $item->{text}"
2915	: $item->{text};	3218	: $item->{text};
2916		3219
…		…
2924	tooltip => $item->{tooltip},	3227	tooltip => $item->{tooltip},
2925	tooltip_font => $::FONT_PROP,	3228	tooltip_font => $::FONT_PROP,
2926	tooltip_width => 0.67,	3229	tooltip_width => 0.67,
2927	fontsize => $item->{fontsize} || $self->{fontsize},	3230	fontsize => $item->{fontsize} || $self->{fontsize},
2928	max_w => $::WIDTH * 0.44,	3231	max_w => $::WIDTH * 0.44,
2929	fg => $item->{fg},	3232	fg => [@{ $item->{fg} }],
2930	can_events => 1,	3233	can_events => 1,
2931	can_hover => 1	3234	can_hover => 1
2932	};	3235	};
		3236
		3237	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3238	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3239	$label->update;
		3240	$label->set_max_size (undef, $label->{req_h} * $diff)
		3241	if $diff < 1;
		3242	$self->{timer}->interval (1/30);
		3243	} else {
		3244	$label->{fg}[3] = $item->{fg}[3] || 1;
		3245	}
		3246
		3247	push @widgets, $label;
2933	}	3248	}
2934		3249
2935	$self->clear;	3250	$self->clear;
2936	$self->SUPER::add (reverse @widgets);	3251	$self->SUPER::add (reverse @widgets);
2937	}	3252	}
…		…
2942	$text =~ s/^\s+//;	3257	$text =~ s/^\s+//;
2943	$text =~ s/\s+$//;	3258	$text =~ s/\s+$//;
2944		3259
2945	return unless $text;	3260	return unless $text;
2946		3261
2947	my $timeout = time + ((delete $arg{timeout}) || 60);	3262	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2948		3263
2949	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3264	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2950		3265
2951	if (my $item = $self->{item}{$group}) {	3266	if (my $item = $self->{item}{$group}) {
2952	if ($item->{text} eq $text) {	3267	if ($item->{text} eq $text) {
2953	$item->{count}++;	3268	$item->{count}++;
2954	} else {	3269	} else {
2955	$item->{count} = 1;	3270	$item->{count} = 1;
2956	$item->{text} = $item->{tooltip} = $text;	3271	$item->{text} = $item->{tooltip} = $text;
2957	}	3272	}
2958	$item->{id} = ++$self->{id};	3273	$item->{id} += 0.2;#d#
2959	$item->{timeout} = $timeout;	3274	$item->{timeout} = $timeout;
2960	delete $item->{label};	3275	delete $item->{label};
2961	} else {	3276	} else {
2962	$self->{item}{$group} = {	3277	$self->{item}{$group} = {
2963	id => ++$self->{id},	3278	id => ++$self->{id},
…		…
2982		3297
2983	$self->reorder;	3298	$self->reorder;
2984	$self->SUPER::reconfigure;	3299	$self->SUPER::reconfigure;
2985	}	3300	}
2986		3301
		3302	sub destroy {
		3303	my ($self) = @_;
		3304
		3305	$self->{timer}->cancel;
		3306
		3307	$self->SUPER::destroy;
		3308	}
		3309
2987	#############################################################################	3310	#############################################################################
2988		3311
2989	package CFClient::UI::Inventory;	3312	package CFClient::UI::Inventory;
2990		3313
2991	our @ISA = CFClient::UI::ScrolledWindow::;	3314	our @ISA = CFClient::UI::ScrolledWindow::;
2992		3315
2993	sub new {	3316	sub new {
2994	my $class = shift;	3317	my $class = shift;
2995		3318
2996	my $self = $class->SUPER::new (	3319	my $self = $class->SUPER::new (
2997	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3320	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2998	@_,	3321	@_,
2999	);	3322	);
3000		3323
3001	$self	3324	$self
3002	}	3325	}
3003		3326
3004	sub set_items {	3327	sub set_items {
3005	my ($self, $items) = @_;	3328	my ($self, $items) = @_;
3006		3329
3007	$self->{scrolled}->clear;	3330	$self->{child}->clear;
3008	return unless $items;	3331	return unless $items;
3009		3332
3010	my @items = sort {	3333	my @items = sort {
3011	($a->{type} <=> $b->{type})	3334	($a->{type} <=> $b->{type})
3012	or ($a->{name} cmp $b->{name})	3335	or ($a->{name} cmp $b->{name})
…		…
3016		3339
3017	my $row = 0;	3340	my $row = 0;
3018	for my $item (@items) {	3341	for my $item (@items) {
3019	CFClient::Item::update_widgets $item;	3342	CFClient::Item::update_widgets $item;
3020		3343
3021	$self->{scrolled}->add (0, $row, $item->{face_widget});	3344	$self->{child}->add (0, $row, $item->{face_widget});
3022	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3345	$self->{child}->add (1, $row, $item->{desc_widget});
3023	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3346	$self->{child}->add (2, $row, $item->{weight_widget});
3024		3347
3025	$row++;	3348	$row++;
3026	}	3349	}
3027	}	3350	}
3028		3351
…		…
3126	$rec = $::CONN->stop_record if $::CONN;	3449	$rec = $::CONN->stop_record if $::CONN;
3127	return unless ref $rec eq 'ARRAY';	3450	return unless ref $rec eq 'ARRAY';
3128	$self->set_command_list ($rec);	3451	$self->set_command_list ($rec);
3129	}	3452	}
3130		3453
3131	# if $commit is true, the binding will be set after the user entered a key combo	3454
		3455	sub ask_for_bind_and_commit {
		3456	my ($self) = @_;
		3457	$self->ask_for_bind (1);
		3458	}
		3459
3132	sub ask_for_bind {	3460	sub ask_for_bind {
3133	my ($self, $commit) = @_;	3461	my ($self, $commit) = @_;
3134		3462
3135	CFClient::Binder::open_binding_dialog (sub {	3463	CFClient::Binder::open_binding_dialog (sub {
3136	my ($mod, $sym) = @_;	3464	my ($mod, $sym) = @_;
…		…
3220		3548
3221	#############################################################################	3549	#############################################################################
3222		3550
3223	package CFClient::UI::SpellList;	3551	package CFClient::UI::SpellList;
3224		3552
3225	our @ISA = CFClient::UI::FancyFrame::;	3553	our @ISA = CFClient::UI::Table::;
3226		3554
3227	sub new {	3555	sub new {
3228	my $class = shift;	3556	my $class = shift;
3229		3557
3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3558	my $self = $class->SUPER::new (
3231		3559	binding => [],
3232	$self->add (new CFClient::UI::ScrolledWindow	3560	commands => [],
3233	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3561	@_,
3234		3562	)
3235	$self;
3236	}	3563	}
3237		3564
3238	# XXX: Do sorting? Argl...	3565	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3566
		3567	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3568	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3569	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3570	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3571	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3572	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3573	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3574	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3575	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3576	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3577
		3578	sub rebuild_spell_list {
		3579	my ($self) = @_;
		3580
		3581	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3582	$self->clear;
		3583
		3584	return unless $::CONN;
		3585
		3586	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3587	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3588	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3589	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3590	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3591
		3592	my $row = 0;
		3593
		3594	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3595	my $spell = $self->{spell}{$_};
		3596
		3597	$row++;
		3598
		3599	my $spell_cb = sub {
		3600	my ($widget, $ev) = @_;
		3601
		3602	if ($ev->{button} == 1) {
		3603	$::CONN->user_send ("cast $spell->{name}");
		3604	} elsif ($ev->{button} == 2) {
		3605	$::CONN->user_send ("invoke $spell->{name}");
		3606	} elsif ($ev->{button} == 3) {
		3607	(new CFClient::UI::Menu
		3608	items => [
		3609	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3610	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3611	],
		3612	)->popup ($ev);
		3613	} else {
		3614	return 0;
		3615	}
		3616
		3617	1
		3618	};
		3619
		3620	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3621
		3622	#TODO: add path info to tooltip
		3623	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3624
		3625	$self->add (0, $row, new CFClient::UI::Face
		3626	face => $spell->{face},
		3627	can_hover => 1,
		3628	can_events => 1,
		3629	tooltip => $tooltip,
		3630	on_button_down => $spell_cb,
		3631	);
		3632
		3633	$self->add (1, $row, new CFClient::UI::Label
		3634	expand => 1,
		3635	text => $spell->{name},
		3636	can_hover => 1,
		3637	can_events => 1,
		3638	tooltip => $tooltip,
		3639	on_button_down => $spell_cb,
		3640	);
		3641
		3642	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3643	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3644	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3645	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3646	}
		3647	});
		3648	}
		3649
3239	sub add_spell {	3650	sub add_spell {
3240	my ($self, $spell) = @_;	3651	my ($self, $spell) = @_;
		3652
3241	$self->{spells}->{$spell->{name}} = $spell;	3653	$self->{spell}->{$spell->{name}} = $spell;
3242		3654	$self->rebuild_spell_list;
3243	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244	face => $spell->{face},
3245	can_hover => 1,
3246	can_events => 1,
3247	tooltip => $spell->{message});
3248
3249	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250	text => $spell->{name},
3251	can_hover => 1,
3252	can_events => 1,
3253	tooltip => $spell->{message},
3254	expand => 1);
3255
3256	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259	expand => 1);
3260
3261	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262	text => "bind to key",
3263	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264	}
3265
3266	sub rebuild_spell_list {
3267	my ($self) = @_;
3268	$self->{tbl_idx} = 0;
3269	$self->add_spell ($_) for values %{$self->{spells}};
3270	}	3655	}
3271		3656
3272	sub remove_spell {	3657	sub remove_spell {
3273	my ($self, $spell) = @_;	3658	my ($self, $spell) = @_;
		3659
3274	delete $self->{spells}->{$spell->{name}};	3660	delete $self->{spell}->{$spell->{name}};
3275	$self->rebuild_spell_list;	3661	$self->rebuild_spell_list;
3276	}	3662	}
3277		3663
		3664	sub clear_spells {
		3665	my ($self) = @_;
		3666
		3667	$self->{spell} = {};
		3668	$self->rebuild_spell_list;
		3669	}
		3670
3278	#############################################################################	3671	#############################################################################
3279		3672
3280	package CFClient::UI::Root;	3673	package CFClient::UI::Root;
3281		3674
3282	our @ISA = CFClient::UI::Container::;	3675	our @ISA = CFClient::UI::Container::;
		3676
		3677	use List::Util qw(min max);
3283		3678
3284	use CFClient::OpenGL;	3679	use CFClient::OpenGL;
3285		3680
3286	sub new {	3681	sub new {
3287	my $class = shift;	3682	my $class = shift;
…		…
3422		3817
3423	delete $queue{$widget+0};	3818	delete $queue{$widget+0};
3424		3819
3425	my ($w, $h) = $widget->size_request;	3820	my ($w, $h) = $widget->size_request;
3426		3821
3427	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3822	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3823	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3824
		3825	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3826	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3429		3827
3430	$w = $widget->{force_w} if exists $widget->{force_w};	3828	$w = $widget->{force_w} if exists $widget->{force_w};
3431	$h = $widget->{force_h} if exists $widget->{force_h};	3829	$h = $widget->{force_h} if exists $widget->{force_h};
3432		3830
3433	if ($widget->{req_w} != $w || $widget->{req_h} != $h	3831	if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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