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.269 by root, Fri Jun 2 06:22:55 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 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;
…		…
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, %arg) = @_;	1076	my ($class, %arg) = @_;
1056
1057	my $title = delete $arg{title};
1058		1077
1059	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
1060	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
1061	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
1062	border => 0.6,	1081	border => 0.6,
…		…
1064	min_w => 16,	1083	min_w => 16,
1065	min_h => 16,	1084	min_h => 16,
1066	%arg,	1085	%arg,
1067	);	1086	);
1068		1087
1069	$self->{title} = new CFClient::UI::Label	1088	$self->{title_widget} = new CFClient::UI::Label
1070	align => 0,	1089	align => 0,
1071	valign => 1,	1090	valign => 1,
1072	text => $title,	1091	text => $self->{title},
1073	fontsize => $self->{border}	1092	fontsize => $self->{border},
1074	if defined $title;	1093	if exists $self->{title};
		1094
		1095	unless ($self->{no_close_button}) {
		1096	$self->{close_btn} =
		1097	new CFClient::UI::ImageButton
		1098	image => 'x1_close.png',
		1099	on_activate => sub { $self->hide };
		1100
		1101	$self->CFClient::UI::Container::add ($self->{close_btn});
		1102	}
1075		1103
1076	$self	1104	$self
1077	}	1105	}
1078		1106
1079	sub add {	1107	sub add {
1080	my ($self, @widgets) = @_;	1108	my ($self, @widgets) = @_;
1081		1109
1082	$self->SUPER::add (@widgets);	1110	$self->SUPER::add (@widgets);
		1111	$self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1112	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084	}	1113	}
1085		1114
1086	sub border {	1115	sub border {
1087	int $_[0]{border} * $::FONTSIZE	1116	int $_[0]{border} * $::FONTSIZE
1088	}	1117	}
1089		1118
1090	sub size_request {	1119	sub size_request {
1091	my ($self) = @_;	1120	my ($self) = @_;
1092		1121
1093	$self->{title}->size_request	1122	$self->{title_widget}->size_request
1094	if $self->{title};	1123	if $self->{title_widget};
		1124
		1125	$self->{close_btn}->size_request
		1126	if $self->{close_btn};
1095		1127
1096	my ($w, $h) = $self->SUPER::size_request;	1128	my ($w, $h) = $self->SUPER::size_request;
1097		1129
1098	(	1130	(
1099	$w + $self->border * 2,	1131	$w + $self->border * 2,
…		…
1102	}	1134	}
1103		1135
1104	sub size_allocate {	1136	sub size_allocate {
1105	my ($self, $w, $h) = @_;	1137	my ($self, $w, $h) = @_;
1106		1138
1107	if ($self->{title}) {	1139	if ($self->{title_widget}) {
1108	$self->{title}{w} = $w;	1140	$self->{title_widget}{w} = $w;
1109	$self->{title}{h} = $h;	1141	$self->{title_widget}{h} = $h;
1110	$self->{title}->size_allocate ($w, $h);	1142	$self->{title_widget}->size_allocate ($w, $h);
1111	}	1143	}
1112		1144
1113	my $border = $self->border;	1145	my $border = $self->border;
1114		1146
1115	$h -= List::Util::max 0, $border * 2;	1147	$h -= List::Util::max 0, $border * 2;
1116	$w -= List::Util::max 0, $border * 2;	1148	$w -= List::Util::max 0, $border * 2;
1117		1149
1118	$self->child->configure ($border, $border, $w, $h);	1150	$self->child->configure ($border, $border, $w, $h);
		1151
		1152	$self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
		1153	if $self->{close_btn};
1119	}	1154	}
1120		1155
1121	sub button_down {	1156	sub button_down {
1122	my ($self, $ev, $x, $y) = @_;	1157	my ($self, $ev, $x, $y) = @_;
1123		1158
…		…
1142	my $dy = $ev->{y} - $oy;	1177	my $dy = $ev->{y} - $oy;
1143		1178
1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1179	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1180	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146		1181
		1182	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147	$self->realloc;	1183	$self->realloc;
1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149	};	1184	};
1150		1185
1151	} elsif ($lr ^ $td) {	1186	} elsif ($lr ^ $td) {
1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1187	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153	my ($bx, $by) = ($self->{x}, $self->{y});	1188	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1156	my ($ev, $x, $y) = @_;	1191	my ($ev, $x, $y) = @_;
1157		1192
1158	($x, $y) = ($ev->{x}, $ev->{y});	1193	($x, $y) = ($ev->{x}, $ev->{y});
1159		1194
1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1195	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1196	# HACK: the next line is required to enforce placement
		1197	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1161	};	1198	};
		1199	} else {
		1200	return 0;
		1201	}
		1202
1162	}	1203	1
1163	}	1204	}
1164		1205
1165	sub button_up {	1206	sub button_up {
1166	my ($self, $ev, $x, $y) = @_;	1207	my ($self, $ev, $x, $y) = @_;
1167		1208
		1209	$self->{close_btn}->button_up ($ev, $x, $y)
		1210	if $self->{close_btn};
		1211
1168	delete $self->{motion};	1212	!!delete $self->{motion}
1169	}	1213	}
1170		1214
1171	sub mouse_motion {	1215	sub mouse_motion {
1172	my ($self, $ev, $x, $y) = @_;	1216	my ($self, $ev, $x, $y) = @_;
1173		1217
1174	$self->{motion}->($ev, $x, $y) if $self->{motion};	1218	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1219
		1220	!!$self->{motion}
1175	}	1221	}
1176		1222
1177	sub _draw {	1223	sub _draw {
1178	my ($self) = @_;	1224	my ($self) = @_;
1179		1225
…		…
1205		1251
1206	glDisable GL_TEXTURE_2D;	1252	glDisable GL_TEXTURE_2D;
1207		1253
1208	$child->draw;	1254	$child->draw;
1209		1255
1210	if ($self->{title}) {	1256	if ($self->{title_widget}) {
1211	glTranslate 0, $border - $self->{h};	1257	glTranslate 0, $border - $self->{h};
1212	$self->{title}->_draw;	1258	$self->{title_widget}->_draw;
		1259
		1260	glTranslate 0, - ($border - $self->{h});
1213	}	1261	}
		1262
		1263	$self->{close_btn}->draw
		1264	if $self->{close_btn};
1214	}	1265	}
1215		1266
1216	#############################################################################	1267	#############################################################################
1217		1268
1218	package CFClient::UI::Table;	1269	package CFClient::UI::Table;
…		…
1241		1292
1242	$child->set_parent ($self);	1293	$child->set_parent ($self);
1243	$self->{children}[$y][$x] = $child;	1294	$self->{children}[$y][$x] = $child;
1244		1295
1245	$self->realloc;	1296	$self->realloc;
		1297	}
		1298
		1299	sub remove {
		1300	my ($self, $child) = @_;
		1301
		1302	# TODO: not yet implemented
1246	}	1303	}
1247		1304
1248	# TODO: move to container class maybe? send children a signal on removal?	1305	# TODO: move to container class maybe? send children a signal on removal?
1249	sub clear {	1306	sub clear {
1250	my ($self) = @_;	1307	my ($self) = @_;
…		…
1511		1568
1512	delete $self->{texture};	1569	delete $self->{texture};
1513	$self->SUPER::update;	1570	$self->SUPER::update;
1514	}	1571	}
1515		1572
		1573	sub realloc {
		1574	my ($self) = @_;
		1575
		1576	delete $self->{ox};
		1577	$self->SUPER::realloc;
		1578	}
		1579
