[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.401 by root, Sat Jul 21 20:05:37 2007 UTC

…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
110	}	113	}
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {	116	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
265	$self->hide;	272	$self->hide;
266	$self->emit ("destroy");	273	$self->emit ("destroy");
267	%$self = ();	274	%$self = ();
268	}	275	}
269		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
270	sub show {	281	sub show {
271	my ($self) = @_;	282	my ($self) = @_;
272		283
273	return if $self->{parent};	284	return if $self->{parent};
274		285
…		…
313	sub set_visibility {	324	sub set_visibility {
314	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
315		326
316	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
317		328
318	$visible ? $self->hide	329	$visible ? $self->show
319	: $self->show;	330	: $self->hide;
320	}	331	}
321		332
322	sub toggle_visibility {	333	sub toggle_visibility {
323	my ($self) = @_;	334	my ($self) = @_;
324		335
…		…
540		551
541	# parent	552	# parent
542	$self->{parent} && $self->{parent}->emit ($signal, @args)	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
543	}	554	}
544		555
545	sub find_widget {	556	#sub find_widget {
546	my ($self, $x, $y) = @_;	557	# in .xs
547
548	return () unless $self->{can_events};
549
550	return $self
551	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
552	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
553
554	()
555	}
556		558
557	sub set_parent {	559	sub set_parent {
558	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
559		561
560	CFPlus::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
…		…
644	my ($self) = @_;	646	my ($self) = @_;
645		647
646	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
647	}	649	}
648		650
649	my $cntx;#d#
650	sub DESTROY {	651	sub DESTROY {
651	my ($self) = @_;	652	my ($self) = @_;
652		653
653	return if CFPlus::in_destruct;	654	return if CFPlus::in_destruct;
654		655
…		…
739	can_events => 0,	740	can_events => 0,
740	%arg,	741	%arg,
741	);	742	);
742		743
743	$self->add (@$children)	744	$self->add (@$children)
744	if $children;	745	if $children && @$children;
745		746
746	$self	747	$self
747	}	748	}
748		749
749	sub realloc {	750	sub realloc {
…		…
758	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
759		760
760	$_->set_parent ($self)	761	$_->set_parent ($self)
761	for @widgets;	762	for @widgets;
762		763
		764	# TODO: only do this in widgets that need it, e.g. root, fixed
763	use sort 'stable';	765	use sort 'stable';
764		766
765	$self->{children} = [	767	$self->{children} = [
766	sort { $a->{z} <=> $b->{z} }	768	sort { $a->{z} <=> $b->{z} }
767	@{$self->{children}}, @widgets	769	@{$self->{children}}, @widgets
768	];	770	];
769		771
770	$self->realloc;	772	$self->realloc;
		773
		774	map $_+0, @widgets
771	}	775	}
772		776
773	sub children {	777	sub children {
774	@{ $_[0]{children} }	778	@{ $_[0]{children} }
775	}	779	}
…		…
786	}	790	}
787		791
788	sub clear {	792	sub clear {
789	my ($self) = @_;	793	my ($self) = @_;
790		794
791	my $children = delete $self->{children};	795	my $children = $self->{children};
792	$self->{children} = [];	796	$self->{children} = [];
793		797
794	for (@$children) {	798	for (@$children) {
795	delete $_->{parent};	799	delete $_->{parent};
796	$_->hide;	800	$_->hide;
…		…
936	}	940	}
937		941
938	#############################################################################	942	#############################################################################
939		943
940	package CFPlus::UI::ViewPort;	944	package CFPlus::UI::ViewPort;
		945
		946	use List::Util qw(min max);
941		947
942	our @ISA = CFPlus::UI::Window::;	948	our @ISA = CFPlus::UI::Window::;
943		949
944	sub new {	950	sub new {
945	my $class = shift;	951	my $class = shift;
…		…
954	sub size_request {	960	sub size_request {
955	my ($self) = @_;	961	my ($self) = @_;
956		962
957	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	963	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958		964
959	$w = 10 if $self->{scroll_x};	965	$w = 1 if $self->{scroll_x};
960	$h = 10 if $self->{scroll_y};	966	$h = 1 if $self->{scroll_y};
961		967
962	($w, $h)	968	($w, $h)
963	}	969	}
964		970
965	sub invoke_size_allocate {	971	sub invoke_size_allocate {
…		…
977	}	983	}
978		984
979	sub set_offset {	985	sub set_offset {
980	my ($self, $x, $y) = @_;	986	my ($self, $x, $y) = @_;
981		987
		988	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		989	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		990
		991	if ($x != $self->{view_x} or $y != $self->{view_y}) {
982	$self->{view_x} = int $x;	992	$self->{view_x} = $x;
983	$self->{view_y} = int $y;	993	$self->{view_y} = $y;
984		994
		995	$self->emit (changed => $x, $y);
985	$self->update;	996	$self->update;
		997	}
986	}	998	}
987		999
988	# hmm, this does not work for topleft of $self... but we should not ask for that	1000	# hmm, this does not work for topleft of $self... but we should not ask for that
989	sub coord2local {	1001	sub coord2local {
990	my ($self, $x, $y) = @_;	1002	my ($self, $x, $y) = @_;
…		…
1005	my ($self, $x, $y) = @_;	1017	my ($self, $x, $y) = @_;
1006		1018
1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1019	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1020	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009	) {	1021	) {
1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1022	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1011	} else {	1023	} else {
1012	$self->CFPlus::UI::Base::find_widget ($x, $y)	1024	$self->CFPlus::UI::Base::find_widget ($x, $y)
1013	}	1025	}
1014	}	1026	}
1015		1027
…		…
1026		1038
1027	#############################################################################	1039	#############################################################################
1028		1040
1029	package CFPlus::UI::ScrolledWindow;	1041	package CFPlus::UI::ScrolledWindow;
1030		1042
1031	our @ISA = CFPlus::UI::HBox::;	1043	our @ISA = CFPlus::UI::Table::;
1032		1044
1033	sub new {	1045	sub new {
1034	my ($class, %arg) = @_;	1046	my ($class, %arg) = @_;
1035		1047
1036	my $child = delete $arg{child};	1048	my $child = delete $arg{child};
1037		1049
1038	my $self;	1050	my $self;
1039		1051
1040	my $slider = new CFPlus::UI::Slider	1052	my $hslider = new CFPlus::UI::Slider
		1053	col => 0,
		1054	row => 1,
		1055	vertical => 0,
		1056	range => [0, 0, 1, 0.01], # HACK fix
		1057	on_changed => sub {
		1058	$self->{hpos} = $_[1];
		1059	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1060	},
		1061	;
		1062
		1063	my $vslider = new CFPlus::UI::Slider
		1064	col => 1,
		1065	row => 0,
1041	vertical => 1,	1066	vertical => 1,
1042	range => [0, 0, 1, 0.01], # HACK fix	1067	range => [0, 0, 1, 0.01], # HACK fix
1043	on_changed => sub {	1068	on_changed => sub {
1044	$self->{vp}->set_offset (0, $_[1]);	1069	$self->{vpos} = $_[1];
		1070	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045	},	1071	},
1046	;	1072	;
1047		1073
1048	$self = $class->SUPER::new (	1074	$self = $class->SUPER::new (
1049	vp => (new CFPlus::UI::ViewPort expand => 1),	1075	scroll_x => 0,
		1076	scroll_y => 1,
1050	can_events => 1,	1077	can_events => 1,
1051	slider => $slider,	1078	hslider => $hslider,
		1079	vslider => $vslider,
		1080	col_expand => [1, 0],
		1081	row_expand => [1, 0],
1052	%arg,	1082	%arg,
1053	);	1083	);
1054		1084
		1085	$self->{vp} = new CFPlus::UI::ViewPort
		1086	col => 0,
		1087	row => 0,
		1088	expand => 1,
		1089	scroll_x => $self->{scroll_x},
		1090	scroll_y => $self->{scroll_y},
		1091	on_changed => sub {
		1092	my ($vp, $x, $y) = @_;
		1093
		1094	$vp->{parent}{hslider}->set_value ($x);
		1095	$vp->{parent}{vslider}->set_value ($y);
		1096
		1097	0
		1098	},
		1099	on_size_allocate => sub {
		1100	my ($vp, $w, $h) = @_;
		1101	$vp->{parent}->update_slider;
		1102	0
		1103	},
		1104	;
		1105
1055	$self->SUPER::add ($self->{vp}, $self->{slider});	1106	$self->SUPER::add ($self->{vp});
		1107
1056	$self->add ($child) if $child;	1108	$self->add ($child) if $child;
1057		1109
1058	$self	1110	$self
1059	}	1111	}
1060
1061	#TODO# update range on size_allocate depending on child
1062		1112
1063	sub add {	1113	sub add {
1064	my ($self, $widget) = @_;	1114	my ($self, $widget) = @_;
1065		1115
1066	$self->{vp}->add ($self->{child} = $widget);	1116	$self->{vp}->add ($self->{child} = $widget);
1067	}	1117	}
1068		1118
		1119	sub update_slider {
		1120	my ($self) = @_;
		1121
		1122	my $child = ($self->{vp} or return)->child;
		1123
		1124	if ($self->{scroll_x}) {
		1125	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1126	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1127
		1128	my $visible = $w1 > $w2;
		1129	if ($visible != $self->{hslider_visible}) {
		1130	$self->{hslider_visible} = $visible;
		1131	$visible ? $self->SUPER::add ($self->{hslider})
		1132	: $self->SUPER::remove ($self->{hslider});
		1133	}
		1134	}
		1135
		1136	if ($self->{scroll_y}) {
		1137	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1138	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1139
		1140	my $visible = $h1 > $h2;
		1141	if ($visible != $self->{vslider_visible}) {
		1142	$self->{vslider_visible} = $visible;
		1143	$visible ? $self->SUPER::add ($self->{vslider})
		1144	: $self->SUPER::remove ($self->{vslider});
		1145	}
		1146	}
		1147	}
		1148
		1149	sub start_dragging {
		1150	my ($self, $ev) = @_;
		1151
		1152	$self->grab_focus;
		1153
		1154	my $ox = $self->{vp}{view_x};
		1155	my $oy = $self->{vp}{view_y};
		1156
		1157	$self->{motion} = sub {
		1158	my ($ev, $x, $y) = @_;
		1159
		1160	$ox -= $ev->{xrel};
		1161	$oy -= $ev->{yrel};
		1162
		1163	$self->{vp}->set_offset ($ox, $oy);
		1164	};
		1165	}
		1166
1069	sub invoke_mouse_wheel {	1167	sub invoke_mouse_wheel {
1070	my ($self, $ev) = @_;	1168	my ($self, $ev) = @_;
1071		1169
1072	return 0 unless $ev->{dy}; # only vertical movements
1073
1074	$self->{slider}->emit (mouse_wheel => $ev);	1170	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1171	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1075		1172
1076	1	1173	1
1077	}	1174	}
1078		1175
1079	sub update_slider {	1176	sub invoke_button_down {
1080	my ($self) = @_;	1177	my ($self, $ev, $x, $y) = @_;
1081		1178
1082	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1179	if ($ev->{button} == 2) {
1083	}	1180	$self->start_dragging ($ev);
		1181	return 1;
		1182	}
1084		1183
1085	sub update {	1184	0
1086	my ($self) = @_;	1185	}
1087		1186
1088	$self->SUPER::update;	1187	sub invoke_button_up {
		1188	my ($self, $ev, $x, $y) = @_;
1089		1189
1090	$self->update_slider;	1190	if (delete $self->{motion}) {
		1191	return 1;
		1192	}
		1193
		1194	0
		1195	}
		1196
		1197	sub invoke_mouse_motion {
		1198	my ($self, $ev, $x, $y) = @_;
		1199
		1200	if ($self->{motion}) {
		1201	$self->{motion}->($ev, $x, $y);
		1202	return 1;
		1203	}
		1204
		1205	0
1091	}	1206	}
1092		1207
1093	sub invoke_size_allocate {	1208	sub invoke_size_allocate {
1094	my ($self, $w, $h) = @_;	1209	my ($self, $w, $h) = @_;
1095		1210
1096	$self->update_slider;	1211	$self->update_slider;
1097
1098	$self->SUPER::invoke_size_allocate ($w, $h)	1212	$self->SUPER::invoke_size_allocate ($w, $h)
1099	}	1213	}
1100		1214
1101	#############################################################################	1215	#############################################################################
1102		1216
…		…
1252		1366
1253	my @border =	1367	my @border =
1254	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1255	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1369	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256		1370
		1371	my @icon =
		1372	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1373	qw(x1_move.png x1_resize.png);
		1374
1257	sub new {	1375	sub new {
1258	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1259		1377
1260	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1261	bg => [1, 1, 1, 1],	1379	bg => [1, 1, 1, 1],
…		…
1429	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430		1548
1431	my $border = $self->border;	1549	my $border = $self->border;
1432		1550
1433	glColor @{ $self->{border_bg} };	1551	glColor @{ $self->{border_bg} };
1434	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1552	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1553	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1554	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1555	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1556
		1557	# move
		1558	my $w2 = ($w - $border) * .5;
		1559	my $h2 = ($h - $border) * .5;
		1560	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1561	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1562	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1563
		1564	# resize
		1565	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1566	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1567	unless $self->{has_close_button};
		1568	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1569	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1438		1570
1439	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1571	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1440	glColor @{ $self->{bg} };	1572	glColor @{ $self->{bg} };
1441		1573
1442	# TODO: repeat texture not scale	1574	# TODO: repeat texture not scale
…		…
1463		1595
1464	#############################################################################	1596	#############################################################################
1465		1597
1466	package CFPlus::UI::Table;	1598	package CFPlus::UI::Table;
1467		1599
1468	our @ISA = CFPlus::UI::Base::;	1600	our @ISA = CFPlus::UI::Container::;
1469		1601
1470	use List::Util qw(max sum);	1602	use List::Util qw(max sum);
1471		1603
1472	use CFPlus::OpenGL;	1604	use CFPlus::OpenGL;
1473		1605
1474	sub new {	1606	sub new {
1475	my $class = shift;	1607	my $class = shift;
1476		1608
1477	$class->SUPER::new (	1609	$class->SUPER::new (
1478	col_expand => [],	1610	col_expand => [],
		1611	row_expand => [],
1479	@_,	1612	@_,
1480	)	1613	)
1481	}	1614	}
1482		1615
1483	sub children {
1484	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485	}
1486
1487	sub add {	1616	sub add {
		1617	my ($self, @widgets) = @_;
		1618
		1619	for my $child (@widgets) {
		1620	$child->{rowspan} \|\|= 1;
		1621	$child->{colspan} \|\|= 1;
		1622	}
		1623
		1624	$self->SUPER::add (@widgets);
		1625	}
		1626
		1627	sub add_at {
1488	my ($self) = shift;	1628	my $self = shift;
		1629
		1630	my @widgets;
1489		1631
1490	while (@_) {	1632	while (@_) {
1491	my ($x, $y, $child) = splice @_, 0, 3, ();	1633	my ($col, $row, $child) = splice @_, 0, 3, ();
1492	$child->set_parent ($self);
1493	$self->{children}[$y][$x] = $child;
1494	}
1495		1634
1496	$self->{force_realloc} = 1;	1635	$child->{row} = $row;
1497	$self->{force_size_alloc} = 1;	1636	$child->{col} = $col;
1498	$self->realloc;
1499	}
1500		1637
1501	sub remove {	1638	push @widgets, $child;
		1639	}
		1640
		1641	$self->add (@widgets);
		1642	}
		1643
		1644	sub get_wh {
1502	my ($self, $child) = @_;	1645	my ($self) = @_;
1503		1646
1504	# TODO: not yet implemented	1647	my (@w, @h);
1505	}
1506
1507	# TODO: move to container class maybe? send children a signal on removal?
1508	sub clear {
1509	my ($self) = @_;
1510		1648
1511	my @children = $self->children;	1649	my @children = $self->children;
1512	delete $self->{children};	1650
		1651	# first pass, columns
		1652	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1653	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1654
		1655	my $sw = sum @w[$c .. $c + $cs - 1];
		1656
		1657	if ($w > $sw) {
		1658	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1659	}
1513		1660	}
1514	for (@children) {
1515	delete $_->{parent};
1516	$_->hide;
1517	}
1518		1661
1519	$self->realloc;	1662	# second pass, rows
1520	}	1663	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1521
1522	sub get_wh {
1523	my ($self) = @_;
1524
1525	my (@w, @h);
1526
1527	for my $y (0 .. $#{$self->{children}}) {
1528	my $row = $self->{children}[$y]
1529	or next;
1530
1531	for my $x (0 .. $#$row) {
1532	my $widget = $row->[$x]
1533	or next;
1534	my ($w, $h) = @$widget{qw(req_w req_h)};	1664	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1535		1665
1536	$w[$x] = max $w[$x], $w;	1666	my $sh = sum @h[$r .. $r + $rs - 1];
1537	$h[$y] = max $h[$y], $h;	1667
		1668	if ($h > $sh) {
		1669	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1538	}	1670	}
1539	}	1671	}
1540		1672
1541	(\@w, \@h)	1673	(\@w, \@h)
1542	}	1674	}
…		…
1558	my ($ws, $hs) = $self->get_wh;	1690	my ($ws, $hs) = $self->get_wh;
1559		1691
1560	my $req_w = (sum @$ws) \|\| 1;	1692	my $req_w = (sum @$ws) \|\| 1;
1561	my $req_h = (sum @$hs) \|\| 1;	1693	my $req_h = (sum @$hs) \|\| 1;
1562		1694
1563	# TODO: nicer code && do row_expand	1695	# now linearly scale the rows/columns to the allocated size
1564	my @col_expand = @{$self->{col_expand}};	1696	my @col_expand = @{$self->{col_expand}};
1565	@col_expand = (1) x @$ws unless @col_expand;	1697	@col_expand = (1) x @$ws unless @col_expand;
1566	my $col_expand = (sum @col_expand) \|\| 1;	1698	my $col_expand = (sum @col_expand) \|\| 1;
1567		1699
1568	# linearly scale sizes
1569	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1700	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
1571		1701
1572	CFPlus::UI::harmonize $ws;	1702	CFPlus::UI::harmonize $ws;
		1703
		1704	my @row_expand = @{$self->{row_expand}};
		1705	@row_expand = (1) x @$ws unless @row_expand;
		1706	my $row_expand = (sum @row_expand) \|\| 1;
		1707
		1708	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1709
1573	CFPlus::UI::harmonize $hs;	1710	CFPlus::UI::harmonize $hs;
1574		1711
1575	my $y;	1712	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1713	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1576		1714
1577	for my $r (0 .. $#{$self->{children}}) {	1715	for my $widget ($self->children) {
1578	my $row = $self->{children}[$r]	1716	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1579	or next;
1580		1717
1581	my $x = 0;	1718	$widget->configure (
1582	my $row_h = $hs->[$r];	1719	$x[$c], $y[$r],
		1720	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583		1721	);
1584	for my $c (0 .. $#$row) {	1722	}
1585	my $col_w = $ws->[$c];
1586		1723
1587	if (my $widget = $row->[$c]) {	1724	1
1588	$widget->configure ($x, $y, $col_w, $row_h);	1725	}
1589	}
1590		1726
1591	$x += $col_w;	1727	#############################################################################
		1728
		1729	package CFPlus::UI::Fixed;
		1730
		1731	use List::Util qw(min max);
		1732
		1733	our @ISA = CFPlus::UI::Container::;
		1734
		1735	sub add_fixed {
		1736	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1737
		1738	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1739	$self->SUPER::add ($child);
		1740	}
		1741
		1742	sub _scale($$$) {
		1743	my ($mode, $val, $max) = @_;
		1744
		1745	$mode eq "abs" ? $val
		1746	: $mode eq "rel" ? $val * $max
		1747	: 0
		1748	}
		1749
		1750	sub size_request {
		1751	my ($self) = @_;
		1752
		1753	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1754
		1755	# determine overall size by querying abs widgets
		1756	for my $child ($self->visible_children) {
		1757	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1758
		1759	if ($pos eq "abs") {
		1760	$w = _scale $size, $w, $child->{req_w};
		1761	$h = _scale $size, $h, $child->{req_h};
		1762
		1763	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1764	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1592	}	1765	}
		1766	}
1593		1767
1594	$y += $row_h;	1768	my $W = $x2 - $x1;
		1769	my $H = $y2 - $y1;
		1770
		1771	# now layout remaining widgets
		1772	for my $child ($self->visible_children) {
		1773	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1774
		1775	if ($pos ne "abs") {
		1776	$x = _scale $pos, $x, $W;
		1777	$y = _scale $pos, $x, $H;
		1778	$w = _scale $size, $w, $child->{req_w};
		1779	$h = _scale $size, $h, $child->{req_h};
		1780
		1781	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1782	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1783	}
		1784	}
		1785
		1786	my $W = $x2 - $x1;
		1787	my $H = $y2 - $y1;
		1788
		1789	($W, $H)
		1790	}
		1791
		1792	sub invoke_size_allocate {
		1793	my ($self, $W, $H) = @_;
		1794
		1795	for my $child ($self->visible_children) {
		1796	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1797
		1798	$x = _scale $pos, $x, $W;
		1799	$y = _scale $pos, $x, $H;
		1800	$w = _scale $size, $w, $child->{req_w};
		1801	$h = _scale $size, $h, $child->{req_h};
		1802
		1803	$child->configure ($x, $y, $w, $h);
1595	}	1804	}
1596		1805
1597	1	1806	1
1598	}
1599
1600	sub find_widget {
1601	my ($self, $x, $y) = @_;
1602
1603	$x -= $self->{x};
1604	$y -= $self->{y};
1605
1606	my $res;
1607
1608	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1609	$res = $_->find_widget ($x, $y)
1610	and return $res;
1611	}
1612
1613	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1614	}
1615
1616	sub _draw {
1617	my ($self) = @_;
1618
1619	for (grep $_, @{$self->{children}}) {
1620	$_->draw for grep $_, @$_;
1621	}
1622	}	1807	}
1623		1808
1624	#############################################################################	1809	#############################################################################
1625		1810
1626	package CFPlus::UI::Box;	1811	package CFPlus::UI::Box;
…		…
1967	my $sym = $ev->{sym};	2152	my $sym = $ev->{sym};
1968	my $uni = $ev->{unicode};	2153	my $uni = $ev->{unicode};
1969		2154
1970	my $text = $self->get_text;	2155	my $text = $self->get_text;
1971		2156
		2157	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2158
