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.453 by root, Wed Dec 26 20:46:39 2007 UTC vs.
Revision 1.468 by root, Wed Sep 3 10:36:25 2008 UTC

1	package dc::UI;	1	package DC::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use List::Util ();	6	use List::Util ();
7		7
8	use dc;	8	use DC;
9	use dc::Pod;	9	use DC::Pod;
10	use dc::Texture;	10	use DC::Texture;
11		11
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		13
14	our $LAYOUT;	14	our $LAYOUT;
15	our $ROOT;	15	our $ROOT;
…		…
111		111
112	if ($GRAB) {	112	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	114	# mousewheel
115	my $delta = $ev->{button} * 2 - 9;	115	my $delta = $ev->{button} * 2 - 9;
116	my $shift = $ev->{mod} & dc::KMOD_SHIFT;	116	my $shift = $ev->{mod} & DC::KMOD_SHIFT;
117		117
118	$ev->{dx} = $shift ? $delta : 0;	118	$ev->{dx} = $shift ? $delta : 0;
119	$ev->{dy} = $shift ? 0 : $delta;	119	$ev->{dy} = $shift ? 0 : $delta;
120		120
121	$GRAB->emit (mouse_wheel => $ev);	121	$GRAB->emit (mouse_wheel => $ev);
…		…
211	reconfigure_widgets;	211	reconfigure_widgets;
212	}	212	}
213		213
214	#############################################################################	214	#############################################################################
215		215
216	package dc::UI::Event;	216	package DC::UI::Event;
217		217
218	sub xy {	218	sub xy {
219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
220	}	220	}
221		221
222	#############################################################################	222	#############################################################################
223		223
224	package dc::UI::Base;	224	package DC::UI::Base;
225		225
226	use strict;	226	use strict;
227		227
228	use dc::OpenGL;	228	use DC::OpenGL;
229		229
230	sub new {	230	sub new {
231	my $class = shift;	231	my $class = shift;
232		232
233	my $self = bless {	233	my $self = bless {
…		…
238	h => undef,	238	h => undef,
239	can_events => 1,	239	can_events => 1,
240	@_	240	@_
241	}, $class;	241	}, $class;
242		242
243	dc::weaken ($dc::UI::WIDGET{$self+0} = $self);	243	DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
244		244
245	for (keys %$self) {	245	for (keys %$self) {
246	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
247	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
248	}	248	}
249	}	249	}
250		250
251	if (my $layout = $dc::UI::LAYOUT->{$self->{name}}) {	251	if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
252	$self->{x} = $layout->{x} * $dc::UI::ROOT->{alloc_w} if exists $layout->{x};	252	$self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
253	$self->{y} = $layout->{y} * $dc::UI::ROOT->{alloc_h} if exists $layout->{y};	253	$self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
254	$self->{force_w} = $layout->{w} * $dc::UI::ROOT->{alloc_w} if exists $layout->{w};	254	$self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
255	$self->{force_h} = $layout->{h} * $dc::UI::ROOT->{alloc_h} if exists $layout->{h};	255	$self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
256		256
257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
259		259
260	$self->show if $layout->{show};	260	$self->show if $layout->{show};
…		…
278	sub show {	278	sub show {
279	my ($self) = @_;	279	my ($self) = @_;
280		280
281	return if $self->{parent};	281	return if $self->{parent};
282		282
283	$dc::UI::ROOT->add ($self);	283	$DC::UI::ROOT->add ($self);
284	}	284	}
285		285
286	sub set_visible {	286	sub set_visible {
287	my ($self) = @_;	287	my ($self) = @_;
288		288
…		…
309	delete $self->{root};	309	delete $self->{root};
310		310
311	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
312	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
313		313
314	$dc::UI::TOOLTIP_WATCHER->invoke	314	$DC::UI::TOOLTIP_WATCHER->invoke
315	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
316		316
317	$self->emit ("focus_out");	317	$self->emit ("focus_out");
318	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
319	}	319	}
…		…
368		368
369	# traverse the widget chain up to find the maximum "physical" size constraints	369	# traverse the widget chain up to find the maximum "physical" size constraints
370	sub get_max_wh {	370	sub get_max_wh {
371	my ($self) = @_;	371	my ($self) = @_;
372		372
		373	my ($w, $h) = @$self{qw(max_w max_h)};
		374
		375	if ($w <= 0 || $h <= 0) {
		376	my ($mw, $mh) = $self->{parent}
373	return $self->{parent}->get_max_wh	377	? $self->{parent}->get_max_wh
374	if $self->{parent};
375
376	($::WIDTH, $::HEIGHT)	378	: ($::WIDTH, $::HEIGHT);
		379
		380	$w = $mw if $w <= 0;
		381	$h = $mh if $h <= 0;
		382	}
		383
		384	($w, $h)
377	}	385	}
378		386
379	sub size_request {	387	sub size_request {
380	require Carp;	388	require Carp;
381	Carp::confess "size_request is abstract";	389	Carp::confess "size_request is abstract";
…		…
389	my ($self, $x, $y, $w, $h) = @_;	397	my ($self, $x, $y, $w, $h) = @_;
390		398
391	if ($self->{aspect}) {	399	if ($self->{aspect}) {
392	my ($ow, $oh) = ($w, $h);	400	my ($ow, $oh) = ($w, $h);
393		401
394	$w = List::Util::min $w, dc::ceil $h * $self->{aspect};	402	$w = List::Util::min $w, DC::ceil $h * $self->{aspect};
395	$h = List::Util::min $h, dc::ceil $w / $self->{aspect};	403	$h = List::Util::min $h, DC::ceil $w / $self->{aspect};
396		404
397	# use alignment to adjust x, y	405	# use alignment to adjust x, y
398		406
399	$x += int 0.5 * ($ow - $w);	407	$x += int 0.5 * ($ow - $w);
400	$y += int 0.5 * ($oh - $h);	408	$y += int 0.5 * ($oh - $h);
…		…
441		449
442	return if $self->{tooltip} eq $tooltip;	450	return if $self->{tooltip} eq $tooltip;
443		451
444	$self->{tooltip} = $tooltip;	452	$self->{tooltip} = $tooltip;
445		453
446	if ($dc::UI::TOOLTIP->{owner} == $self) {	454	if ($DC::UI::TOOLTIP->{owner} == $self) {
447	delete $dc::UI::TOOLTIP->{owner};	455	delete $DC::UI::TOOLTIP->{owner};
448	$dc::UI::TOOLTIP_WATCHER->invoke;	456	$DC::UI::TOOLTIP_WATCHER->invoke;
449	}	457	}
450	}	458	}
451		459
452	# translate global coordinates to local coordinate system	460	# translate global coordinates to local coordinate system
453	sub coord2local {	461	sub coord2local {
…		…
519	sub connect {	527	sub connect {
520	my ($self, $signal, $cb) = @_;	528	my ($self, $signal, $cb) = @_;
521		529
522	push @{ $self->{signal_cb}{$signal} }, $cb;	530	push @{ $self->{signal_cb}{$signal} }, $cb;
523		531
524	defined wantarray and dc::guard {	532	defined wantarray and DC::guard {
525	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	533	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
526	@{ $self->{signal_cb}{$signal} };	534	@{ $self->{signal_cb}{$signal} };
527	}	535	}
528	}	536	}
529		537
…		…
567	# in .xs	575	# in .xs
568		576
569	sub set_parent {	577	sub set_parent {
570	my ($self, $parent) = @_;	578	my ($self, $parent) = @_;
571		579
572	dc::weaken ($self->{parent} = $parent);	580	DC::weaken ($self->{parent} = $parent);
573	$self->set_visible if $parent->{visible};	581	$self->set_visible if $parent->{visible};
574	}	582	}
575		583
576	sub realloc {	584	sub realloc {
577	my ($self) = @_;	585	my ($self) = @_;
…		…
615	}	623	}
616		624
617	sub DESTROY {	625	sub DESTROY {
618	my ($self) = @_;	626	my ($self) = @_;
619		627
620	return if dc::in_destruct;	628	return if DC::in_destruct;
621		629
622	local $@;	630	local $@;
623	eval { $self->destroy };	631	eval { $self->destroy };
624	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	632	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
625		633
626	delete $WIDGET{$self+0};	634	delete $WIDGET{$self+0};
627	}	635	}
628		636
629	#############################################################################	637	#############################################################################
630		638
631	package dc::UI::DrawBG;	639	package DC::UI::DrawBG;
632		640
633	our @ISA = dc::UI::Base::;	641	our @ISA = DC::UI::Base::;
634		642
635	use strict;	643	use strict;
636	use dc::OpenGL;	644	use DC::OpenGL;
637		645
638	sub new {	646	sub new {
639	my $class = shift;	647	my $class = shift;
640		648
641	$class->SUPER::new (	649	$class->SUPER::new (
…		…
663	}	671	}
664	}	672	}
665		673
666	#############################################################################	674	#############################################################################
667		675
668	package dc::UI::Empty;	676	package DC::UI::Empty;
669		677
670	our @ISA = dc::UI::Base::;	678	our @ISA = DC::UI::Base::;
671		679
672	sub new {	680	sub new {
673	my ($class, %arg) = @_;	681	my ($class, %arg) = @_;
674	$class->SUPER::new (can_events => 0, %arg);	682	$class->SUPER::new (can_events => 0, %arg);
675	}	683	}
…		…
682		690
683	sub draw { }	691	sub draw { }
684		692
685	#############################################################################	693	#############################################################################
686		694
687	package dc::UI::Container;	695	package DC::UI::Container;
688		696
689	our @ISA = dc::UI::Base::;	697	our @ISA = DC::UI::Base::;
690		698
691	sub new {	699	sub new {
692	my ($class, %arg) = @_;	700	my ($class, %arg) = @_;
693		701
694	my $children = delete $arg{children};	702	my $children = delete $arg{children};
…		…
788	$_->draw for $self->visible_children;	796	$_->draw for $self->visible_children;
789	}	797	}
790		798
791	#############################################################################	799	#############################################################################
792		800
793	package dc::UI::Bin;	801	package DC::UI::Bin;
794		802
795	our @ISA = dc::UI::Container::;	803	our @ISA = DC::UI::Container::;
796		804
797	sub new {	805	sub new {
798	my ($class, %arg) = @_;	806	my ($class, %arg) = @_;
799		807
800	my $child = (delete $arg{child}) || new dc::UI::Empty::;	808	my $child = (delete $arg{child}) || new DC::UI::Empty::;
801		809
802	$class->SUPER::new (children => [$child], %arg)	810	$class->SUPER::new (children => [$child], %arg)
803	}	811	}
804		812
805	sub add {	813	sub add {
…		…
812	sub remove {	820	sub remove {
813	my ($self, $widget) = @_;	821	my ($self, $widget) = @_;
814		822
815	$self->SUPER::remove ($widget);	823	$self->SUPER::remove ($widget);
816		824
817	$self->{children} = [new dc::UI::Empty]	825	$self->{children} = [new DC::UI::Empty]
818	unless @{$self->{children}};	826	unless @{$self->{children}};
819	}	827	}
820		828
821	sub child { $_[0]->{children}[0] }	829	sub child { $_[0]->{children}[0] }
822		830
…		…
833	}	841	}
834		842
835	#############################################################################	843	#############################################################################
836	# back-buffered drawing area	844	# back-buffered drawing area
837		845
838	package dc::UI::Window;	846	package DC::UI::Window;
839		847
840	our @ISA = dc::UI::Bin::;	848	our @ISA = DC::UI::Bin::;
841		849
842	use dc::OpenGL;	850	use DC::OpenGL;
843		851
844	sub new {	852	sub new {
845	my ($class, %arg) = @_;	853	my ($class, %arg) = @_;
846		854
847	my $self = $class->SUPER::new (%arg);	855	my $self = $class->SUPER::new (%arg);
…		…
869	}	877	}
870		878
871	sub render_child {	879	sub render_child {
872	my ($self) = @_;	880	my ($self) = @_;
873		881
874	$self->{texture} = new_from_opengl dc::Texture $self->{w}, $self->{h}, sub {	882	$self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
875	glClearColor 0, 0, 0, 0;	883	glClearColor 0, 0, 0, 0;
876	glClear GL_COLOR_BUFFER_BIT;	884	glClear GL_COLOR_BUFFER_BIT;
877		885
878	{	886	{
879	package dc::UI::Base;	887	package DC::UI::Base;
880		888
881	local ($draw_x, $draw_y, $draw_w, $draw_h) =	889	local ($draw_x, $draw_y, $draw_w, $draw_h) =
882	(0, 0, $self->{w}, $self->{h});	890	(0, 0, $self->{w}, $self->{h});
883		891
884	$self->_render;	892	$self->_render;
…		…
901	glDisable GL_TEXTURE_2D;	909	glDisable GL_TEXTURE_2D;
902	}	910	}
903		911
904	#############################################################################	912	#############################################################################
905		913
906	package dc::UI::ViewPort;	914	package DC::UI::ViewPort;
907		915
908	use List::Util qw(min max);	916	use List::Util qw(min max);
909		917
910	our @ISA = dc::UI::Window::;	918	our @ISA = DC::UI::Window::;
911		919
912	sub new {	920	sub new {
913	my $class = shift;	921	my $class = shift;
914		922
915	$class->SUPER::new (	923	$class->SUPER::new (
…		…
999	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1000	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1001	) {	1009	) {
1002	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1003	} else {	1011	} else {
1004	$self->dc::UI::Base::find_widget ($x, $y)	1012	$self->DC::UI::Base::find_widget ($x, $y)
1005	}	1013	}
1006	}	1014	}
1007		1015
1008	sub _render {	1016	sub _render {
1009	my ($self) = @_;	1017	my ($self) = @_;
1010		1018
1011	local $dc::UI::Base::draw_x = $dc::UI::Base::draw_x - $self->{view_x};	1019	local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1012	local $dc::UI::Base::draw_y = $dc::UI::Base::draw_y - $self->{view_y};	1020	local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1013		1021
1014	dc::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1015		1023
1016	$self->SUPER::_render;	1024	$self->SUPER::_render;
1017	}	1025	}
1018		1026
1019	#############################################################################	1027	#############################################################################
1020		1028
1021	package dc::UI::ScrolledWindow;	1029	package DC::UI::ScrolledWindow;
1022		1030
1023	our @ISA = dc::UI::Table::;	1031	our @ISA = DC::UI::Table::;
1024		1032
1025	sub new {	1033	sub new {
1026	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
1027		1035
1028	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
1029		1037
1030	my $self;	1038	my $self;
1031		1039
1032	my $hslider = new dc::UI::Slider	1040	my $hslider = new DC::UI::Slider
1033	c_col => 0,	1041	c_col => 0,
1034	c_row => 1,	1042	c_row => 1,
1035	vertical => 0,	1043	vertical => 0,
1036	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
1037	on_changed => sub {	1045	on_changed => sub {
1038	$self->{hpos} = $_[1];	1046	$self->{hpos} = $_[1];
1039	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040	},	1048	},
1041	;	1049	;
1042		1050
1043	my $vslider = new dc::UI::Slider	1051	my $vslider = new DC::UI::Slider
1044	c_col => 1,	1052	c_col => 1,
1045	c_row => 0,	1053	c_row => 0,
1046	vertical => 1,	1054	vertical => 1,
1047	range => [0, 0, 1, 0.01], # HACK fix	1055	range => [0, 0, 1, 0.01], # HACK fix
1048	on_changed => sub {	1056	on_changed => sub {
…		…
1060	col_expand => [1, 0],	1068	col_expand => [1, 0],
1061	row_expand => [1, 0],	1069	row_expand => [1, 0],
1062	%arg,	1070	%arg,
1063	);	1071	);
1064		1072
1065	$self->{vp} = new dc::UI::ViewPort	1073	$self->{vp} = new DC::UI::ViewPort
1066	c_col => 0,	1074	c_col => 0,
1067	c_row => 0,	1075	c_row => 0,
1068	expand => 1,	1076	expand => 1,
1069	scroll_x => $self->{scroll_x},	1077	scroll_x => $self->{scroll_x},
1070	scroll_y => $self->{scroll_y},	1078	scroll_y => $self->{scroll_y},
…		…
1196	$self->SUPER::invoke_size_allocate ($w, $h)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1197	}	1205	}
1198		1206
1199	#############################################################################	1207	#############################################################################
1200		1208
1201	package dc::UI::Frame;	1209	package DC::UI::Frame;
1202		1210
1203	our @ISA = dc::UI::Bin::;	1211	our @ISA = DC::UI::Bin::;
1204		1212
1205	use dc::OpenGL;	1213	use DC::OpenGL;
1206		1214
1207	sub new {	1215	sub new {
1208	my $class = shift;	1216	my $class = shift;
1209		1217
1210	$class->SUPER::new (	1218	$class->SUPER::new (
…		…
1229	$self->SUPER::_draw;	1237	$self->SUPER::_draw;
1230	}	1238	}
1231		1239
1232	#############################################################################	1240	#############################################################################
1233		1241
1234	package dc::UI::FancyFrame;	1242	package DC::UI::FancyFrame;
1235		1243
1236	our @ISA = dc::UI::Bin::;	1244	our @ISA = DC::UI::Bin::;
1237		1245
1238	use dc::OpenGL;	1246	use DC::OpenGL;
1239		1247
1240	sub new {	1248	sub new {
1241	my ($class, %arg) = @_;	1249	my ($class, %arg) = @_;
1242		1250
1243	if ((exists $arg{label}) && !ref $arg{label}) {	1251	if ((exists $arg{label}) && !ref $arg{label}) {
1244	$arg{label} = new dc::UI::Label	1252	$arg{label} = new DC::UI::Label
1245	align => 1,	1253	align => 1,
1246	valign => 0,	1254	valign => 0.5,
1247	text => $arg{label},	1255	text => $arg{label},
1248	fontsize => ($arg{border} || 0.8) * 0.75;	1256	fontsize => ($arg{border} || 0.8) * 0.75;
1249	}	1257	}
1250		1258
1251	my $self = $class->SUPER::new (	1259	my $self = $class->SUPER::new (
1252	# label => "",	1260	# label => "",
1253	fg => [0.6, 0.3, 0.1],	1261	fg => undef,
1254	border => 0.8,	1262	border => 0.8,
1255	style => 'single',	1263	style => 'single',
1256	%arg,	1264	%arg,
1257	);	1265	);
1258		1266
…		…
1261		1269
1262	sub add {	1270	sub add {
1263	my ($self, @widgets) = @_;	1271	my ($self, @widgets) = @_;
1264		1272
1265	$self->SUPER::add (@widgets);	1273	$self->SUPER::add (@widgets);
1266	$self->dc::UI::Container::add ($self->{label}) if $self->{label};	1274	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
1267	}	1275	}
1268		1276
1269	sub border {	1277	sub border {
1270	int $_[0]{border} * $::FONTSIZE	1278	int $_[0]{border} * $::FONTSIZE
1271	}	1279	}
…		…
1311	my $border = $self->border;	1319	my $border = $self->border;
1312	my ($w, $h) = ($self->{w}, $self->{h});	1320	my ($w, $h) = ($self->{w}, $self->{h});
1313		1321
1314	$child->draw;	1322	$child->draw;
1315		1323
1316	glColor @{$self->{fg}};	1324	glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1317	glBegin GL_LINE_STRIP;	1325	glBegin GL_LINE_STRIP;
1318	glVertex $border * 1.5 , $border * 0.5 + 0.5;	1326	glVertex $border * 1.5 , $border * 0.5 + 0.5;
1319	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;	1327	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1320	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;	1328	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1321	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;	1329	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
…		…
1329	}	1337	}
1330	}	1338	}
1331		1339
1332	#############################################################################	1340	#############################################################################
1333		1341
1334	package dc::UI::Toplevel;	1342	package DC::UI::Toplevel;
1335		1343
1336	our @ISA = dc::UI::Bin::;	1344	our @ISA = DC::UI::Bin::;
1337		1345
1338	use dc::OpenGL;	1346	use DC::OpenGL;
1339		1347
1340	my $bg =	1348	my $bg =
1341	new_from_file dc::Texture dc::find_rcfile "d1_bg.png",	1349	new_from_resource DC::Texture "d1_bg.png",
1342	mipmap => 1, wrap => 1;	1350	mipmap => 1, wrap => 1;
1343		1351
1344	my @border =	1352	my @border =
1345	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }	1353	map { new_from_resource DC::Texture $_, mipmap => 1 }
1346	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1354	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1347		1355
1348	my @icon =	1356	my @icon =
1349	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }	1357	map { new_from_resource DC::Texture $_, mipmap => 1 }
1350	qw(x1_move.png x1_resize.png);	1358	qw(x1_move.png x1_resize.png);
1351		1359
1352	sub new {	1360	sub new {
1353	my ($class, %arg) = @_;	1361	my ($class, %arg) = @_;
1354		1362
1355	my $self = $class->SUPER::new (	1363	my $self = $class->SUPER::new (
1356	bg => [1, 1, 1, 1],	1364	bg => [1, 1, 1, 1],
1357	border_bg => [1, 1, 1, 1],	1365	border_bg => [1, 1, 1, 1],
1358	border => 0.6,	1366	border => 1,
1359	can_events => 1,	1367	can_events => 1,
1360	min_w => 64,	1368	min_w => 64,
1361	min_h => 32,	1369	min_h => 32,
1362	%arg,	1370	%arg,
1363	);	1371	);
1364		1372
1365	$self->{title_widget} = new dc::UI::Label	1373	$self->{title_widget} = new DC::UI::Label
1366	align => 0,	1374	align => 0.5,
1367	valign => 1,	1375	valign => 1,
1368	text => $self->{title},	1376	text => $self->{title},
1369	fontsize => $self->{border},	1377	fontsize => $self->{border},
1370	if exists $self->{title};	1378	if exists $self->{title};
1371		1379
1372	if ($self->{has_close_button}) {	1380	if ($self->{has_close_button}) {
1373	$self->{close_button} =	1381	$self->{close_button} =
1374	new dc::UI::ImageButton	1382	new DC::UI::ImageButton
1375	path => 'x1_close.png',	1383	path => 'x1_close.png',
1376	on_activate => sub { $self->emit ("delete") };	1384	on_activate => sub { $self->emit ("delete") };
1377		1385
1378	$self->dc::UI::Container::add ($self->{close_button});	1386	$self->DC::UI::Container::add ($self->{close_button});
1379	}	1387	}
1380		1388
1381	$self	1389	$self
1382	}	1390	}
1383		1391
1384	sub add {	1392	sub add {
1385	my ($self, @widgets) = @_;	1393	my ($self, @widgets) = @_;
1386		1394
1387	$self->SUPER::add (@widgets);	1395	$self->SUPER::add (@widgets);
1388	$self->dc::UI::Container::add ($self->{close_button}) if $self->{close_button};	1396	$self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1389	$self->dc::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1397	$self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1390	}	1398	}
1391		1399
1392	sub border {	1400	sub border {
1393	int $_[0]{border} * $::FONTSIZE	1401	int $_[0]{border} * $::FONTSIZE
1394	}	1402	}
…		…
1579	if $self->{close_button};	1587	if $self->{close_button};
1580	}	1588	}
1581		1589
1582	#############################################################################	1590	#############################################################################
1583		1591
1584	package dc::UI::Table;	1592	package DC::UI::Table;
1585		1593
1586	our @ISA = dc::UI::Container::;	1594	our @ISA = DC::UI::Container::;
1587		1595
1588	use List::Util qw(max sum);	1596	use List::Util qw(max sum);
1589		1597
1590	use dc::OpenGL;	1598	use DC::OpenGL;
1591		1599
1592	sub new {	1600	sub new {
1593	my $class = shift;	1601	my $class = shift;
1594		1602
1595	$class->SUPER::new (	1603	$class->SUPER::new (
…		…
1639	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};	1647	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640		1648
1641	my $sw = sum @w[$c .. $c + $cs - 1];	1649	my $sw = sum @w[$c .. $c + $cs - 1];
1642		1650
1643	if ($w > $sw) {	1651	if ($w > $sw) {
1644	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];	1652	$_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645	}	1653	}
1646	}	1654	}
1647		1655
1648	# second pass, rows	1656	# second pass, rows
1649	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {	1657	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1650	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};	1658	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1651		1659
1652	my $sh = sum @h[$r .. $r + $rs - 1];	1660	my $sh = sum @h[$r .. $r + $rs - 1];
1653		1661
1654	if ($h > $sh) {	1662	if ($h > $sh) {
1655	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];	1663	$_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1656	}	1664	}
1657	}	1665	}
1658		1666
1659	(\@w, \@h)	1667	(\@w, \@h)
1660	}	1668	}
…		…
1683	@col_expand = (1) x @$ws unless @col_expand;	1691	@col_expand = (1) x @$ws unless @col_expand;
1684	my $col_expand = (sum @col_expand) || 1;	1692	my $col_expand = (sum @col_expand) || 1;
1685		1693
1686	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1694	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1687		1695
1688	dc::UI::harmonize $ws;	1696	DC::UI::harmonize $ws;
1689		1697
1690	my @row_expand = @{$self->{row_expand}};	1698	my @row_expand = @{$self->{row_expand}};
1691	@row_expand = (1) x @$ws unless @row_expand;	1699	@row_expand = (1) x @$ws unless @row_expand;
1692	my $row_expand = (sum @row_expand) || 1;	1700	my $row_expand = (sum @row_expand) || 1;
1693		1701
1694	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1702	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1695		1703
1696	dc::UI::harmonize $hs;	1704	DC::UI::harmonize $hs;
1697		1705
1698	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }	1706	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }	1707	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1700		1708
1701	for my $widget ($self->children) {	1709	for my $widget ($self->children) {
…		…
1710	1	1718	1
1711	}	1719	}
1712		1720
1713	#############################################################################	1721	#############################################################################
1714		1722
1715	package dc::UI::Fixed;	1723	package DC::UI::Fixed;
1716		1724
1717	use List::Util qw(min max);	1725	use List::Util qw(min max);
1718		1726
1719	our @ISA = dc::UI::Container::;	1727	our @ISA = DC::UI::Container::;
1720		1728
1721	sub _scale($$$) {	1729	sub _scale($$$) {
1722	my ($rel, $val, $max) = @_;	1730	my ($rel, $val, $max) = @_;
1723		1731
1724	$rel ? $val * $max : $val	1732	$rel ? $val * $max : $val
…		…
1776	1	1784	1
1777	}	1785	}
1778		1786
1779	#############################################################################	1787	#############################################################################
1780		1788
1781	package dc::UI::Box;	1789	package DC::UI::Box;
1782		1790
1783	our @ISA = dc::UI::Container::;	1791	our @ISA = DC::UI::Container::;
1784		1792
1785	sub size_request {	1793	sub size_request {
1786	my ($self) = @_;	1794	my ($self) = @_;
1787		1795
1788	my @children = $self->visible_children;	1796	my @children = $self->visible_children;
…		…
1823	$req[$_] += $space * $children[$_]{expand}	1831	$req[$_] += $space * $children[$_]{expand}
1824	for 0 .. $#children;	1832	for 0 .. $#children;
1825	}	1833	}
1826	}	1834	}
1827		1835
1828	dc::UI::harmonize \@req;	1836	DC::UI::harmonize \@req;
1829		1837
1830	my $pos = 0;	1838	my $pos = 0;
1831	for (0 .. $#children) {	1839	for (0 .. $#children) {
1832	my $alloc = $req[$_];	1840	my $alloc = $req[$_];
1833	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1841	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1838	1	1846	1
1839	}	1847	}
1840		1848
1841	#############################################################################	1849	#############################################################################
1842		1850
1843	package dc::UI::HBox;	1851	package DC::UI::HBox;
1844		1852
1845	our @ISA = dc::UI::Box::;	1853	our @ISA = DC::UI::Box::;
1846		1854
1847	sub new {	1855	sub new {
1848	my $class = shift;	1856	my $class = shift;
1849		1857
1850	$class->SUPER::new (	1858	$class->SUPER::new (
…		…
1853	)	1861	)
1854	}	1862	}
1855		1863
1856	#############################################################################	1864	#############################################################################
1857		1865
1858	package dc::UI::VBox;	1866	package DC::UI::VBox;
1859		1867
1860	our @ISA = dc::UI::Box::;	1868	our @ISA = DC::UI::Box::;
1861		1869
1862	sub new {	1870	sub new {
1863	my $class = shift;	1871	my $class = shift;
1864		1872
1865	$class->SUPER::new (	1873	$class->SUPER::new (
…		…
1868	)	1876	)
1869	}	1877	}
1870		1878
1871	#############################################################################	1879	#############################################################################
1872		1880
1873	package dc::UI::Label;	1881	package DC::UI::Label;
1874		1882
1875	our @ISA = dc::UI::DrawBG::;	1883	our @ISA = DC::UI::DrawBG::;
1876		1884
1877	use dc::OpenGL;	1885	use DC::OpenGL;
1878		1886
1879	sub new {	1887	sub new {
1880	my ($class, %arg) = @_;	1888	my ($class, %arg) = @_;
1881		1889
1882	my $self = $class->SUPER::new (	1890	my $self = $class->SUPER::new (
…		…
1887	#text => initial text	1895	#text => initial text
1888	#markup => initial narkup	1896	#markup => initial narkup
1889	#max_w => maximum pixel width	1897	#max_w => maximum pixel width
1890	#style => 0, # render flags	1898	#style => 0, # render flags
1891	ellipsise => 3, # end	1899	ellipsise => 3, # end
1892	layout => (new dc::Layout),	1900	layout => (new DC::Layout),
1893	fontsize => 1,	1901	fontsize => 1,
1894	align => -1,	1902	align => 0.5,
1895	valign => -1,	1903	valign => 0.5,
1896	padding_x => 2,	1904	padding_x => 4,
1897	padding_y => 2,	1905	padding_y => 2,
1898	can_events => 0,	1906	can_events => 0,
1899	%arg	1907	%arg
1900	);	1908	);
1901		1909
1902	if (exists $self->{template}) {	1910	if (exists $self->{template}) {
1903	my $layout = new dc::Layout;	1911	my $layout = new DC::Layout;
1904	$layout->set_text (delete $self->{template});	1912	$layout->set_text (delete $self->{template});
1905	$self->{template} = $layout;	1913	$self->{template} = $layout;
1906	}	1914	}
1907		1915
1908	if (exists $self->{markup}) {	1916	if (exists $self->{markup}) {
…		…
1967		1975
1968	$self->{size_req} ||= do {	1976	$self->{size_req} ||= do {
1969	my ($max_w, $max_h) = $self->get_max_wh;	1977	my ($max_w, $max_h) = $self->get_max_wh;
1970		1978
1971	$self->{layout}->set_font ($self->{font}) if $self->{font};	1979	$self->{layout}->set_font ($self->{font}) if $self->{font};
1972	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);	1980	$self->{layout}->set_width ($max_w);
1973	$self->{layout}->set_ellipsise ($self->{ellipsise});	1981	$self->{layout}->set_ellipsise ($self->{ellipsise});
1974	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1982	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1975	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1983	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1976		1984
1977	my ($w, $h) = $self->{layout}->size;	1985	my ($w, $h) = $self->{layout}->size;
1978		1986
1979	if (exists $self->{template}) {	1987	if (exists $self->{template}) {
1980	$self->{template}->set_font ($self->{font}) if $self->{font};	1988	$self->{template}->set_font ($self->{font}) if $self->{font};
1981	$self->{template}->set_width ($self->{max_w} || -1);	1989	$self->{template}->set_width ($max_w);
1982	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1990	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1983		1991
1984	my ($w2, $h2) = $self->{template}->size;	1992	my ($w2, $h2) = $self->{template}->size;
1985		1993
1986	$w = List::Util::max $w, $w2;	1994	$w = List::Util::max $w, $w2;
…		…
2042		2050
2043	[$self->{layout}->size]	2051	[$self->{layout}->size]
2044	};	2052	};
2045		2053
2046	unless (exists $self->{ox}) {	2054	unless (exists $self->{ox}) {
2047	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2055	$self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2048	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}	2056	$self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2049	: ($self->{w} - $size->[0]) * 0.5);
2050
2051	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2052	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2053	: ($self->{h} - $size->[1]) * 0.5);
2054		2057
2055	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2058	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2056	};	2059	};
2057		2060
2058	# unless ($self->{list}) {	2061	# unless ($self->{list}) {
2059	# $self->{list} = dc::OpenGL::glGenList;	2062	# $self->{list} = DC::OpenGL::glGenList;
2060	# dc::OpenGL::glNewList $self->{list};	2063	# DC::OpenGL::glNewList $self->{list};
2061	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2064	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2062	# dc::OpenGL::glEndList;	2065	# DC::OpenGL::glEndList;
2063	# }	2066	# }
2064	#	2067	#
2065	# dc::OpenGL::glCallList $self->{list};	2068	# DC::OpenGL::glCallList $self->{list};
2066		2069
2067	$self->{layout}->draw;	2070	$self->{layout}->draw;
2068	}	2071	}
2069		2072
2070	#sub destroy {	2073	#sub destroy {
2071	# my ($self) = @_;	2074	# my ($self) = @_;
2072	#	2075	#
2073	# dc::OpenGL::glDeleteList delete $self->{list} if $self->{list};	2076	# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2074	#	2077	#
2075	# $self->SUPER::destroy;	2078	# $self->SUPER::destroy;
2076	#}	2079	#}
2077		2080
2078	#############################################################################	2081	#############################################################################
2079		2082
2080	package dc::UI::EntryBase;	2083	package DC::UI::EntryBase;
2081		2084
2082	our @ISA = dc::UI::Label::;	2085	our @ISA = DC::UI::Label::;
2083		2086
2084	use dc::OpenGL;	2087	use DC::OpenGL;
2085		2088
2086	sub new {	2089	sub new {
2087	my $class = shift;	2090	my $class = shift;
2088		2091
2089	$class->SUPER::new (	2092	$class->SUPER::new (
2090	fg => [1, 1, 1],	2093	fg => [1, 1, 1],
2091	bg => [0, 0, 0, 0.2],	2094	bg => [0, 0, 0, 0.2],
2092	outline => [0.6, 0.3, 0.1],	2095	outline => undef,
2093	active_bg => [0, 0, 1, .2],	2096	active_bg => [0, 0, 1, .2],
2094	active_fg => [1, 1, 1],	2097	active_fg => [1, 1, 1],
2095	active_outline => [1, 1, 0],	2098	active_outline => [1, 1, 0],
2096	can_hover => 1,	2099	can_hover => 1,
2097	can_focus => 1,	2100	can_focus => 1,
		2101	align => 0,
2098	valign => 0,	2102	valign => 0.5,
2099	can_events => 1,	2103	can_events => 1,
2100	ellipsise => 0,	2104	ellipsise => 0,
		2105	padding_x => 4,
		2106	padding_y => 2,
2101	#text => ...	2107	#text => ...
2102	#hidden => "*",	2108	#hidden => "*",
2103	@_	2109	@_
2104	)	2110	)
2105	}	2111	}
…		…
2152		2158
2153	my $text = $self->get_text;	2159	my $text = $self->get_text;
2154		2160
2155	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;	2161	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2156		2162
2157	if ($uni == 8) {	2163	if ($sym == DC::SDLK_BACKSPACE) {
2158	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2164	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2159	} elsif ($uni == 127) {	2165	} elsif ($sym == DC::SDLK_DELETE) {
2160	substr $text, $self->{cursor}, 1, "";	2166	substr $text, $self->{cursor}, 1, "";
2161	} elsif ($sym == dc::SDLK_LEFT) {	2167	} elsif ($sym == DC::SDLK_LEFT) {
2162	--$self->{cursor} if $self->{cursor};	2168	--$self->{cursor} if $self->{cursor};
2163	} elsif ($sym == dc::SDLK_RIGHT) {	2169	} elsif ($sym == DC::SDLK_RIGHT) {
2164	++$self->{cursor} if $self->{cursor} < length $self->{text};	2170	++$self->{cursor} if $self->{cursor} < length $self->{text};
2165	} elsif ($sym == dc::SDLK_HOME) {	2171	} elsif ($sym == DC::SDLK_HOME) {
2166	# what a hack	2172	# what a hack
2167	$self->{cursor} =	2173	$self->{cursor} =
2168	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2174	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2169	? length $1	2175	? length $1
2170	: 0;	2176	: 0;
2171	} elsif ($sym == dc::SDLK_END) {	2177	} elsif ($sym == DC::SDLK_END) {
2172	# uh, again	2178	# uh, again
2173	$self->{cursor} =	2179	$self->{cursor} =
2174	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2180	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2175	? $self->{cursor} + length $1	2181	? $self->{cursor} + length $1
2176	: length $self->{text};	2182	: length $self->{text};
…		…
2267	glColor @{$self->{active_outline}};	2273	glColor @{$self->{active_outline}};
2268	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;	2274	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2269	glLineWidth 1;	2275	glLineWidth 1;
2270		2276
2271	} else {	2277	} else {
2272	glColor @{$self->{outline}};	2278	glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2273	glBegin GL_LINE_STRIP;	2279	glBegin GL_LINE_STRIP;
2274	glVertex .5, $self->{h} * .5;	2280	glVertex .5, $self->{h} * .5;
2275	glVertex .5, $self->{h} - 2.5;	2281	glVertex .5, $self->{h} - 2.5;
2276	glVertex $self->{w} - .5, $self->{h} - 2.5;	2282	glVertex $self->{w} - .5, $self->{h} - 2.5;
2277	glVertex $self->{w} - .5, $self->{h} * .5;	2283	glVertex $self->{w} - .5, $self->{h} * .5;
…		…
2279	}	2285	}
2280	}	2286	}
2281		2287
2282	#############################################################################	2288	#############################################################################
2283		2289
2284	package dc::UI::Entry;	2290	package DC::UI::Entry;
2285		2291
2286	our @ISA = dc::UI::EntryBase::;	2292	our @ISA = DC::UI::EntryBase::;
2287		2293
2288	use dc::OpenGL;	2294	use DC::OpenGL;
		2295
		2296	sub new {
		2297	my $class = shift;
		2298
		2299	$class->SUPER::new (
		2300	history_pointer => -1,
		2301	@_
		2302	)
		2303	}
		2304