1516	sub set_text {	1580	sub set_text {
1517	my ($self, $text) = @_;	1581	my ($self, $text) = @_;
1518		1582
1519	return if $self->{text} eq "T$text";	1583	return if $self->{text} eq "T$text";
1520	$self->{text} = "T$text";	1584	$self->{text} = "T$text";
1521		1585
1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523	$self->{layout}->set_text ($text);	1587	$self->{layout}->set_text ($text);
1524		1588
		1589	delete $self->{size_req};
1525	$self->realloc;	1590	$self->realloc;
1526	$self->update;	1591	$self->update;
1527	}	1592	}
1528		1593
1529	sub set_markup {	1594	sub set_markup {
…		…
1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536		1601
1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538	$self->{layout}->set_markup ($markup);	1603	$self->{layout}->set_markup ($markup);
1539		1604
		1605	delete $self->{size_req};
1540	$self->realloc;	1606	$self->realloc;
1541	$self->update;	1607	$self->update;
1542	}	1608	}
1543		1609
1544	sub size_request {	1610	sub size_request {
1545	my ($self) = @_;	1611	my ($self) = @_;
1546		1612
		1613	$self->{size_req} ||= do {
1547	$self->{layout}->set_font ($self->{font}) if $self->{font};	1614	$self->{layout}->set_font ($self->{font}) if $self->{font};
1548	$self->{layout}->set_width ($self->{max_w} || -1);	1615	$self->{layout}->set_width ($self->{max_w} || -1);
1549	$self->{layout}->set_ellipsise ($self->{ellipsise});	1616	$self->{layout}->set_ellipsise ($self->{ellipsise});
1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1617	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1618	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552		1619
1553	my ($w, $h) = $self->{layout}->size;	1620	my ($w, $h) = $self->{layout}->size;
1554		1621
1555	if (exists $self->{template}) {	1622	if (exists $self->{template}) {
1556	$self->{template}->set_font ($self->{font}) if $self->{font};	1623	$self->{template}->set_font ($self->{font}) if $self->{font};
1557	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558		1625
1559	my ($w2, $h2) = $self->{template}->size;	1626	my ($w2, $h2) = $self->{template}->size;
1560		1627
1561	$w = List::Util::max $w, $w2;	1628	$w = List::Util::max $w, $w2;
1562	$h = List::Util::max $h, $h2;	1629	$h = List::Util::max $h, $h2;
		1630	}
		1631
		1632	[$w, $h]
1563	}	1633	};
1564		1634
1565	($w, $h)	1635	@{ $self->{size_req} }
1566	}	1636	}
1567		1637
1568	sub size_allocate {	1638	sub size_allocate {
1569	my ($self, $w, $h) = @_;	1639	my ($self, $w, $h) = @_;
1570		1640
…		…
1579		1649
1580	$self->{fontsize} = $fontsize;	1650	$self->{fontsize} = $fontsize;
1581	delete $self->{texture};	1651	delete $self->{texture};
1582		1652
1583	$self->realloc;	1653	$self->realloc;
		1654	}
		1655
		1656	sub reconfigure {
		1657	my ($self) = @_;
		1658
		1659	delete $self->{size_req};
		1660
		1661	$self->SUPER::reconfigure;
1584	}	1662	}
1585		1663
1586	sub _draw {	1664	sub _draw {
1587	my ($self) = @_;	1665	my ($self) = @_;
1588		1666
…		…
1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1609	: ($self->{h} - $tex->{h}) * 0.5);	1687	: ($self->{h} - $tex->{h}) * 0.5);
1610	};	1688	};
1611		1689
1612	glEnable GL_TEXTURE_2D;	1690	glEnable GL_TEXTURE_2D;
1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1691
		1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1614		1694
1615	if ($tex->{format} == GL_ALPHA) {	1695	if ($tex->{format} == GL_ALPHA) {
		1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1616	glColor @{$self->{fg}};	1697	glColor @{$self->{fg}};
1617	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1618	} else {	1699	} else {
		1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1619	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1620	}	1702	}
1621		1703
1622	glDisable GL_TEXTURE_2D;	1704	glDisable GL_TEXTURE_2D;
1623	}	1705	}
1624		1706
…		…
1641	can_hover => 1,	1723	can_hover => 1,
1642	can_focus => 1,	1724	can_focus => 1,
1643	valign => 0,	1725	valign => 0,
1644	can_events => 1,	1726	can_events => 1,
1645	#text => ...	1727	#text => ...
		1728	#hidden => "*",
1646	@_	1729	@_
1647	)	1730	)
1648	}	1731	}
1649		1732
1650	sub _set_text {	1733	sub _set_text {
…		…
1652		1735
1653	delete $self->{cur_h};	1736	delete $self->{cur_h};
1654		1737
1655	return if $self->{text} eq $text;	1738	return if $self->{text} eq $text;
1656		1739
1657	delete $self->{texture};
1658
1659	$self->{last_activity} = $::NOW;	1740	$self->{last_activity} = $::NOW;
1660	$self->{text} = $text;	1741	$self->{text} = $text;
1661		1742
1662	$text =~ s/./*/g if $self->{hidden};	1743	$text =~ s/./*/g if $self->{hidden};
1663	$self->{layout}->set_text ("$text ");	1744	$self->{layout}->set_text ("$text ");
		1745	delete $self->{size_req};
1664		1746
1665	$self->_emit (changed => $self->{text});	1747	$self->_emit (changed => $self->{text});
		1748
		1749	$self->realloc;
		1750	$self->update;
1666	}	1751	}
1667		1752
1668	sub set_text {	1753	sub set_text {
1669	my ($self, $text) = @_;	1754	my ($self, $text) = @_;
1670		1755
1671	$self->{cursor} = length $text;	1756	$self->{cursor} = length $text;
1672	$self->_set_text ($text);	1757	$self->_set_text ($text);
1673
1674	$self->realloc;
1675	}	1758	}
1676		1759
1677	sub get_text {	1760	sub get_text {
1678	$_[0]{text}	1761	$_[0]{text}
1679	}	1762	}
…		…
1709	$self->{cursor} = length $text;	1792	$self->{cursor} = length $text;
1710	} elsif ($uni == 27) {	1793	} elsif ($uni == 27) {
1711	$self->_emit ('escape');	1794	$self->_emit ('escape');
1712	} elsif ($uni) {	1795	} elsif ($uni) {
1713	substr $text, $self->{cursor}++, 0, chr $uni;	1796	substr $text, $self->{cursor}++, 0, chr $uni;
		1797	} else {
		1798	return 0;
1714	}	1799	}
1715		1800
1716	$self->_set_text ($text);	1801	$self->_set_text ($text);
1717		1802
1718	$self->realloc;	1803	$self->realloc;
		1804
		1805	1