1972	if ($uni == 8) {	2159	if ($uni == 8) {
1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2160	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974	} elsif ($uni == 127) {	2161	} elsif ($uni == 127) {
1975	substr $text, $self->{cursor}, 1, "";	2162	substr $text, $self->{cursor}, 1, "";
1976	} elsif ($sym == CFPlus::SDLK_LEFT) {	2163	} elsif ($sym == CFPlus::SDLK_LEFT) {
1977	--$self->{cursor} if $self->{cursor};	2164	--$self->{cursor} if $self->{cursor};
1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2165	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1979	++$self->{cursor} if $self->{cursor} < length $self->{text};	2166	++$self->{cursor} if $self->{cursor} < length $self->{text};
1980	} elsif ($sym == CFPlus::SDLK_HOME) {	2167	} elsif ($sym == CFPlus::SDLK_HOME) {
		2168	# what a hack
1981	$self->{cursor} = 0;	2169	$self->{cursor} =
		2170	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2171	? length $1
		2172	: 0;
1982	} elsif ($sym == CFPlus::SDLK_END) {	2173	} elsif ($sym == CFPlus::SDLK_END) {
		2174	# uh, again
		2175	$self->{cursor} =
		2176	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983	$self->{cursor} = length $text;	2177	? $self->{cursor} + length $1
		2178	: length $self->{text};
1984	} elsif ($uni == 21) { # ctrl-u	2179	} elsif ($uni == 21) { # ctrl-u
1985	$text = "";	2180	$text = "";
1986	$self->{cursor} = 0;	2181	$self->{cursor} = 0;
1987	} elsif ($uni == 27) {	2182	} elsif ($uni == 27) {
1988	$self->emit ('escape');	2183	$self->emit ('escape');
1989	} elsif ($uni >= 0x20 \|\| $uni == 0x0d) {	2184	} elsif ($uni == 0x0d) {
		2185	substr $text, $self->{cursor}++, 0, "\012";
		2186	} elsif ($uni >= 0x20) {
1990	substr $text, $self->{cursor}++, 0, chr $uni;	2187	substr $text, $self->{cursor}++, 0, chr $uni;
1991	} else {	2188	} else {
1992	return 0;	2189	return 0;
1993	}	2190	}
1994		2191
…		…
2172		2369
2173	use CFPlus::OpenGL;	2370	use CFPlus::OpenGL;
2174		2371
2175	my @tex =	2372	my @tex =
2176	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2373	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177	qw(b1_button_active.png);	2374	qw(b1_button_inactive.png b1_button_active.png);
2178		2375
2179	sub new {	2376	sub new {
2180	my $class = shift;	2377	my $class = shift;
2181		2378
2182	$class->SUPER::new (	2379	$class->SUPER::new (
2183	padding_x => 4,	2380	padding_x => 4,
2184	padding_y => 4,	2381	padding_y => 4,
2185	fg => [1, 1, 1],	2382	fg => [1.0, 1.0, 1.0],
2186	active_fg => [0, 0, 1],	2383	active_fg => [0.8, 0.8, 0.8],
2187	can_hover => 1,	2384	can_hover => 1,
2188	align => 0,	2385	align => 0,
2189	valign => 0,	2386	valign => 0,
2190	can_events => 1,	2387	can_events => 1,
2191	@_	2388	@_
…		…
2209		2406
2210	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
2211	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2212	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
2213		2410
		2411	my $tex = $tex[$GRAB == $self];
2214	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2215		2413
2216	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
2217		2415
2218	$self->SUPER::_draw;	2416	$self->SUPER::_draw;
2219	}	2417	}
…		…
2698	sub invoke_mouse_wheel {	2896	sub invoke_mouse_wheel {
2699	my ($self, $ev) = @_;	2897	my ($self, $ev) = @_;
2700		2898
2701	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2899	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2702		2900
		2901	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2902
2703	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2903	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2704		2904
2705	! ! $delta	2905	! ! $delta
2706	}	2906	}
2707		2907
2708	sub update {	2908	sub update {
…		…
2818	#font => default_font	3018	#font => default_font
2819	@_,	3019	@_,
2820		3020
2821	layout => (new CFPlus::Layout),	3021	layout => (new CFPlus::Layout),
2822	par => [],	3022	par => [],
		3023	max_par => 0,
2823	height => 0,	3024	height => 0,
2824	children => [	3025	children => [
2825	(new CFPlus::UI::Empty expand => 1),	3026	(new CFPlus::UI::Empty expand => 1),
2826	(new CFPlus::UI::Slider vertical => 1),	3027	(new CFPlus::UI::Slider vertical => 1),
2827	],	3028	],
…		…
2950	wrapped => 1,	3151	wrapped => 1,
2951	};	3152	};
2952		3153
2953	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3154	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2954	push @{$self->{par}}, $para;	3155	push @{$self->{par}}, $para;
		3156	}
		3157
		3158	if (my $max = $self->{max_par}) {
		3159	shift @{$self->{par}} while @{$self->{par}} > $max;
2955	}	3160	}
2956		3161
2957	$self->{need_reflow}++;	3162	$self->{need_reflow}++;
2958	$self->update;	3163	$self->update;
2959	}	3164	}
…		…
3267		3472
3268	sub new {	3473	sub new {
3269	my $class = shift;	3474	my $class = shift;
3270		3475
3271	my $self = $class->SUPER::new (	3476	my $self = $class->SUPER::new (
		3477	size_w => 32,
		3478	size_h => 8,
3272	aspect => 1,	3479	aspect => 1,
3273	can_events => 0,	3480	can_events => 0,
3274	@_,	3481	@_,
3275	);	3482	);
3276		3483
3277	if ($self->{anim} && $self->{animspeed}) {	3484	if ($self->{anim} && $self->{animspeed}) {
3278	CFPlus::weaken (my $widget = $self);	3485	CFPlus::weaken (my $widget = $self);
3279		3486
		3487	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3488	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3280	$self->{timer} = Event->timer (	3489	$self->{timer} = Event->timer (
3281	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3282	hard => 1,	3490	parked => 1,
3283	interval => $self->{animspeed},
3284	cb => sub {	3491	cb => sub {
		3492	return unless $::CONN && $widget;
		3493
3285	++$widget->{frame};	3494	++$widget->{frame};
		3495	$widget->update_face;
3286	$widget->update;	3496	$widget->update;
		3497
		3498	$widget->update_timer;
3287	},	3499	},
3288	);	3500	);
		3501
		3502	$self->update_face;
		3503	$self->update_timer;
3289	}	3504	}
3290		3505
3291	$self	3506	$self
3292	}	3507	}
3293		3508
		3509	sub update_timer {
		3510	my ($self) = @_;
		3511
		3512	return unless $self->{timer};
		3513
		3514	if ($self->{visible}) {
		3515	$self->{timer}->at (
		3516	$self->{anim_start}
		3517	+ $self->{animspeed}
		3518	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3519	);
		3520	$self->{timer}->start;
		3521	} else {
		3522	$self->{timer}->stop;
		3523	}
		3524	}
		3525
		3526	sub update_face {
		3527	my ($self) = @_;
		3528
		3529	return unless $::CONN;
		3530
		3531	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3532	if ($anim && @$anim) {
		3533	delete $self->{wait_face};
		3534	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3535	}
		3536	}
		3537	}
		3538