2289		2305
2290	sub invoke_key_down {	2306	sub invoke_key_down {
2291	my ($self, $ev) = @_;	2307	my ($self, $ev) = @_;
2292		2308
2293	my $sym = $ev->{sym};	2309	my $sym = $ev->{sym};
…		…
2299	$self->{history_pointer} = -1;	2315	$self->{history_pointer} = -1;
2300	$self->{history_saveback} = '';	2316	$self->{history_saveback} = '';
2301	$self->emit (activate => $txt);	2317	$self->emit (activate => $txt);
2302	$self->update;	2318	$self->update;
2303		2319
2304	} elsif ($sym == dc::SDLK_UP) {	2320	} elsif ($sym == DC::SDLK_UP) {
2305	if ($self->{history_pointer} < 0) {	2321	if ($self->{history_pointer} < 0) {
2306	$self->{history_saveback} = $self->get_text;	2322	$self->{history_saveback} = $self->get_text;
2307	}	2323	}
2308	if (@{$self->{history} || []} > 0) {	2324	if (@{$self->{history} || []} > 0) {
2309	$self->{history_pointer}++;	2325	$self->{history_pointer}++;
…		…
2311	$self->{history_pointer} = @{$self->{history} || []} - 1;	2327	$self->{history_pointer} = @{$self->{history} || []} - 1;
2312	}	2328	}
2313	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2329	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2314	}	2330	}
2315		2331
2316	} elsif ($sym == dc::SDLK_DOWN) {	2332	} elsif ($sym == DC::SDLK_DOWN) {
2317	$self->{history_pointer}--;	2333	$self->{history_pointer}--;
2318	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2334	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2319		2335
2320	if ($self->{history_pointer} >= 0) {	2336	if ($self->{history_pointer} >= 0) {
2321	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2337	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2322	} else {	2338	} else {
		2339	if (defined $self->{history_saveback}) {
2323	$self->set_text ($self->{history_saveback});	2340	$self->set_text ($self->{history_saveback});
		2341	$self->{history_saveback} = undef;
		2342	}
2324	}	2343	}
2325		2344
2326	} else {	2345	} else {
2327	return $self->SUPER::invoke_key_down ($ev)	2346	return $self->SUPER::invoke_key_down ($ev)
2328	}	2347	}
…		…
2330	1	2349	1
2331	}	2350	}
2332		2351
2333	#############################################################################	2352	#############################################################################
2334		2353
2335	package dc::UI::TextEdit;	2354	package DC::UI::TextEdit;
2336		2355
2337	our @ISA = dc::UI::EntryBase::;	2356	our @ISA = DC::UI::EntryBase::;
2338		2357
2339	use dc::OpenGL;	2358	use DC::OpenGL;
		2359
		2360	sub new {
		2361	my $class = shift;
		2362
		2363	$class->SUPER::new (
		2364	padding_y => 4,
		2365
		2366	@_
		2367	)
		2368	}