1719	}	1806	}
1720		1807
1721	sub focus_in {	1808	sub focus_in {
1722	my ($self) = @_;	1809	my ($self) = @_;
1723		1810
…		…
1738	utf8::encode $text;	1825	utf8::encode $text;
1739	$self->{cursor} = length substr $text, 0, $idx;	1826	$self->{cursor} = length substr $text, 0, $idx;
1740		1827
1741	$self->_set_text ($self->{text});	1828	$self->_set_text ($self->{text});
1742	$self->update;	1829	$self->update;
		1830
		1831	1
1743	}	1832	}
1744		1833
1745	sub mouse_motion {	1834	sub mouse_motion {
1746	my ($self, $ev, $x, $y) = @_;	1835	my ($self, $ev, $x, $y) = @_;
1747	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1836	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1837
		1838	0
1748	}	1839	}
1749		1840
1750	sub _draw {	1841	sub _draw {
1751	my ($self) = @_;	1842	my ($self) = @_;
1752		1843
1753	local $self->{fg} = $self->{fg};	1844	local $self->{fg} = $self->{fg};
1754		1845
1755	if ($FOCUS == $self) {	1846	if ($FOCUS == $self) {
1756	glColor @{$self->{active_bg}};	1847	glColor_premultiply @{$self->{active_bg}};
1757	$self->{fg} = $self->{active_fg};	1848	$self->{fg} = $self->{active_fg};
1758	} else {	1849	} else {
1759	glColor @{$self->{bg}};	1850	glColor_premultiply @{$self->{bg}};
1760	}	1851	}
1761		1852
1762	glEnable GL_BLEND;	1853	glEnable GL_BLEND;
1763	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1854	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764	glBegin GL_QUADS;	1855	glBegin GL_QUADS;
1765	glVertex 0 , 0;	1856	glVertex 0 , 0;
1766	glVertex 0 , $self->{h};	1857	glVertex 0 , $self->{h};
1767	glVertex $self->{w}, $self->{h};	1858	glVertex $self->{w}, $self->{h};
1768	glVertex $self->{w}, 0;	1859	glVertex $self->{w}, 0;
…		…
1829	} else {	1920	} else {
1830	$self->set_text ($self->{history_saveback});	1921	$self->set_text ($self->{history_saveback});
1831	}	1922	}
1832		1923
1833	} else {	1924	} else {
1834	$self->SUPER::key_down ($ev);	1925	return $self->SUPER::key_down ($ev)
		1926	}
		1927
1835	}	1928	1
1836
1837	}	1929	}
1838		1930
1839	#############################################################################	1931	#############################################################################
1840		1932
1841	package CFClient::UI::Button;	1933	package CFClient::UI::Button;
…		…
1870	my ($self, $ev, $x, $y) = @_;	1962	my ($self, $ev, $x, $y) = @_;
1871		1963
1872	$self->emit ("activate")	1964	$self->emit ("activate")
1873	if $x >= 0 && $x < $self->{w}	1965	if $x >= 0 && $x < $self->{w}
1874	&& $y >= 0 && $y < $self->{h};	1966	&& $y >= 0 && $y < $self->{h};
		1967
		1968	1
1875	}	1969	}
1876		1970
1877	sub _draw {	1971	sub _draw {
1878	my ($self) = @_;	1972	my ($self) = @_;
1879		1973
1880	local $self->{fg} = $self->{fg};	1974	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882	if ($GRAB == $self) {
1883	$self->{fg} = $self->{active_fg};
1884	}
1885		1975
1886	glEnable GL_TEXTURE_2D;	1976	glEnable GL_TEXTURE_2D;
1887	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1977	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888	glColor 0, 0, 0, 1;	1978	glColor 0, 0, 0, 1;
1889		1979
1890	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1980	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1891		1981
1892	glDisable GL_TEXTURE_2D;	1982	glDisable GL_TEXTURE_2D;
1893		1983
1894	$self->SUPER::_draw;	1984	$self->SUPER::_draw;
		1985	}
		1986
		1987	#############################################################################
		1988
		1989	package CFClient::UI::ImageButton;
		1990
		1991	our @ISA = CFClient::UI::Image::;
		1992
		1993	use CFClient::OpenGL;
		1994
		1995	my %textures;
		1996
		1997	sub new {
		1998	my $class = shift;
		1999
		2000	my $self = $class->SUPER::new (
		2001	padding_x => 4,
		2002	padding_y => 4,
		2003	fg => [1, 1, 1],
		2004	active_fg => [0, 0, 1],
		2005	can_hover => 1,
		2006	align => 0,
		2007	valign => 0,
		2008	can_events => 1,
		2009	@_
		2010	);
		2011	}
		2012
		2013	sub activate { }
		2014
		2015	sub button_up {
		2016	my ($self, $ev, $x, $y) = @_;
		2017
		2018	$self->emit ("activate")
		2019	if $x >= 0 && $x < $self->{w}
		2020	&& $y >= 0 && $y < $self->{h};
		2021
		2022	1
1895	}	2023	}
1896		2024
1897	#############################################################################	2025	#############################################################################
1898		2026
1899	package CFClient::UI::CheckBox;	2027	package CFClient::UI::CheckBox;
…		…
1933		2061
1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2062	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2063	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936	$self->{state} = !$self->{state};	2064	$self->{state} = !$self->{state};
1937	$self->_emit (changed => $self->{state});	2065	$self->_emit (changed => $self->{state});
		2066	} else {
		2067	return 0
		2068	}
		2069