3294	sub size_request {	3539	sub size_request {
3295	(32, 8)	3540	my ($self) = @_;
		3541
		3542	if ($::CONN) {
		3543	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3544	if (my $tex = $::CONN->{texture}[$faceid]) {
		3545	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});
		3546	} else {
		3547	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {
		3548	$self->realloc;
		3549	});
		3550	}
		3551	}
		3552	}
		3553
		3554	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3296	}	3555	}
3297		3556
3298	sub update {	3557	sub update {
3299	my ($self) = @_;	3558	my ($self) = @_;
3300		3559
3301	return unless $self->{visible};	3560	return unless $self->{visible};
3302		3561
3303	$self->SUPER::update;	3562	$self->SUPER::update;
3304	}	3563	}
3305		3564
		3565	sub invoke_visibility_change {
		3566	my ($self) = @_;
		3567
		3568	$self->update_timer;
		3569
		3570	0
		3571	}
		3572
3306	sub _draw {	3573	sub _draw {
3307	my ($self) = @_;	3574	my ($self) = @_;
3308		3575
3309	return unless $::CONN;	3576	return unless $::CONN;
3310		3577
3311	$self->SUPER::_draw;	3578	$self->SUPER::_draw;
3312		3579
3313	my $face;
3314
3315	if ($self->{frame}) {
3316	my $anim = $::CONN->{anim}[$self->{anim}];	3580	my $faceid = $::CONN->{faceid}[$self->{face}]
3317		3581	or return;
3318	$face = $anim->[ $self->{frame} % @$anim ]
3319	if $anim && @$anim;
3320	}
3321		3582
3322	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	3583	my $tex = $::CONN->{texture}[$faceid];
3323		3584
3324	if ($tex) {	3585	if ($tex) {
3325	glEnable GL_TEXTURE_2D;	3586	glEnable GL_TEXTURE_2D;
3326	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3587	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3327	glColor 0, 0, 0, 1;	3588	glColor 0, 0, 0, 1;
…		…
3331	}	3592	}
3332		3593
3333	sub destroy {	3594	sub destroy {
3334	my ($self) = @_;	3595	my ($self) = @_;
3335		3596
3336	$self->{timer}->cancel	3597	(delete $self->{timer})->cancel
3337	if $self->{timer};	3598	if $self->{timer};
3338		3599
3339	$self->SUPER::destroy;	3600	$self->SUPER::destroy;
3340	}	3601	}
3341		3602
…		…
3885	while ($self->{refresh_hook}) {	4146	while ($self->{refresh_hook}) {
3886	$_->()	4147	$_->()
3887	for values %{delete $self->{refresh_hook}};	4148	for values %{delete $self->{refresh_hook}};
3888	}	4149	}
3889		4150
3890	if ($self->{realloc}) {	4151	while ($self->{realloc}) {
3891	my %queue;	4152	my %queue;
3892	my @queue;	4153	my @queue;
3893	my $widget;	4154	my $widget;
3894		4155
3895	outer:	4156	outer:
…		…
3942	}	4203	}
3943	}	4204	}
3944		4205
3945	delete $self->{realloc}{$widget+0};	4206	delete $self->{realloc}{$widget+0};
3946	}	4207	}
3947	}
3948		4208
3949	while (my $size_alloc = delete $self->{size_alloc}) {	4209	while (my $size_alloc = delete $self->{size_alloc}) {
3950	my @queue = sort { $b->{visible} <=> $a->{visible} }	4210	my @queue = sort { $a->{visible} <=> $b->{visible} }
3951	values %$size_alloc;	4211	values %$size_alloc;
3952		4212
3953	while () {	4213	while () {
3954	my $widget = pop @queue \|\| last;	4214	my $widget = pop @queue \|\| last;
3955		4215
3956	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4216	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3957		4217
3958	$w = 0 if $w < 0;
3959	$h = 0 if $h < 0;
3960
3961	$w = max $widget->{min_w}, $w;	4218	$w = max $widget->{min_w}, $w;
3962	$h = max $widget->{min_h}, $h;	4219	$h = max $widget->{min_h}, $h;
3963		4220
3964	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4221	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3965	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4222	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3966		4223
3967	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4224	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3968	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4225	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3969		4226
3970	$w = int $w + 0.5;	4227	$w = int $w + 0.5;
3971	$h = int $h + 0.5;	4228	$h = int $h + 0.5;
3972		4229
3973	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	4230	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
3974	$widget->{old_w} = $widget->{w};	4231	$widget->{old_w} = $widget->{w};
3975	$widget->{old_h} = $widget->{h};	4232	$widget->{old_h} = $widget->{h};
3976		4233
3977	$widget->{w} = $w;	4234	$widget->{w} = $w;
3978	$widget->{h} = $h;	4235	$widget->{h} = $h;
3979		4236
3980	$widget->emit (size_allocate => $w, $h);	4237	$widget->emit (size_allocate => $w, $h);
		4238	}
3981	}	4239	}
3982	}	4240	}
3983	}	4241	}
3984		4242
3985	while ($self->{post_alloc_hook}) {	4243	while ($self->{post_alloc_hook}) {
3986	$_->()	4244	$_->()
3987	for values %{delete $self->{post_alloc_hook}};	4245	for values %{delete $self->{post_alloc_hook}};
3988	}	4246	}
3989
3990		4247
3991	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4248	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3992	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4249	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3993	glClear GL_COLOR_BUFFER_BIT;	4250	glClear GL_COLOR_BUFFER_BIT;
3994		4251

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC vs. Revision 1.401 by root, Sat Jul 21 20:05:37 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.401 by root, Sat Jul 21 20:05:37 2007 UTC