2340		2369
2341	sub move_cursor_ver {	2370	sub move_cursor_ver {
2342	my ($self, $dy) = @_;	2371	my ($self, $dy) = @_;
2343		2372
2344	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2373	my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2345		2374
2346	$y += $dy;	2375	$line += $dy;
2347		2376
2348	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {	2377	if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2349	$self->{cursor} = $index;	2378	$self->{cursor} = $index;
2350	delete $self->{cur_h};	2379	delete $self->{cur_h};
2351	$self->update;	2380	$self->update;
2352	return;	2381	return;
2353	}	2382	}
…		…
2356	sub invoke_key_down {	2385	sub invoke_key_down {
2357	my ($self, $ev) = @_;	2386	my ($self, $ev) = @_;
2358		2387
2359	my $sym = $ev->{sym};	2388	my $sym = $ev->{sym};
2360		2389
2361	if ($sym == dc::SDLK_UP) {	2390	if ($sym == DC::SDLK_UP) {
2362	$self->move_cursor_ver (-1);	2391	$self->move_cursor_ver (-1);
2363	} elsif ($sym == dc::SDLK_DOWN) {	2392	} elsif ($sym == DC::SDLK_DOWN) {
2364	$self->move_cursor_ver (+1);	2393	$self->move_cursor_ver (+1);
2365	} else {	2394	} else {
2366	return $self->SUPER::invoke_key_down ($ev)	2395	return $self->SUPER::invoke_key_down ($ev)
2367	}	2396	}
2368		2397
2369	1	2398	1
2370	}	2399	}
2371		2400
2372	#############################################################################	2401	#############################################################################
2373		2402
2374	package dc::UI::ButtonBin;	2403	package DC::UI::ButtonBin;
2375		2404
2376	our @ISA = dc::UI::Bin::;	2405	our @ISA = DC::UI::Bin::;
2377		2406
2378	use dc::OpenGL;	2407	use DC::OpenGL;
2379		2408
2380	my @tex =	2409	my @tex =
2381	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }	2410	map { new_from_resource DC::Texture $_, mipmap => 1 }
2382	qw(b1_button_inactive.png b1_button_active.png);	2411	qw(b1_button_inactive.png b1_button_active.png);
2383		2412
2384	sub new {	2413	sub new {
2385	my $class = shift;	2414	my $class = shift;
2386		2415
2387	$class->SUPER::new (	2416	$class->SUPER::new (
2388	can_hover => 1,	2417	can_hover => 1,
2389	align => 0,	2418	align => 0.5,
2390	valign => 0,	2419	valign => 0.5,
2391	can_events => 1,	2420	can_events => 1,
2392	@_	2421	@_
2393	)	2422	)
2394	}	2423	}
2395		2424
…		…
2418	$self->SUPER::_draw;	2447	$self->SUPER::_draw;
2419	}	2448	}
2420		2449
2421	#############################################################################	2450	#############################################################################
2422		2451
2423	package dc::UI::Button;	2452	package DC::UI::Button;
2424		2453
2425	our @ISA = dc::UI::Label::;	2454	our @ISA = DC::UI::Label::;
2426		2455
2427	use dc::OpenGL;	2456	use DC::OpenGL;
2428		2457
2429	my @tex =	2458	my @tex =
2430	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }	2459	map { new_from_resource DC::Texture $_, mipmap => 1 }
2431	qw(b1_button_inactive.png b1_button_active.png);	2460	qw(b1_button_inactive.png b1_button_active.png);
2432		2461
2433	sub new {	2462	sub new {
2434	my $class = shift;	2463	my $class = shift;
2435		2464
2436	$class->SUPER::new (	2465	$class->SUPER::new (
2437	padding_x => 4,	2466	padding_x => 8,
2438	padding_y => 4,	2467	padding_y => 4,
2439	fg => [1.0, 1.0, 1.0],	2468	fg => [1.0, 1.0, 1.0],
2440	active_fg => [0.8, 0.8, 0.8],	2469	active_fg => [0.8, 0.8, 0.8],
2441	can_hover => 1,	2470	can_hover => 1,
2442	align => 0,	2471	align => 0.5,
2443	valign => 0,	2472	valign => 0.5,
2444	can_events => 1,	2473	can_events => 1,
2445	@_	2474	@_
2446	)	2475	)
2447	}	2476	}
2448		2477
…		…
2473	$self->SUPER::_draw;	2502	$self->SUPER::_draw;
2474	}	2503	}
2475		2504
2476	#############################################################################	2505	#############################################################################
2477		2506
2478	package dc::UI::CheckBox;	2507	package DC::UI::CheckBox;
2479		2508
2480	our @ISA = dc::UI::DrawBG::;	2509	our @ISA = DC::UI::DrawBG::;
2481		2510
2482	my @tex =	2511	my @tex =
2483	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }	2512	map { new_from_resource DC::Texture $_, mipmap => 1 }
2484	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2513	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2485		2514
2486	use dc::OpenGL;	2515	use DC::OpenGL;
2487		2516
2488	sub new {	2517	sub new {
2489	my $class = shift;	2518	my $class = shift;
2490		2519
2491	$class->SUPER::new (	2520	$class->SUPER::new (
…		…
2548	glDisable GL_TEXTURE_2D;	2577	glDisable GL_TEXTURE_2D;
2549	}	2578	}
2550		2579
2551	#############################################################################	2580	#############################################################################
2552		2581
2553	package dc::UI::Image;	2582	package DC::UI::Image;
2554		2583
2555	our @ISA = dc::UI::Base::;	2584	our @ISA = DC::UI::Base::;
2556		2585
2557	use dc::OpenGL;	2586	use DC::OpenGL;
2558		2587
2559	our %texture_cache;	2588	our %texture_cache;
2560		2589
2561	sub new {	2590	sub new {
2562	my $class = shift;	2591	my $class = shift;
…		…
2569		2598
2570	$self->{path} || $self->{tex}	2599	$self->{path} || $self->{tex}
2571	or Carp::croak "'path' or 'tex' attributes required";	2600	or Carp::croak "'path' or 'tex' attributes required";
2572		2601
2573	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2602	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2574	new_from_file dc::Texture dc::find_rcfile $self->{path}, mipmap => 1;	2603	new_from_resource DC::Texture $self->{path}, mipmap => 1;
2575		2604
2576	dc::weaken $texture_cache{$self->{path}};	2605	DC::weaken $texture_cache{$self->{path}};
2577		2606
2578	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2607	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2579		2608
2580	$self	2609	$self
2581	}	2610	}
2582		2611
2583	sub STORABLE_freeze {	2612	sub STORABLE_freeze {
2584	my ($self, $cloning) = @_;	2613	my ($self, $cloning) = @_;
2585		2614
2586	$self->{path}	2615	$self->{path}
2587	or die "cannot serialise dc::UI::Image on non-loadable images\n";	2616	or die "cannot serialise DC::UI::Image on non-loadable images\n";
2588		2617
2589	$self->{path}	2618	$self->{path}
2590	}	2619	}
2591		2620
2592	sub STORABLE_attach {	2621	sub STORABLE_attach {
…		…
2623	glDisable GL_TEXTURE_2D;	2652	glDisable GL_TEXTURE_2D;
2624	}	2653	}
2625		2654
2626	#############################################################################	2655	#############################################################################
2627		2656
2628	package dc::UI::ImageButton;	2657	package DC::UI::ImageButton;
2629		2658
2630	our @ISA = dc::UI::Image::;	2659	our @ISA = DC::UI::Image::;
2631		2660
2632	use dc::OpenGL;	2661	use DC::OpenGL;
2633		2662
2634	my %textures;	2663	my %textures;
2635		2664
2636	sub new {	2665	sub new {
2637	my $class = shift;	2666	my $class = shift;
…		…
2640	padding_x => 4,	2669	padding_x => 4,
2641	padding_y => 4,	2670	padding_y => 4,
2642	fg => [1, 1, 1],	2671	fg => [1, 1, 1],
2643	active_fg => [0, 0, 1],	2672	active_fg => [0, 0, 1],
2644	can_hover => 1,	2673	can_hover => 1,
2645	align => 0,	2674	align => 0.5,
2646	valign => 0,	2675	valign => 0.5,
2647	can_events => 1,	2676	can_events => 1,
2648	@_	2677	@_
2649	);	2678	);
2650	}	2679	}
2651		2680
…		…
2665	1	2694	1
2666	}	2695	}
2667		2696
2668	#############################################################################	2697	#############################################################################
2669		2698
2670	package dc::UI::VGauge;	2699	package DC::UI::VGauge;
2671		2700
2672	our @ISA = dc::UI::Base::;	2701	our @ISA = DC::UI::Base::;
2673		2702
2674	use List::Util qw(min max);	2703	use List::Util qw(min max);
2675		2704
2676	use dc::OpenGL;	2705	use DC::OpenGL;
2677		2706
2678	my %tex = (	2707	my %tex = (
2679	food => [	2708	food => [
2680	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }	2709	map { new_from_resource DC::Texture $_, mipmap => 1 }
2681	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2710	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2682	],	2711	],
2683	grace => [	2712	grace => [
2684	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }	2713	map { new_from_resource DC::Texture $_, mipmap => 1 }
2685	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2714	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2686	],	2715	],
2687	hp => [	2716	hp => [
2688	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }	2717	map { new_from_resource DC::Texture $_, mipmap => 1 }
2689	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2718	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2690	],	2719	],
2691	mana => [	2720	mana => [
2692	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }	2721	map { new_from_resource DC::Texture $_, mipmap => 1 }
2693	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2722	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2694	],	2723	],
2695	);	2724	);
2696		2725
2697	# eg. VGauge->new (gauge => 'food'), default gauge: food	2726	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2800	glDisable GL_TEXTURE_2D;	2829	glDisable GL_TEXTURE_2D;
2801	}	2830	}
2802		2831
2803	#############################################################################	2832	#############################################################################
2804		2833
2805	package dc::UI::Progress;	2834	package DC::UI::Progress;
2806		2835
2807	our @ISA = dc::UI::Label::;	2836	our @ISA = DC::UI::Label::;
2808		2837
2809	use dc::OpenGL;	2838	use DC::OpenGL;
2810		2839
2811	sub new {	2840	sub new {
2812	my ($class, %arg) = @_;	2841	my ($class, %arg) = @_;
2813		2842
2814	my $self = $class->SUPER::new (	2843	my $self = $class->SUPER::new (
2815	fg => [1, 1, 1],	2844	fg => [1, 1, 1],
2816	bg => [0, 0, 1, 0.2],	2845	bg => [0, 0, 1, 0.2],
2817	bar => [0.7, 0.5, 0.1, 0.8],	2846	bar => [0.7, 0.5, 0.1, 0.8],
2818	outline => [0.4, 0.3, 0],	2847	outline => [0.4, 0.3, 0],
2819	fontsize => 0.9,	2848	fontsize => 0.9,
2820	valign => 0,	2849	valign => 0.5,
2821	align => 0,	2850	align => 0.5,
2822	can_events => 1,	2851	can_events => 1,
2823	ellipsise => 1,	2852	ellipsise => 1,
2824	label => "%d%%",	2853	label => "%d%%",
2825	%arg,	2854	%arg,
2826	);	2855	);
…		…
2834	my ($self, $label) = @_;	2863	my ($self, $label) = @_;
2835		2864
2836	return if $self->{label} eq $label;	2865	return if $self->{label} eq $label;
2837	$self->{label} = $label;	2866	$self->{label} = $label;
2838		2867
2839	$self->dc::UI::Progress::set_value (0 + delete $self->{value});	2868	$self->DC::UI::Progress::set_value (0 + delete $self->{value});
2840	}	2869	}
2841		2870
2842	sub set_value {	2871	sub set_value {
2843	my ($self, $value) = @_;	2872	my ($self, $value) = @_;
2844		2873
…		…
2881	}	2910	}
2882	}	2911	}
2883		2912
2884	#############################################################################	2913	#############################################################################
2885		2914
2886	package dc::UI::ExperienceProgress;	2915	package DC::UI::ExperienceProgress;
2887		2916
2888	our @ISA = dc::UI::Progress::;	2917	our @ISA = DC::UI::Progress::;
2889		2918
2890	sub new {	2919	sub new {
2891	my ($class, %arg) = @_;	2920	my ($class, %arg) = @_;
2892		2921
2893	my $self = $class->SUPER::new (	2922	my $self = $class->SUPER::new (
…		…
2938	$self->SUPER::set_value ($v);	2967	$self->SUPER::set_value ($v);
2939	}	2968	}
2940		2969
2941	#############################################################################	2970	#############################################################################
2942		2971
2943	package dc::UI::Gauge;	2972	package DC::UI::Gauge;
2944		2973
2945	our @ISA = dc::UI::VBox::;	2974	our @ISA = DC::UI::VBox::;
2946		2975
2947	sub new {	2976	sub new {
2948	my ($class, %arg) = @_;	2977	my ($class, %arg) = @_;
2949		2978
2950	my $self = $class->SUPER::new (	2979	my $self = $class->SUPER::new (
…		…
2952	can_hover => 1,	2981	can_hover => 1,
2953	can_events => 1,	2982	can_events => 1,
2954	%arg,	2983	%arg,
2955	);	2984	);
2956		2985
2957	$self->add ($self->{value} = new dc::UI::Label valign => +1, align => 0, template => "999");	2986	$self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2958	$self->add ($self->{gauge} = new dc::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2987	$self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2959	$self->add ($self->{max} = new dc::UI::Label valign => -1, align => 0, template => "999");	2988	$self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2960		2989
2961	$self	2990	$self
2962	}	2991	}
2963		2992
2964	sub set_fontsize {	2993	sub set_fontsize {
…		…
2985	$self->{value}->set_text ($val);	3014	$self->{value}->set_text ($val);
2986	}	3015	}
2987		3016
2988	#############################################################################	3017	#############################################################################
2989		3018
2990	package dc::UI::Slider;	3019	package DC::UI::Slider;
2991		3020
2992	use strict;	3021	use strict;
2993		3022
2994	use dc::OpenGL;	3023	use DC::OpenGL;
2995		3024
2996	our @ISA = dc::UI::DrawBG::;	3025	our @ISA = DC::UI::DrawBG::;
2997		3026
2998	my @tex =	3027	my @tex =
2999	map { new_from_file dc::Texture dc::find_rcfile $_ }	3028	map { new_from_resource DC::Texture $_ }
3000	qw(s1_slider.png s1_slider_bg.png);	3029	qw(s1_slider.png s1_slider_bg.png);
3001		3030
3002	sub new {	3031	sub new {
3003	my $class = shift;	3032	my $class = shift;
3004		3033
…		…
3041	sub set_value {	3070	sub set_value {
3042	my ($self, $value) = @_;	3071	my ($self, $value) = @_;
3043		3072
3044	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	3073	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
3045		3074
3046	$hi = $lo + 1 if $hi <= $lo;	3075	$hi = $lo if $hi < $lo;
3047		3076
3048	$page = $hi - $lo if $page > $hi - $lo;	3077	$value = $hi - $page if $value > $hi - $page;
3049
3050	$value = $lo if $value < $lo;	3078	$value = $lo if $value < $lo;
3051	$value = $hi - $page if $value > $hi - $page;
3052		3079
3053	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	3080	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
3054	if $unit;	3081	if $unit;
3055		3082
3056	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3083	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
…		…
3100	sub invoke_mouse_wheel {	3127	sub invoke_mouse_wheel {
3101	my ($self, $ev) = @_;	3128	my ($self, $ev) = @_;
3102		3129
3103	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3130	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3104		3131
3105	my $pagepart = $ev->{mod} & dc::KMOD_SHIFT ? 1 : 0.2;	3132	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3106		3133
3107	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3134	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3108		3135
3109	1	3136	1
3110	}	3137	}
…		…
3120	my ($self) = @_;	3147	my ($self) = @_;
3121		3148
3122	unless ($self->{knob_w}) {	3149	unless ($self->{knob_w}) {
3123	$self->set_value ($self->{range}[0]);	3150	$self->set_value ($self->{range}[0]);
3124		3151
3125	my ($value, $lo, $hi, $page) = @{$self->{range}};	3152	my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
3126	my $range = ($hi - $page - $lo) || 1e-100;	3153	my $range = ($hi - $page - $lo) || 1e-10;
3127		3154
3128	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;	3155	my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
3129		3156
3130	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;	3157	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
3131	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;	3158	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
3132		3159
3133	$value = ($value - $lo) / $range;	3160	$value = ($value - $lo) / $range;
…		…
3163	glDisable GL_TEXTURE_2D;	3190	glDisable GL_TEXTURE_2D;
3164	}	3191	}
3165		3192
3166	#############################################################################	3193	#############################################################################
3167		3194
3168	package dc::UI::ValSlider;	3195	package DC::UI::ValSlider;
3169		3196
3170	our @ISA = dc::UI::HBox::;	3197	our @ISA = DC::UI::HBox::;
3171		3198
3172	sub new {	3199	sub new {
3173	my ($class, %arg) = @_;	3200	my ($class, %arg) = @_;
3174		3201
3175	my $range = delete $arg{range};	3202	my $range = delete $arg{range};
3176		3203
3177	my $self = $class->SUPER::new (	3204	my $self = $class->SUPER::new (
3178	slider => (new dc::UI::Slider expand => 1, range => $range),	3205	slider => (new DC::UI::Slider expand => 1, range => $range),
3179	entry => (new dc::UI::Label text => "", template => delete $arg{template}),	3206	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3180	to_value => sub { shift },	3207	to_value => sub { shift },
3181	from_value => sub { shift },	3208	from_value => sub { shift },
3182	%arg,	3209	%arg,
3183	);	3210	);
3184		3211
…		…
3204	sub set_range { shift->{slider}->set_range (@_) }	3231	sub set_range { shift->{slider}->set_range (@_) }
3205	sub set_value { shift->{slider}->set_value (@_) }	3232	sub set_value { shift->{slider}->set_value (@_) }
3206		3233
3207	#############################################################################	3234	#############################################################################
3208		3235
3209	package dc::UI::TextScroller;	3236	package DC::UI::TextScroller;
3210		3237
3211	our @ISA = dc::UI::HBox::;	3238	our @ISA = DC::UI::HBox::;
3212		3239
3213	use dc::OpenGL;	3240	use DC::OpenGL;
3214		3241
3215	sub new {	3242	sub new {
3216	my $class = shift;	3243	my $class = shift;
3217		3244
3218	my $self = $class->SUPER::new (	3245	my $self = $class->SUPER::new (
…		…
3220	can_events => 1,	3247	can_events => 1,
3221	indent => 0,	3248	indent => 0,
3222	#font => default_font	3249	#font => default_font
3223	@_,	3250	@_,
3224		3251
3225	layout => (new dc::Layout),	3252	layout => (new DC::Layout),
3226	par => [],	3253	par => [],
3227	max_par => 0,	3254	max_par => 0,
3228	height => 0,	3255	height => 0,
3229	children => [	3256	children => [
3230	(new dc::UI::Empty expand => 1),	3257	(new DC::UI::Empty expand => 1),
3231	(new dc::UI::Slider vertical => 1),	3258	(new DC::UI::Slider vertical => 1),
3232	],	3259	],
3233	);	3260	);
3234		3261
3235	$self->{children}[1]->connect (changed => sub { $self->update });	3262	$self->{children}[1]->connect (changed => sub { $self->update });
3236		3263
…		…
3292	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3319	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3293	$layout->set_markup ($para->{markup});	3320	$layout->set_markup ($para->{markup});
3294		3321
3295	$layout->set_shapes (	3322	$layout->set_shapes (
3296	map	3323	map
3297	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),	3324	+(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3298	@{$para->{widget}}	3325	@{$para->{widget}}
3299	);	3326	);
3300		3327
3301	$layout	3328	$layout
3302	}	3329	}
…		…
3419	$ROOT->on_post_alloc ($self => sub {	3446	$ROOT->on_post_alloc ($self => sub {
3420	$self->force_uptodate;	3447	$self->force_uptodate;
3421		3448
3422	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3449	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3423		3450
3424	$self->{texture} ||= new_from_opengl dc::Texture $W, $H, sub {	3451	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3425	glClearColor 0, 0, 0, 0;	3452	glClearColor 0, 0, 0, 0;
3426	glClear GL_COLOR_BUFFER_BIT;	3453	glClear GL_COLOR_BUFFER_BIT;
3427		3454
3428	package dc::UI::Base;	3455	package DC::UI::Base;
3429	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3456	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3430	(0, 0, $self->{w}, $self->{h});	3457	(0, 0, $self->{w}, $self->{h});
3431		3458
3432	my $top = int $self->{children}[1]{range}[0];	3459	my $top = int $self->{children}[1]{range}[0];
3433		3460
…		…
3492	$self->{children}[1]->draw;	3519	$self->{children}[1]->draw;
3493	}	3520	}
3494		3521
3495	#############################################################################	3522	#############################################################################
3496		3523
3497	package dc::UI::Animator;	3524	package DC::UI::Animator;
3498		3525
3499	use dc::OpenGL;	3526	use DC::OpenGL;
3500		3527
3501	our @ISA = dc::UI::Bin::;	3528	our @ISA = DC::UI::Bin::;
3502		3529
3503	sub moveto {	3530	sub moveto {
3504	my ($self, $x, $y) = @_;	3531	my ($self, $x, $y) = @_;
3505		3532
3506	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3533	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3534	glPopMatrix;	3561	glPopMatrix;
3535	}	3562	}
3536		3563
3537	#############################################################################	3564	#############################################################################
3538		3565
3539	package dc::UI::Flopper;	3566	package DC::UI::Flopper;
3540		3567
3541	our @ISA = dc::UI::Button::;	3568	our @ISA = DC::UI::Button::;
3542		3569
3543	sub new {	3570	sub new {
3544	my $class = shift;	3571	my $class = shift;
3545		3572
3546	my $self = $class->SUPER::new (	3573	my $self = $class->SUPER::new (
…		…
3558	$self->{other}->toggle_visibility;	3585	$self->{other}->toggle_visibility;
3559	}	3586	}
3560		3587
3561	#############################################################################	3588	#############################################################################
3562		3589
3563	package dc::UI::Tooltip;	3590	package DC::UI::Tooltip;
3564		3591
3565	our @ISA = dc::UI::Bin::;	3592	our @ISA = DC::UI::Bin::;
3566		3593
3567	use dc::OpenGL;	3594	use DC::OpenGL;
3568		3595
3569	sub new {	3596	sub new {
3570	my $class = shift;	3597	my $class = shift;
3571		3598
3572	$class->SUPER::new (	3599	$class->SUPER::new (
…		…
3579	my ($self, $widget) = @_;	3606	my ($self, $widget) = @_;
3580		3607
3581	my $tip = $widget->{tooltip};	3608	my $tip = $widget->{tooltip};
3582	$tip = $tip->($widget) if "CODE" eq ref $tip;	3609	$tip = $tip->($widget) if "CODE" eq ref $tip;
3583		3610
3584	$tip = dc::Pod::section_label tooltip => $1	3611	$tip = DC::Pod::section_label tooltip => $1
3585	if $tip =~ /^#(.*)$/;	3612	if $tip =~ /^#(.*)$/;
3586		3613
3587	if ($ENV{CFPLUS_DEBUG} & 2) {	3614	if ($ENV{CFPLUS_DEBUG} & 2) {
3588	$tip .= "\n\n" . (ref $widget) . "\n"	3615	$tip .= "\n\n" . (ref $widget) . "\n"
3589	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3616	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
…		…
3592	}	3619	}
3593		3620
3594	$tip =~ s/^\n+//;	3621	$tip =~ s/^\n+//;
3595	$tip =~ s/\n+$//;	3622	$tip =~ s/\n+$//;
3596		3623
3597	$self->add (new dc::UI::Label	3624	$self->add (new DC::UI::Label
		3625	fg => $DC::THEME{tooltip_fg},
3598	markup => $tip,	3626	markup => $tip,
3599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3627	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3628	align => 0,
3600	fontsize => 0.8,	3629	fontsize => 0.8,
3601	style => 1, # FLAG_INVERSE	3630	style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3602	ellipsise => 0,	3631	ellipsise => 0,
3603	font => ($widget->{tooltip_font} || $::FONT_PROP),	3632	font => ($widget->{tooltip_font} || $::FONT_PROP),
3604	);	3633	);
3605	}	3634	}
3606		3635
…		…
3643	sub _draw {	3672	sub _draw {
3644	my ($self) = @_;	3673	my ($self) = @_;
3645		3674
3646	my ($w, $h) = @$self{qw(w h)};	3675	my ($w, $h) = @$self{qw(w h)};
3647		3676
3648	glColor 1, 0.8, 0.4;	3677	glColor @{ $DC::THEME{tooltip_bg} };
3649	glRect 0, 0, $w, $h;	3678	glRect 0, 0, $w, $h;
3650		3679
3651	glColor 0, 0, 0;	3680	glColor @{ $DC::THEME{tooltip_border} };
3652	glRect_lineloop .5, .5, $w + .5, $h + .5;	3681	glRect_lineloop .5, .5, $w + .5, $h + .5;
3653		3682
3654	glTranslate 2, 2;	3683	glTranslate 2, 2;
3655		3684
3656	$self->SUPER::_draw;	3685	$self->SUPER::_draw;
3657	}	3686	}
3658		3687
3659	#############################################################################	3688	#############################################################################
3660		3689
3661	package dc::UI::Face;	3690	package DC::UI::Face;
3662		3691
3663	our @ISA = dc::UI::DrawBG::;	3692	our @ISA = DC::UI::DrawBG::;
3664		3693
3665	use dc::OpenGL;	3694	use DC::OpenGL;
3666		3695
3667	sub new {	3696	sub new {
3668	my $class = shift;	3697	my $class = shift;
3669		3698
3670	my $self = $class->SUPER::new (	3699	my $self = $class->SUPER::new (
…		…
3674	can_events => 0,	3703	can_events => 0,
3675	@_,	3704	@_,
3676	);	3705	);
3677		3706
3678	if ($self->{anim} && $self->{animspeed}) {	3707	if ($self->{anim} && $self->{animspeed}) {
3679	dc::weaken (my $widget = $self);	3708	DC::weaken (my $widget = $self);
3680		3709
3681	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};	3710	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3682	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {	3711	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3683	return unless $::CONN;	3712	return unless $::CONN;
3684		3713
…		…
3790	$self->SUPER::destroy;	3819	$self->SUPER::destroy;
3791	}	3820	}
3792		3821
3793	#############################################################################	3822	#############################################################################
3794		3823
3795	package dc::UI::Buttonbar;	3824	package DC::UI::Buttonbar;
3796		3825
3797	our @ISA = dc::UI::HBox::;	3826	our @ISA = DC::UI::HBox::;
3798		3827
3799	# TODO: should actually wrap buttons and other goodies.	3828	# TODO: should actually wrap buttons and other goodies.
3800		3829
3801	#############################################################################	3830	#############################################################################
3802		3831
3803	package dc::UI::Menu;	3832	package DC::UI::Menu;
3804		3833
3805	our @ISA = dc::UI::Toplevel::;	3834	our @ISA = DC::UI::Toplevel::;
3806		3835
3807	use dc::OpenGL;	3836	use DC::OpenGL;
3808		3837
3809	sub new {	3838	sub new {
3810	my $class = shift;	3839	my $class = shift;
3811		3840
3812	my $self = $class->SUPER::new (	3841	my $self = $class->SUPER::new (
3813	items => [],	3842	items => [],
3814	z => 100,	3843	z => 100,
3815	@_,	3844	@_,
3816	);	3845	);
3817		3846
3818	$self->add ($self->{vbox} = new dc::UI::VBox);	3847	$self->add ($self->{vbox} = new DC::UI::VBox);
3819		3848
3820	for my $item (@{ $self->{items} }) {	3849	for my $item (@{ $self->{items} }) {
3821	my ($widget, $cb, $tooltip) = @$item;	3850	my ($widget, $cb, $tooltip) = @$item;
3822		3851
3823	# handle various types of items, only text for now	3852	# handle various types of items, only text for now
3824	if (!ref $widget) {	3853	if (!ref $widget) {
3825	if ($widget =~ /\t/) {	3854	if ($widget =~ /\t/) {
3826	my ($left, $right) = split /\t/, $widget, 2;	3855	my ($left, $right) = split /\t/, $widget, 2;
3827		3856
3828	$widget = new dc::UI::HBox	3857	$widget = new DC::UI::HBox
3829	can_hover => 1,	3858	can_hover => 1,
3830	can_events => 1,	3859	can_events => 1,
3831	tooltip => $tooltip,	3860	tooltip => $tooltip,
3832	children => [	3861	children => [
3833	(new dc::UI::Label markup => $left, expand => 1),	3862	(new DC::UI::Label markup => $left , align => 0, expand => 1),
3834	(new dc::UI::Label markup => $right, align => +1),	3863	(new DC::UI::Label markup => $right, align => 1),
3835	],	3864	],
3836	;	3865	;
3837		3866
3838	} else {	3867	} else {
3839	$widget = new dc::UI::Label	3868	$widget = new DC::UI::Label
3840	can_hover => 1,	3869	can_hover => 1,
3841	can_events => 1,	3870	can_events => 1,
		3871	align => 0,
3842	markup => $widget,	3872	markup => $widget,
3843	tooltip => $tooltip;	3873	tooltip => $tooltip;
3844	}	3874	}
3845	}	3875	}
3846		3876
…		…
3892	1	3922	1
3893	}	3923	}
3894		3924
3895	#############################################################################	3925	#############################################################################
3896		3926
3897	package dc::UI::Multiplexer;	3927	package DC::UI::Multiplexer;
3898		3928
3899	our @ISA = dc::UI::Container::;	3929	our @ISA = DC::UI::Container::;
3900		3930
3901	sub new {	3931	sub new {
3902	my $class = shift;	3932	my $class = shift;
3903		3933
3904	my $self = $class->SUPER::new (	3934	my $self = $class->SUPER::new (
…		…
3965	$self->{current}->draw;	3995	$self->{current}->draw;
3966	}	3996	}
3967		3997
3968	#############################################################################	3998	#############################################################################
3969		3999
3970	package dc::UI::Notebook;	4000	package DC::UI::Notebook;
3971		4001
3972	use dc::OpenGL;	4002	use DC::OpenGL;
3973		4003
3974	our @ISA = dc::UI::VBox::;	4004	our @ISA = DC::UI::VBox::;
3975		4005
3976	sub new {	4006	sub new {
3977	my $class = shift;	4007	my $class = shift;
3978		4008
3979	my $self = $class->SUPER::new (	4009	my $self = $class->SUPER::new (
3980	buttonbar => (new dc::UI::Buttonbar),	4010	buttonbar => (new DC::UI::Buttonbar),
3981	multiplexer => (new dc::UI::Multiplexer expand => 1),	4011	multiplexer => (new DC::UI::Multiplexer expand => 1),
3982	active_outline => [.7, .7, 0.2],	4012	active_outline => [.7, .7, 0.2],
3983	# filter => # will be put between multiplexer and $self	4013	# filter => # will be put between multiplexer and $self
3984	@_,	4014	@_,
3985	);	4015	);
3986		4016
…		…
3995		4025
3996	for my $child (@$widgets) {	4026	for my $child (@$widgets) {
3997	Scalar::Util::weaken $child;	4027	Scalar::Util::weaken $child;
3998	$child->{c_tab_} ||= do {	4028	$child->{c_tab_} ||= do {
3999	my $tab =	4029	my $tab =
4000	(UNIVERSAL::isa $child->{c_tab}, "dc::UI::Base")	4030	(UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4001	? $child->{c_tab}	4031	? $child->{c_tab}
4002	: new dc::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];	4032	: new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4003		4033
4004	$tab->connect (activate => sub {	4034	$tab->connect (activate => sub {
4005	$wself->set_current_page ($child);	4035	$wself->set_current_page ($child);
4006	});	4036	});
4007		4037
…		…
4037	}	4067	}
4038		4068
4039	sub pages {	4069	sub pages {
4040	my ($self) = @_;	4070	my ($self) = @_;
4041	$self->{multiplexer}->children	4071	$self->{multiplexer}->children
		4072	}
		4073
		4074	sub page_index {
		4075	my ($self, $widget) = @_;
		4076
		4077	my $i = 0;
		4078	for ($self->pages) {
		4079	if ($_ eq $widget) { return $i };
		4080	$i++;
		4081	}
		4082
		4083	undef
4042	}	4084	}
4043		4085
4044	sub add_tab {	4086	sub add_tab {
4045	my ($self, $title, $widget, $tooltip) = @_;	4087	my ($self, $title, $widget, $tooltip) = @_;
4046		4088
…		…
4083	}	4125	}
4084	}	4126	}
4085		4127
4086	#############################################################################	4128	#############################################################################
4087		4129
4088	package dc::UI::Selector;	4130	package DC::UI::Selector;
4089		4131
4090	use utf8;	4132	use utf8;
4091		4133
4092	our @ISA = dc::UI::Button::;	4134	our @ISA = DC::UI::Button::;
4093		4135
4094	sub new {	4136	sub new {
4095	my $class = shift;	4137	my $class = shift;
4096		4138
4097	my $self = $class->SUPER::new (	4139	my $self = $class->SUPER::new (
…		…
4114	my ($value, $title, $tooltip) = @$_;	4156	my ($value, $title, $tooltip) = @$_;
4115		4157
4116	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4158	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4117	}	4159	}
4118		4160
4119	dc::UI::Menu->new (items => \@menu_items)->popup ($ev);	4161	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
4120	}	4162	}
4121		4163
4122	sub _set_value {	4164	sub _set_value {
4123	my ($self, $value) = @_;	4165	my ($self, $value) = @_;
4124		4166
…		…
4147	$self->_set_value ($self->{value});	4189	$self->_set_value ($self->{value});
4148	}	4190	}
4149		4191
4150	#############################################################################	4192	#############################################################################
4151		4193
4152	package dc::UI::Statusbox;	4194	package DC::UI::Statusbox;
4153		4195
4154	our @ISA = dc::UI::VBox::;	4196	our @ISA = DC::UI::VBox::;
4155		4197
4156	sub new {	4198	sub new {
4157	my $class = shift;	4199	my $class = shift;
4158		4200
4159	my $self = $class->SUPER::new (	4201	my $self = $class->SUPER::new (
4160	fontsize => 0.8,	4202	fontsize => 0.8,
4161	@_,	4203	@_,
4162	);	4204	);
4163		4205
4164	dc::weaken (my $this = $self);	4206	DC::weaken (my $this = $self);
4165		4207
4166	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };	4208	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4167		4209
4168	$self	4210	$self
4169	}	4211	}
…		…
4171	sub reorder {	4213	sub reorder {
4172	my ($self) = @_;	4214	my ($self) = @_;
4173	my $NOW = Time::HiRes::time;	4215	my $NOW = Time::HiRes::time;
4174		4216
4175	# freeze display when hovering over any label	4217	# freeze display when hovering over any label
4176	return if $dc::UI::TOOLTIP->{owner}	4218	return if $DC::UI::TOOLTIP->{owner}
4177	&& grep $dc::UI::TOOLTIP->{owner} == $_->{label},	4219	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4178	values %{ $self->{item} };	4220	values %{ $self->{item} };
4179		4221
4180	while (my ($k, $v) = each %{ $self->{item} }) {	4222	while (my ($k, $v) = each %{ $self->{item} }) {
4181	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4223	delete $self->{item}{$k} if $v->{timeout} < $NOW;
4182	}	4224	}
…		…
4203	for ($short) {	4245	for ($short) {
4204	s/^\s+//;	4246	s/^\s+//;
4205	s/\s+/ /g;	4247	s/\s+/ /g;
4206	}	4248	}
4207		4249
4208	new dc::UI::Label	4250	new DC::UI::Label
4209	markup => $short,	4251	markup => $short,
4210	tooltip => $item->{tooltip},	4252	tooltip => $item->{tooltip},
4211	tooltip_font => $::FONT_PROP,	4253	tooltip_font => $::FONT_PROP,
4212	tooltip_width => 0.67,	4254	tooltip_width => 0.67,
4213	fontsize => $item->{fontsize} || $self->{fontsize},	4255	fontsize => $item->{fontsize} || $self->{fontsize},
4214	max_w => $::WIDTH * 0.44,	4256	max_w => $::WIDTH * 0.44,
		4257	align => 0,
4215	fg => [@{ $item->{fg} }],	4258	fg => [@{ $item->{fg} }],
4216	can_events => 1,	4259	can_events => 1,
4217	can_hover => 1	4260	can_hover => 1
4218	};	4261	};
4219		4262
…		…
4292	$self->SUPER::destroy;	4335	$self->SUPER::destroy;
4293	}	4336	}
4294		4337
4295	#############################################################################	4338	#############################################################################
4296		4339
4297	package dc::UI::Root;	4340	package DC::UI::Root;
4298		4341
4299	our @ISA = dc::UI::Container::;	4342	our @ISA = DC::UI::Container::;
4300		4343
4301	use List::Util qw(min max);	4344	use List::Util qw(min max);
4302		4345
4303	use dc::OpenGL;	4346	use DC::OpenGL;
4304		4347
4305	sub new {	4348	sub new {
4306	my $class = shift;	4349	my $class = shift;
4307		4350
4308	my $self = $class->SUPER::new (	4351	my $self = $class->SUPER::new (
4309	visible => 1,	4352	visible => 1,
4310	@_,	4353	@_,
4311	);	4354	);
4312		4355
4313	dc::weaken ($self->{root} = $self);	4356	DC::weaken ($self->{root} = $self);
4314		4357
4315	$self	4358	$self
4316	}	4359	}
4317		4360
4318	sub size_request {	4361	sub size_request {
…		…
4443		4486
4444	delete $queue{$widget+0};	4487	delete $queue{$widget+0};
4445		4488
4446	my ($w, $h) = $widget->size_request;	4489	my ($w, $h) = $widget->size_request;
4447		4490
4448	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4491	$w += $widget->{padding_x} * 2;
4449	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4492	$h += $widget->{padding_y} * 2;
		4493
		4494	$w = max $widget->{min_w}, $w;
		4495	$h = max $widget->{min_h}, $h;
4450		4496
4451	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4497	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4452	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4498	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4453		4499
4454	$w = $widget->{force_w} if exists $widget->{force_w};	4500	$w = $widget->{force_w} if exists $widget->{force_w};
…		…
4521	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4567	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4522	glMatrixMode GL_MODELVIEW;	4568	glMatrixMode GL_MODELVIEW;
4523	glLoadIdentity;	4569	glLoadIdentity;
4524		4570
4525	{	4571	{
4526	package dc::UI::Base;	4572	package DC::UI::Base;
4527		4573
4528	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4574	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4529	(0, 0, $self->{w}, $self->{h});	4575	(0, 0, $self->{w}, $self->{h});
4530		4576
4531	$self->_draw;	4577	$self->_draw;
4532	}	4578	}
4533	}	4579	}
4534		4580
4535	#############################################################################	4581	#############################################################################
4536		4582
4537	package dc::UI;	4583	package DC::UI;
4538		4584
4539	$ROOT = new dc::UI::Root;	4585	$ROOT = new DC::UI::Root;
4540	$TOOLTIP = new dc::UI::Tooltip z => 900;	4586	$TOOLTIP = new DC::UI::Tooltip z => 900;
4541		4587
4542	1	4588	1
4543		4589

Diff Legend

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