1938	}	2070	1
1939	}	2071	}
1940		2072
1941	sub _draw {	2073	sub _draw {
1942	my ($self) = @_;	2074	my ($self) = @_;
1943		2075
…		…
2110		2242
2111	my $h1 = $self->{h} * (1 - $ycut1);	2243	my $h1 = $self->{h} * (1 - $ycut1);
2112	my $h2 = $self->{h} * (1 - $ycut2);	2244	my $h2 = $self->{h} * (1 - $ycut2);
2113		2245
2114	glEnable GL_BLEND;	2246	glEnable GL_BLEND;
2115	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2247	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2248	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116	glEnable GL_TEXTURE_2D;	2249	glEnable GL_TEXTURE_2D;
2117	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2250	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118		2251
2119	glBindTexture GL_TEXTURE_2D, $t1->{name};	2252	glBindTexture GL_TEXTURE_2D, $t1->{name};
2120	glBegin GL_QUADS;	2253	glBegin GL_QUADS;
…		…
2241	sub set_range {	2374	sub set_range {
2242	my ($self, $range) = @_;	2375	my ($self, $range) = @_;
2243		2376
2244	($range, $self->{range}) = ($self->{range}, $range);	2377	($range, $self->{range}) = ($self->{range}, $range);
2245		2378
2246	$self->update
2247	if "@$range" ne "@{$self->{range}}";	2379	if ("@$range" ne "@{$self->{range}}") {
		2380	$self->update;
		2381	$self->set_value ($self->{range}[0]);
		2382	}
2248	}	2383	}
2249		2384
2250	sub set_value {	2385	sub set_value {
2251	my ($self, $value) = @_;	2386	my ($self, $value) = @_;
2252		2387
…		…
2281		2416
2282	$self->SUPER::button_down ($ev, $x, $y);	2417	$self->SUPER::button_down ($ev, $x, $y);
2283		2418
2284	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2419	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285		2420
2286	$self->mouse_motion ($ev, $x, $y);	2421	$self->mouse_motion ($ev, $x, $y)
2287	}	2422	}
2288		2423
2289	sub mouse_motion {	2424	sub mouse_motion {
2290	my ($self, $ev, $x, $y) = @_;	2425	my ($self, $ev, $x, $y) = @_;
2291		2426
…		…
2295	my (undef, $lo, $hi, $page) = @{$self->{range}};	2430	my (undef, $lo, $hi, $page) = @{$self->{range}};
2296		2431
2297	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2432	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298		2433
2299	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2434	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2435	} else {
		2436	return 0;
		2437	}
		2438
2300	}	2439	1
2301	}	2440	}
2302		2441
2303	sub update {	2442	sub update {
2304	my ($self) = @_;	2443	my ($self) = @_;
2305		2444
2306	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2445	delete $self->{knob_w};
		2446	$self->SUPER::update;
		2447	}
		2448
		2449	sub _draw {
		2450	my ($self) = @_;
		2451
		2452	unless ($self->{knob_w}) {
2307	$self->set_value ($self->{range}[0]);	2453	$self->set_value ($self->{range}[0]);
2308		2454
2309	my ($value, $lo, $hi, $page) = @{$self->{range}};	2455	my ($value, $lo, $hi, $page) = @{$self->{range}};
2310	my $range = ($hi - $page - $lo) || 1e-100;	2456	my $range = ($hi - $page - $lo) || 1e-100;
2311		2457
…		…
2317	$value = ($value - $lo) / $range;	2463	$value = ($value - $lo) / $range;
2318	$value = $value * $self->{scale} + $self->{offset};	2464	$value = $value * $self->{scale} + $self->{offset};
2319		2465
2320	$self->{knob_x} = $value - $knob_w * 0.5;	2466	$self->{knob_x} = $value - $knob_w * 0.5;
2321	$self->{knob_w} = $knob_w;	2467	$self->{knob_w} = $knob_w;
2322	});	2468	}
2323
2324	$self->SUPER::update;
2325	}
2326
2327	sub _draw {
2328	my ($self) = @_;
2329		2469
2330	$self->SUPER::_draw ();	2470	$self->SUPER::_draw ();
2331		2471
2332	glScale $self->{w}, $self->{h};	2472	glScale $self->{w}, $self->{h};
2333		2473
…		…
2394	sub set_range { shift->{slider}->set_range (@_) }	2534	sub set_range { shift->{slider}->set_range (@_) }
2395	sub set_value { shift->{slider}->set_value (@_) }	2535	sub set_value { shift->{slider}->set_value (@_) }
2396		2536
2397	#############################################################################	2537	#############################################################################
2398		2538
2399	package CFClient::UI::TextView;	2539	package CFClient::UI::TextScroller;
2400		2540
2401	our @ISA = CFClient::UI::HBox::;	2541	our @ISA = CFClient::UI::HBox::;
2402		2542
2403	use CFClient::OpenGL;	2543	use CFClient::OpenGL;
2404		2544
…		…
2406	my $class = shift;	2546	my $class = shift;
2407		2547
2408	my $self = $class->SUPER::new (	2548	my $self = $class->SUPER::new (
2409	fontsize => 1,	2549	fontsize => 1,
2410	can_events => 0,	2550	can_events => 0,
		2551	indent => 0,
2411	#font => default_font	2552	#font => default_font
2412	@_,	2553	@_,
2413		2554
2414	layout => (new CFClient::Layout 1),	2555	layout => (new CFClient::Layout 1),
2415	par => [],	2556	par => [],
…		…
2438	$self->SUPER::size_allocate ($w, $h);	2579	$self->SUPER::size_allocate ($w, $h);
2439		2580
2440	$self->{layout}->set_font ($self->{font}) if $self->{font};	2581	$self->{layout}->set_font ($self->{font}) if $self->{font};
2441	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2582	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442	$self->{layout}->set_width ($self->{children}[0]{w});	2583	$self->{layout}->set_width ($self->{children}[0]{w});
		2584	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443		2585
2444	$self->reflow;	2586	$self->reflow;
2445	}	2587	}
2446		2588
2447	sub text_size {	2589	sub text_size {
…		…
2449		2591
2450	my $layout = $self->{layout};	2592	my $layout = $self->{layout};
2451		2593
2452	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2594	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453	$layout->set_width ($self->{children}[0]{w} - $indent);	2595	$layout->set_width ($self->{children}[0]{w} - $indent);
		2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2454	$layout->set_markup ($text);	2597	$layout->set_markup ($text);
2455		2598
2456	$layout->size	2599	$layout->size
2457	}	2600	}
2458		2601
…		…
2497		2640
2498	return unless $self->{h} > 0;	2641	return unless $self->{h} > 0;
2499		2642
2500	delete $self->{texture};	2643	delete $self->{texture};
2501		2644
2502	$ROOT->on_post_alloc ($self, sub {	2645	$ROOT->on_post_alloc ($self => sub {
2503	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2646	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504		2647
2505	if (delete $self->{need_reflow}) {	2648	if (delete $self->{need_reflow}) {
2506	my $height = 0;	2649	my $height = 0;
2507		2650
…		…
2510	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2653	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511		2654
2512	for (@{$self->{par}}) {	2655	for (@{$self->{par}}) {
2513	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2656	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514	$layout->set_width ($W - $_->[3]);	2657	$layout->set_width ($W - $_->[3]);
		2658	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2515	$layout->set_markup ($_->[4]);	2659	$layout->set_markup ($_->[4]);
2516	my ($w, $h) = $layout->size;	2660	my ($w, $h) = $layout->size;
2517	$_->[0] = $w + $_->[3];	2661	$_->[0] = $w + $_->[3];
2518	$_->[1] = $h;	2662	$_->[1] = $h;
2519	}	2663	}
…		…
2522	}	2666	}
2523		2667
2524	$self->{height} = $height;	2668	$self->{height} = $height;
2525		2669
2526	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2670	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2527		2671
2528	delete $self->{texture};	2672	delete $self->{texture};
2529	}	2673	}
2530		2674
2531	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2675	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532	glClearColor 0.5, 0.5, 0.5, 0;	2676	glClearColor 0, 0, 0, 0;
2533	glClear GL_COLOR_BUFFER_BIT;	2677	glClear GL_COLOR_BUFFER_BIT;
2534		2678
2535	my $top = int $self->{children}[1]{range}[0];	2679	my $top = int $self->{children}[1]{range}[0];
2536		2680
2537	my $y0 = $top;	2681	my $y0 = $top;
…		…
2551	my $h = $par->[1];	2695	my $h = $par->[1];
2552		2696
2553	if ($y0 < $y + $h && $y < $y1) {	2697	if ($y0 < $y + $h && $y < $y1) {
2554	$layout->set_foreground (@{ $par->[2] });	2698	$layout->set_foreground (@{ $par->[2] });
2555	$layout->set_width ($W - $par->[3]);	2699	$layout->set_width ($W - $par->[3]);
		2700	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2556	$layout->set_markup ($par->[4]);	2701	$layout->set_markup ($par->[4]);
2557		2702
2558	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2703	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2559		2704
2560	glRasterPos $par->[3], $y - $y0;	2705	glRasterPos $par->[3], $y - $y0;
…		…
2572	sub _draw {	2717	sub _draw {
2573	my ($self) = @_;	2718	my ($self) = @_;
2574		2719
2575	glEnable GL_TEXTURE_2D;	2720	glEnable GL_TEXTURE_2D;
2576	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2721	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577	glColor 1, 1, 1, 1;	2722	glColor 0, 0, 0, 1;
2578	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2723	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579	glDisable GL_TEXTURE_2D;	2724	glDisable GL_TEXTURE_2D;
2580		2725
2581	$self->{children}[1]->draw;	2726	$self->{children}[1]->draw;
2582		2727
2583	}	2728	}
…		…
2674	$tooltip .= "\n\n" . (ref $widget) . "\n"	2819	$tooltip .= "\n\n" . (ref $widget) . "\n"
2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2820	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676	. "req $widget->{req_w} $widget->{req_h}\n"	2821	. "req $widget->{req_w} $widget->{req_h}\n"
2677	. "visible $widget->{visible}";	2822	. "visible $widget->{visible}";
2678	}	2823	}
		2824
		2825	$tooltip =~ s/^\n+//;
		2826	$tooltip =~ s/\n+$//;
2679		2827
2680	$self->add (new CFClient::UI::Label	2828	$self->add (new CFClient::UI::Label
2681	markup => $tooltip,	2829	markup => $tooltip,
2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2830	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683	fontsize => 0.8,	2831	fontsize => 0.8,
…		…
2711	or return;	2859	or return;
2712		2860
2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2861	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714		2862
2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2863	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716	if $x + $self->{w} > $::WIDTH;	2864	if $x + $self->{w} > $self->{root}{w};
2717		2865
2718	$self->move_abs ($x, $y);	2866	$self->move_abs ($x, $y);
2719	});	2867	});
2720	}	2868	}
2721		2869
…		…
2810	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2958	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811		2959
2812	if ($tex) {	2960	if ($tex) {
2813	glEnable GL_TEXTURE_2D;	2961	glEnable GL_TEXTURE_2D;
2814	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2962	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815	glColor 1, 1, 1, 1;	2963	glColor 0, 0, 0, 1;
2816	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2964	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817	glDisable GL_TEXTURE_2D;	2965	glDisable GL_TEXTURE_2D;
2818	}	2966	}
2819	}	2967	}
2820		2968
2821	sub DESTROY {	2969	sub destroy {
2822	my ($self) = @_;	2970	my ($self) = @_;
2823		2971
2824	$self->{timer}->cancel	2972	$self->{timer}->cancel
2825	if $self->{timer};	2973	if $self->{timer};
2826		2974
2827	$self->SUPER::DESTROY;	2975	$self->SUPER::destroy;
2828	}	2976	}
		2977
		2978	#############################################################################
		2979
		2980	package CFClient::UI::Buttonbar;
		2981
		2982	our @ISA = CFClient::UI::HBox::;
		2983
		2984	# TODO: should actualyl wrap buttons and other goodies.
2829		2985
2830	#############################################################################	2986	#############################################################################
2831		2987
2832	package CFClient::UI::Menu;	2988	package CFClient::UI::Menu;
2833		2989
…		…
2845	);	3001	);
2846		3002
2847	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3003	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2848		3004
2849	for my $item (@{ $self->{items} }) {	3005	for my $item (@{ $self->{items} }) {
2850	my ($widget, $cb) = @$item;	3006	my ($widget, $cb, $tooltip) = @$item;
2851		3007
2852	# handle various types of items, only text for now	3008	# handle various types of items, only text for now
2853	if (!ref $widget) {	3009	if (!ref $widget) {
2854	$widget = new CFClient::UI::Label	3010	$widget = new CFClient::UI::Label
2855	can_hover => 1,	3011	can_hover => 1,
2856	can_events => 1,	3012	can_events => 1,
2857	text => $widget;	3013	markup => $widget,
		3014	tooltip => $tooltip
2858	}	3015	}
2859		3016
2860	$self->{item}{$widget} = $item;	3017	$self->{item}{$widget} = $item;
2861		3018
2862	$self->{vbox}->add ($widget);	3019	$self->{vbox}->add ($widget);
…		…
2883	my ($self, $ev, $x, $y) = @_;	3040	my ($self, $ev, $x, $y) = @_;
2884		3041
2885	# TODO: should use vbox->find_widget or so	3042	# TODO: should use vbox->find_widget or so
2886	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3043	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887	$self->{hover} = $self->{item}{$HOVER};	3044	$self->{hover} = $self->{item}{$HOVER};
		3045
		3046	0
2888	}	3047	}
2889		3048
2890	sub button_up {	3049	sub button_up {
2891	my ($self, $ev, $x, $y) = @_;	3050	my ($self, $ev, $x, $y) = @_;
2892		3051
…		…
2894	undef $GRAB;	3053	undef $GRAB;
2895	$self->hide;	3054	$self->hide;
2896		3055
2897	$self->_emit ("popdown");	3056	$self->_emit ("popdown");
2898	$self->{hover}[1]->() if $self->{hover};	3057	$self->{hover}[1]->() if $self->{hover};
		3058	} else {
		3059	return 0
		3060	}
		3061
2899	}	3062	1
2900	}	3063	}
2901		3064
2902	#############################################################################	3065	#############################################################################
2903		3066
2904	package CFClient::UI::Statusbox;	3067	package CFClient::UI::Multiplexer;
2905		3068
2906	our @ISA = CFClient::UI::VBox::;	3069	our @ISA = CFClient::UI::Container::;
2907		3070
2908	sub new {	3071	sub new {
2909	my $class = shift;	3072	my $class = shift;
2910		3073
2911	$class->SUPER::new (	3074	my $self = $class->SUPER::new (
		3075	@_,
		3076	);
		3077
		3078	$self->{current} = $self->{children}[0]
		3079	if @{ $self->{children} };
		3080
		3081	$self
		3082	}
		3083
		3084	sub add {
		3085	my ($self, @widgets) = @_;
		3086
		3087	$self->SUPER::add (@widgets);
		3088
		3089	$self->{current} = $self->{children}[0]
		3090	if @{ $self->{children} };
		3091	}
		3092
		3093	sub set_current_page {
		3094	my ($self, $page_or_widget) = @_;
		3095
		3096	my $widget = ref $page_or_widget
		3097	? $page_or_widget
		3098	: $self->{children}[$page_or_widget];
		3099
		3100	$self->{current} = $widget;
		3101	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3102
		3103	$self->_emit (page_changed => $self->{current});
		3104
		3105	$self->realloc;
		3106	}
		3107
		3108	sub visible_children {
		3109	$_[0]{current}
		3110	}
		3111
		3112	sub size_request {
		3113	my ($self) = @_;
		3114
		3115	$self->{current}->size_request
		3116	}
		3117
		3118	sub size_allocate {
		3119	my ($self, $w, $h) = @_;
		3120
		3121	$self->{current}->configure (0, 0, $w, $h);
		3122	}
		3123
		3124	sub _draw {
		3125	my ($self) = @_;
		3126
		3127	$self->{current}->draw;
		3128	}
		3129
		3130	#############################################################################
		3131
		3132	package CFClient::UI::Notebook;
		3133
		3134	our @ISA = CFClient::UI::VBox::;
		3135
		3136	sub new {
		3137	my $class = shift;
		3138
		3139	my $self = $class->SUPER::new (
		3140	buttonbar => (new CFClient::UI::Buttonbar),
		3141	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3142	# filter => # will be put between multiplexer and $self
		3143	@_,
		3144	);
		3145
		3146	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3147	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3148
		3149	$self
		3150	}
		3151
		3152	sub add {
		3153	my ($self, $title, $widget, $tooltip) = @_;
		3154
		3155	Scalar::Util::weaken $self;
		3156
		3157	$self->{buttonbar}->add (new CFClient::UI::Button
		3158	markup => $title,
		3159	tooltip => $tooltip,
		3160	on_activate => sub { $self->set_current_page ($widget) },
		3161	);
		3162
		3163	$self->{multiplexer}->add ($widget);
		3164	}
		3165
		3166	sub set_current_page {
		3167	my ($self, $page) = @_;
		3168
		3169	$self->{multiplexer}->set_current_page ($page);
		3170	$self->_emit (page_changed => $self->{multiplexer}{current});
		3171	}
		3172
		3173	#############################################################################
		3174
		3175	package CFClient::UI::Combobox;
		3176
		3177	use utf8;
		3178
		3179	our @ISA = CFClient::UI::Button::;
		3180
		3181	sub new {
		3182	my $class = shift;
		3183
		3184	my $self = $class->SUPER::new (
		3185	options => [], # [value, title, longdesc], ...
		3186	value => undef,
		3187	@_,
		3188	);
		3189
		3190	$self->_set_value ($self->{value});
		3191
		3192	$self
		3193	}
		3194
		3195	sub button_down {
		3196	my ($self, $ev) = @_;
		3197
		3198	my @menu_items;
		3199
		3200	for (@{ $self->{options} }) {
		3201	my ($value, $title, $tooltip) = @$_;
		3202
		3203	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3204	}
		3205
		3206	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3207	}
		3208
		3209	sub _set_value {
		3210	my ($self, $value) = @_;
		3211
		3212	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3213	or return;
		3214
		3215	$self->{value} = $item->[0];
		3216	$self->set_markup ("$item->[1] ⇓");
		3217	$self->set_tooltip ($item->[2]);
		3218	}
		3219
		3220	sub set_value {
		3221	my ($self, $value) = @_;
		3222
		3223	return unless $self->{value} ne $value;
		3224
		3225	$self->_set_value ($value);
		3226	$self->_emit (changed => $value);
		3227	}
		3228
		3229	#############################################################################
		3230
		3231	package CFClient::UI::Statusbox;
		3232
		3233	our @ISA = CFClient::UI::VBox::;
		3234
		3235	sub new {
		3236	my $class = shift;
		3237
		3238	my $self = $class->SUPER::new (
2912	fontsize => 0.8,	3239	fontsize => 0.8,
2913	@_,	3240	@_,
2914	)	3241	);
		3242
		3243	Scalar::Util::weaken (my $this = $self);
		3244
		3245	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3246
		3247	$self
2915	}	3248	}
2916		3249
2917	sub reorder {	3250	sub reorder {
2918	my ($self) = @_;	3251	my ($self) = @_;
2919	my $NOW = time;	3252	my $NOW = Time::HiRes::time;
		3253
		3254	# freeze display when hovering over any label
		3255	return if $CFClient::UI::TOOLTIP->{owner}
		3256	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3257	values %{ $self->{item} };
2920		3258
2921	while (my ($k, $v) = each %{ $self->{item} }) {	3259	while (my ($k, $v) = each %{ $self->{item} }) {
2922	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3260	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923	}	3261	}
2924		3262
…		…
2927	my @items = sort {	3265	my @items = sort {
2928	$a->{pri} <=> $b->{pri}	3266	$a->{pri} <=> $b->{pri}
2929	or $b->{id} <=> $a->{id}	3267	or $b->{id} <=> $a->{id}
2930	} values %{ $self->{item} };	3268	} values %{ $self->{item} };
2931		3269
		3270	$self->{timer}->interval (1);
		3271
2932	my $count = 10 + 1;	3272	my $count = 10 + 1;
2933	for my $item (@items) {	3273	for my $item (@items) {
2934	last unless --$count;	3274	last unless --$count;
2935		3275
2936	push @widgets, $item->{label} ||= do {	3276	my $label = $item->{label} ||= do {
2937	# TODO: doesn't handle markup well (read as: at all)	3277	# TODO: doesn't handle markup well (read as: at all)
2938	my $short = $item->{count} > 1	3278	my $short = $item->{count} > 1
2939	? "<b>$item->{count} ×</b> $item->{text}"	3279	? "<b>$item->{count} ×</b> $item->{text}"
2940	: $item->{text};	3280	: $item->{text};
2941		3281
…		…
2949	tooltip => $item->{tooltip},	3289	tooltip => $item->{tooltip},
2950	tooltip_font => $::FONT_PROP,	3290	tooltip_font => $::FONT_PROP,
2951	tooltip_width => 0.67,	3291	tooltip_width => 0.67,
2952	fontsize => $item->{fontsize} || $self->{fontsize},	3292	fontsize => $item->{fontsize} || $self->{fontsize},
2953	max_w => $::WIDTH * 0.44,	3293	max_w => $::WIDTH * 0.44,
2954	fg => $item->{fg},	3294	fg => [@{ $item->{fg} }],
2955	can_events => 1,	3295	can_events => 1,
2956	can_hover => 1	3296	can_hover => 1
2957	};	3297	};
		3298
		3299	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3300	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3301	$label->update;
		3302	$label->set_max_size (undef, $label->{req_h} * $diff)
		3303	if $diff < 1;
		3304	$self->{timer}->interval (1/30);
		3305	} else {
		3306	$label->{fg}[3] = $item->{fg}[3] || 1;
		3307	}
		3308
		3309	push @widgets, $label;
2958	}	3310	}
2959		3311
2960	$self->clear;	3312	$self->clear;
2961	$self->SUPER::add (reverse @widgets);	3313	$self->SUPER::add (reverse @widgets);
2962	}	3314	}
…		…
2967	$text =~ s/^\s+//;	3319	$text =~ s/^\s+//;
2968	$text =~ s/\s+$//;	3320	$text =~ s/\s+$//;
2969		3321
2970	return unless $text;	3322	return unless $text;
2971		3323
2972	my $timeout = time + ((delete $arg{timeout}) || 60);	3324	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973		3325
2974	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3326	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975		3327
2976	if (my $item = $self->{item}{$group}) {	3328	if (my $item = $self->{item}{$group}) {
2977	if ($item->{text} eq $text) {	3329	if ($item->{text} eq $text) {
2978	$item->{count}++;	3330	$item->{count}++;
2979	} else {	3331	} else {
2980	$item->{count} = 1;	3332	$item->{count} = 1;
2981	$item->{text} = $item->{tooltip} = $text;	3333	$item->{text} = $item->{tooltip} = $text;
2982	}	3334	}
2983	$item->{id} = ++$self->{id};	3335	$item->{id} += 0.2;#d#
2984	$item->{timeout} = $timeout;	3336	$item->{timeout} = $timeout;
2985	delete $item->{label};	3337	delete $item->{label};
2986	} else {	3338	} else {
2987	$self->{item}{$group} = {	3339	$self->{item}{$group} = {
2988	id => ++$self->{id},	3340	id => ++$self->{id},
…		…
3007		3359
3008	$self->reorder;	3360	$self->reorder;
3009	$self->SUPER::reconfigure;	3361	$self->SUPER::reconfigure;
3010	}	3362	}
3011		3363
		3364	sub destroy {
		3365	my ($self) = @_;
		3366
		3367	$self->{timer}->cancel;
		3368
		3369	$self->SUPER::destroy;
		3370	}
		3371
3012	#############################################################################	3372	#############################################################################
3013		3373
3014	package CFClient::UI::Inventory;	3374	package CFClient::UI::Inventory;
3015		3375
3016	our @ISA = CFClient::UI::ScrolledWindow::;	3376	our @ISA = CFClient::UI::ScrolledWindow::;
3017		3377
3018	sub new {	3378	sub new {
3019	my $class = shift;	3379	my $class = shift;
3020		3380
3021	my $self = $class->SUPER::new (	3381	my $self = $class->SUPER::new (
3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3382	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023	@_,	3383	@_,
3024	);	3384	);
3025		3385
3026	$self	3386	$self
3027	}	3387	}
3028		3388
3029	sub set_items {	3389	sub set_items {
3030	my ($self, $items) = @_;	3390	my ($self, $items) = @_;
3031		3391
3032	$self->{scrolled}->clear;	3392	$self->{child}->clear;
3033	return unless $items;	3393	return unless $items;
3034		3394
3035	my @items = sort {	3395	my @items = sort {
3036	($a->{type} <=> $b->{type})	3396	($a->{type} <=> $b->{type})
3037	or ($a->{name} cmp $b->{name})	3397	or ($a->{name} cmp $b->{name})
…		…
3041		3401
3042	my $row = 0;	3402	my $row = 0;
3043	for my $item (@items) {	3403	for my $item (@items) {
3044	CFClient::Item::update_widgets $item;	3404	CFClient::Item::update_widgets $item;
3045		3405
3046	$self->{scrolled}->add (0, $row, $item->{face_widget});	3406	$self->{child}->add (0, $row, $item->{face_widget});
3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3407	$self->{child}->add (1, $row, $item->{desc_widget});
3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3408	$self->{child}->add (2, $row, $item->{weight_widget});
3049		3409
3050	$row++;	3410	$row++;
3051	}	3411	}
3052	}	3412	}
3053		3413
…		…
3151	$rec = $::CONN->stop_record if $::CONN;	3511	$rec = $::CONN->stop_record if $::CONN;
3152	return unless ref $rec eq 'ARRAY';	3512	return unless ref $rec eq 'ARRAY';
3153	$self->set_command_list ($rec);	3513	$self->set_command_list ($rec);
3154	}	3514	}
3155		3515
3156	# if $commit is true, the binding will be set after the user entered a key combo	3516
		3517	sub ask_for_bind_and_commit {
		3518	my ($self) = @_;
		3519	$self->ask_for_bind (1);
		3520	}
		3521
3157	sub ask_for_bind {	3522	sub ask_for_bind {
3158	my ($self, $commit) = @_;	3523	my ($self, $commit, $end_cb) = @_;
3159		3524
3160	CFClient::Binder::open_binding_dialog (sub {	3525	CFClient::Binder::open_binding_dialog (sub {
3161	my ($mod, $sym) = @_;	3526	my ($mod, $sym) = @_;
3162	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?	3527	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3163	$self->update_binding_widgets;	3528	$self->update_binding_widgets;
3164	$self->commit if $commit;	3529	$self->commit if $commit;
		3530	$end_cb->() if $end_cb;
3165	});	3531	});
3166	}	3532	}
3167		3533
3168	# $mod and $sym are the modifiers and key symbol	3534	# $mod and $sym are the modifiers and key symbol
3169	# $cmds is a array ref of strings (the commands)	3535	# $cmds is a array ref of strings (the commands)
…		…
3187	}	3553	}
3188		3554
3189	# this is a shortcut method that asks for a binding	3555	# this is a shortcut method that asks for a binding
3190	# and then just binds it.	3556	# and then just binds it.
3191	sub do_quick_binding {	3557	sub do_quick_binding {
3192	my ($self, $cmds) = @_;	3558	my ($self, $cmds, $end_cb) = @_;
3193	$self->set_binding (undef, undef, $cmds, sub {	3559	$self->set_binding (undef, undef, $cmds, sub {
3194	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];	3560	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3195	});	3561	});
3196	$self->ask_for_bind (1);	3562	$self->ask_for_bind (1, $end_cb);
3197	}	3563	}
3198		3564
3199	sub update_binding_widgets {	3565	sub update_binding_widgets {
3200	my ($self) = @_;	3566	my ($self) = @_;
3201	my ($mod, $sym, $cmds) = $self->get_binding;	3567	my ($mod, $sym, $cmds) = $self->get_binding;
…		…
3245		3611
3246	#############################################################################	3612	#############################################################################
3247		3613
3248	package CFClient::UI::SpellList;	3614	package CFClient::UI::SpellList;
3249		3615
3250	our @ISA = CFClient::UI::FancyFrame::;	3616	our @ISA = CFClient::UI::Table::;
3251		3617
3252	sub new {	3618	sub new {
3253	my $class = shift;	3619	my $class = shift;
3254		3620
3255	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3621	my $self = $class->SUPER::new (
3256		3622	binding => [],
3257	$self->add (new CFClient::UI::ScrolledWindow	3623	commands => [],
3258	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3624	@_,
3259		3625	)
3260	$self;
3261	}	3626	}
3262		3627
3263	# XXX: Do sorting? Argl...	3628	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3629
		3630	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3631	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3632	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3633	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3634	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3635	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3636	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3637	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3638	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3639	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3640
		3641	sub rebuild_spell_list {
		3642	my ($self) = @_;
		3643
		3644	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3645	$self->clear;
		3646
		3647	return unless $::CONN;
		3648
		3649	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3650	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3651	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3652	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3653	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3654
		3655	my $row = 0;
		3656
		3657	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3658	my $spell = $self->{spell}{$_};
		3659
		3660	$row++;
		3661
		3662	my $spell_cb = sub {
		3663	my ($widget, $ev) = @_;
		3664
		3665	if ($ev->{button} == 1) {
		3666	$::CONN->user_send ("cast $spell->{name}");
		3667	} elsif ($ev->{button} == 2) {
		3668	$::CONN->user_send ("invoke $spell->{name}");
		3669	} elsif ($ev->{button} == 3) {
		3670	(new CFClient::UI::Menu
		3671	items => [
		3672	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3673	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3674	],
		3675	)->popup ($ev);
		3676	} else {
		3677	return 0;
		3678	}
		3679
		3680	1
		3681	};
		3682
		3683	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3684
		3685	#TODO: add path info to tooltip
		3686	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3687
		3688	$self->add (0, $row, new CFClient::UI::Face
		3689	face => $spell->{face},
		3690	can_hover => 1,
		3691	can_events => 1,
		3692	tooltip => $tooltip,
		3693	on_button_down => $spell_cb,
		3694	);
		3695
		3696	$self->add (1, $row, new CFClient::UI::Label
		3697	expand => 1,
		3698	text => $spell->{name},
		3699	can_hover => 1,
		3700	can_events => 1,
		3701	tooltip => $tooltip,
		3702	on_button_down => $spell_cb,
		3703	);
		3704
		3705	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3706	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3707	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3708	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3709	}
		3710	});
		3711	}
		3712
3264	sub add_spell {	3713	sub add_spell {
3265	my ($self, $spell) = @_;	3714	my ($self, $spell) = @_;
		3715
3266	$self->{spells}->{$spell->{name}} = $spell;	3716	$self->{spell}->{$spell->{name}} = $spell;
3267		3717	$self->rebuild_spell_list;
3268	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269	face => $spell->{face},
3270	can_hover => 1,
3271	can_events => 1,
3272	tooltip => $spell->{message});
3273
3274	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275	text => $spell->{name},
3276	can_hover => 1,
3277	can_events => 1,
3278	tooltip => $spell->{message},
3279	expand => 1);
3280
3281	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284	expand => 1);
3285
3286	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287	text => "bind to key",
3288	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289	}
3290
3291	sub rebuild_spell_list {
3292	my ($self) = @_;
3293	$self->{tbl_idx} = 0;
3294	$self->add_spell ($_) for values %{$self->{spells}};
3295	}	3718	}
3296		3719
3297	sub remove_spell {	3720	sub remove_spell {
3298	my ($self, $spell) = @_;	3721	my ($self, $spell) = @_;
		3722
3299	delete $self->{spells}->{$spell->{name}};	3723	delete $self->{spell}->{$spell->{name}};
3300	$self->rebuild_spell_list;	3724	$self->rebuild_spell_list;
3301	}	3725	}
3302		3726
		3727	sub clear_spells {
		3728	my ($self) = @_;
		3729
		3730	$self->{spell} = {};
		3731	$self->rebuild_spell_list;
		3732	}
		3733
3303	#############################################################################	3734	#############################################################################
3304		3735
3305	package CFClient::UI::Root;	3736	package CFClient::UI::Root;
3306		3737
3307	our @ISA = CFClient::UI::Container::;	3738	our @ISA = CFClient::UI::Container::;
		3739
		3740	use List::Util qw(min max);
3308		3741
3309	use CFClient::OpenGL;	3742	use CFClient::OpenGL;
3310		3743
3311	sub new {	3744	sub new {
3312	my $class = shift;	3745	my $class = shift;
…		…
3447		3880
3448	delete $queue{$widget+0};	3881	delete $queue{$widget+0};
3449		3882
3450	my ($w, $h) = $widget->size_request;	3883	my ($w, $h) = $widget->size_request;
3451		3884
3452	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3885	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3886	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3887
		3888	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3889	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3454		3890
3455	$w = $widget->{force_w} if exists $widget->{force_w};	3891	$w = $widget->{force_w} if exists $widget->{force_w};
3456	$h = $widget->{force_h} if exists $widget->{force_h};	3892	$h = $widget->{force_h} if exists $widget->{force_h};
3457		3893
3458	if ($widget->{req_w} != $w || $widget->{req_h} != $h	3894	if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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