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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC

…		…
40		40
41	$LAYOUT = $layout;	41	$LAYOUT = $layout;
42	}	42	}
43		43
44	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
45	if (!$GRAB) {	47	if (!$GRAB) {
46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
48
49	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
50	$TOOLTIP->hide;	51	$TOOLTIP->hide;
51		52
52	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
53		54
…		…
170	sub rescale_widgets {	171	sub rescale_widgets {
171	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
172		173
173	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
174	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177		178
178	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184		185
185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187		188
188	}	189	}
189	}	190	}
190		191
191	reconfigure_widgets;	192	reconfigure_widgets;
…		…
370	sub size_allocate {	371	sub size_allocate {
371	# nothing to be done	372	# nothing to be done
372	}	373	}
373		374
374	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
375	}	381	}
376		382
377	sub set_max_size {	383	sub set_max_size {
378	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
379		385
…		…
438		444
439	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440	unless $FOCUS;	446	unless $FOCUS;
441	}	447	}
442		448
443	sub mouse_motion { }	449	sub mouse_motion { 0 }
444	sub button_up { }	450	sub button_up { 0 }
445	sub key_down { }	451	sub key_down { 0 }
446	sub key_up { }	452	sub key_up { 0 }
447		453
448	sub button_down {	454	sub button_down {
449	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
450		456
451	$self->focus_in;	457	$self->focus_in;
452	}
453		458
454	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
455	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
456	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
457	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
458	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459		461
460	sub find_widget {	462	sub find_widget {
461	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
462		464
463	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
525		527
526	$self->realloc;	528	$self->realloc;
527	$self->update;	529	$self->update;
528	}	530	}
529		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		535
530	sub draw {	536	sub draw {
531	my ($self) = @_;	537	my ($self) = @_;
532		538
533	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
		549	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
534		550
535	glPushMatrix;	551	glPushMatrix;
536	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
537	$self->_draw;	553	$self->_draw;
538	glPopMatrix;	554	glPopMatrix;
…		…
652	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
653		669
654	sub new {	670	sub new {
655	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
656		672
657	my $children = delete $arg{children} \|\| [];	673	my $children = delete $arg{children};
658		674
659	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
660	children => [],	676	children => [],
661	can_events => 0,	677	can_events => 0,
662	%arg,	678	%arg,
663	);	679	);
		680
664	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
665		683
666	$self	684	$self
667	}	685	}
668		686
669	sub add {	687	sub add {
…		…
717	$x -= $self->{x};	735	$x -= $self->{x};
718	$y -= $self->{y};	736	$y -= $self->{y};
719		737
720	my $res;	738	my $res;
721		739
722	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
723	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
724	and return $res;	742	and return $res;
725	}	743	}
726		744
727	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
776	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
777	}	795	}
778		796
779	#############################################################################	797	#############################################################################
780		798
		799	# back-buffered drawing area
		800
781	package CFClient::UI::Window;	801	package CFClient::UI::Window;
782		802
783	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
784		804
785	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
803	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
804	$self->update;	824	$self->update;
805	}	825	}
806		826
807	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
808	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
809	}	831	}
810		832
811	sub render_child {	833	sub render_child {
812	my ($self) = @_;	834	my ($self) = @_;
813		835
814	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
816	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
817		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
818	$self->_render;	847	$self->_render;
819	};	848	};
820	}	849	}
821		850
822	sub _draw {	851	sub _draw {
823	my ($self) = @_;	852	my ($self) = @_;
824		853
825	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
826		855
827	my $tex = $self->{texture}	856	my $tex = $self->{texture}
828	or return;	857	or return;
829		858
830	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
913	}	942	}
914		943
915	sub _render {	944	sub _render {
916	my ($self) = @_;	945	my ($self) = @_;
917		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
918	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919		951
920	$self->SUPER::_render;	952	$self->SUPER::_render;
921	}	953	}
922		954
…		…
925	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
926		958
927	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
928		960
929	sub new {	961	sub new {
930	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
931		965
932	my $self;	966	my $self;
933		967
934	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
935	vertical => 1,	969	vertical => 1,
…		…
940	;	974	;
941		975
942	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
943	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
944	slider => $slider,	978	slider => $slider,
945	@_,	979	%arg,
946	);	980	);
947		981
948	$self->{vp}->add ($self->{scrolled});
949	$self->add ($self->{vp});
950	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
951		984
952	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
953	}	992	}
954		993
955	sub update {	994	sub update {
956	my ($self) = @_;	995	my ($self) = @_;
957		996
…		…
1029	my @border =	1068	my @border =
1030	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032		1071
1033	sub new {	1072	sub new {
1034	my $class = shift;	1073	my ($class, %arg) = @_;
		1074
		1075	my $title = delete $arg{title};
1035		1076
1036	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1037	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1038	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1039	border => 0.6,	1080	border => 0.6,
1040	can_events => 1,	1081	can_events => 1,
1041	min_w => 16,	1082	min_w => 16,
1042	min_h => 16,	1083	min_h => 16,
1043	@_	1084	%arg,
1044	);	1085	);
1045		1086
1046	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1047	align => 0,	1088	align => 0,
1048	valign => 1,	1089	valign => 1,
1049	text => $self->{title},	1090	text => $title,
1050	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1051		1093
1052	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1053	}	1102	}
1054		1103
1055	sub border {	1104	sub border {
1056	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1057	}	1106	}
1058		1107
1059	sub size_request {	1108	sub size_request {
1060	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1061		1113
1062	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1063		1115
1064	(	1116	(
1065	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
1068	}	1120	}
1069		1121
1070	sub size_allocate {	1122	sub size_allocate {
1071	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
1072		1124
		1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
		1130
		1131	my $border = $self->border;
		1132
1073	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1074	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1075		1135
1076	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077	if $self->{title};
1078
1079	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1080	}	1137	}
1081		1138
1082	sub button_down {	1139	sub button_down {
1083	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1084		1141
…		…
1118		1175
1119	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1120		1177
1121	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1122	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1123	}	1184	1
1124	}	1185	}
1125		1186
1126	sub button_up {	1187	sub button_up {
1127	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1128		1189
1129	delete $self->{motion};	1190	!!delete $self->{motion}
1130	}	1191	}
1131		1192
1132	sub mouse_motion {	1193	sub mouse_motion {
1133	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1134		1195
1135	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1136	}	1199	}
1137		1200
1138	sub _draw {	1201	sub _draw {
1139	my ($self) = @_;	1202	my ($self) = @_;
1140		1203
		1204	my $child = $self->{children}[0];
		1205
1141	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1142	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1143		1208
1144	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1145	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146		1211
1147	my $border = $self->border;	1212	my $border = $self->border;
…		…
1162	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163	}	1228	}
1164		1229
1165	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1166		1231
1167	$self->{title}->draw if $self->{title};
1168
1169	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1170	}	1238	}
1171		1239
1172	#############################################################################	1240	#############################################################################
1173		1241
1174	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1522	}	1590	}
1523		1591
1524	sub size_allocate {	1592	sub size_allocate {
1525	my ($self, $w, $h) = @_;	1593	my ($self, $w, $h) = @_;
1526		1594
		1595	delete $self->{ox};
		1596
1527	delete $self->{texture}	1597	delete $self->{texture}
1528	;#d#	1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529	}	1599	}
1530		1600
1531	sub set_fontsize {	1601	sub set_fontsize {
1532	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1533		1603
…		…
1548	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1549	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552		1622
1553	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1554		1625
		1626	unless (exists $self->{ox}) {
1555	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1558		1630
1559	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1562
1563	$tex
1564	};	1634	};
1565		1635
1566	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1567	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1568		1638
…		…
1663	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1664	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1665	$self->_emit ('escape');	1735	$self->_emit ('escape');
1666	} elsif ($uni) {	1736	} elsif ($uni) {
1667	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1668	}	1740	}
1669		1741
1670	$self->_set_text ($text);	1742	$self->_set_text ($text);
1671		1743
1672	$self->realloc;	1744	$self->realloc;
		1745
		1746	1
1673	}	1747	}
1674		1748
1675	sub focus_in {	1749	sub focus_in {
1676	my ($self) = @_;	1750	my ($self) = @_;
1677		1751
…		…
1692	utf8::encode $text;	1766	utf8::encode $text;
1693	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1694		1768
1695	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1696	$self->update;	1770	$self->update;
		1771
		1772	1
1697	}	1773	}
1698		1774
1699	sub mouse_motion {	1775	sub mouse_motion {
1700	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1701	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1777	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1778
		1779	0
1702	}	1780	}
1703		1781
1704	sub _draw {	1782	sub _draw {
1705	my ($self) = @_;	1783	my ($self) = @_;
1706		1784
…		…
1783	} else {	1861	} else {
1784	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1785	}	1863	}
1786		1864
1787	} else {	1865	} else {
1788	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1789	}	1869	1
1790
1791	}	1870	}
1792		1871
1793	#############################################################################	1872	#############################################################################
1794		1873
1795	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1824	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1825		1904
1826	$self->emit ("activate")	1905	$self->emit ("activate")
1827	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1828	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1829	}	1910	}
1830		1911
1831	sub _draw {	1912	sub _draw {
1832	my ($self) = @_;	1913	my ($self) = @_;
1833		1914
…		…
1887		1968
1888	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1969	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1970	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890	$self->{state} = !$self->{state};	1971	$self->{state} = !$self->{state};
1891	$self->_emit (changed => $self->{state});	1972	$self->_emit (changed => $self->{state});
		1973	} else {
		1974	return 0
		1975	}
		1976
1892	}	1977	1
1893	}	1978	}
1894		1979
1895	sub _draw {	1980	sub _draw {
1896	my ($self) = @_;	1981	my ($self) = @_;
1897		1982
…		…
2235		2320
2236	$self->SUPER::button_down ($ev, $x, $y);	2321	$self->SUPER::button_down ($ev, $x, $y);
2237		2322
2238	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2323	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239		2324
2240	$self->mouse_motion ($ev, $x, $y);	2325	$self->mouse_motion ($ev, $x, $y)
2241	}	2326	}
2242		2327
2243	sub mouse_motion {	2328	sub mouse_motion {
2244	my ($self, $ev, $x, $y) = @_;	2329	my ($self, $ev, $x, $y) = @_;
2245		2330
…		…
2249	my (undef, $lo, $hi, $page) = @{$self->{range}};	2334	my (undef, $lo, $hi, $page) = @{$self->{range}};
2250		2335
2251	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2336	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252		2337
2253	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2338	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2339	} else {
		2340	return 0;
		2341	}
		2342
2254	}	2343	1
2255	}	2344	}
2256		2345
2257	sub update {	2346	sub update {
2258	my ($self) = @_;	2347	my ($self) = @_;
2259		2348
2260	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2349	delete $self->{knob_w};
		2350	$self->SUPER::update;
		2351	}
		2352
		2353	sub _draw {
		2354	my ($self) = @_;
		2355
		2356	unless ($self->{knob_w}) {
2261	$self->set_value ($self->{range}[0]);	2357	$self->set_value ($self->{range}[0]);
2262		2358
2263	my ($value, $lo, $hi, $page) = @{$self->{range}};	2359	my ($value, $lo, $hi, $page) = @{$self->{range}};
2264	my $range = ($hi - $page - $lo) \|\| 1e-100;	2360	my $range = ($hi - $page - $lo) \|\| 1e-100;
2265		2361
…		…
2271	$value = ($value - $lo) / $range;	2367	$value = ($value - $lo) / $range;
2272	$value = $value * $self->{scale} + $self->{offset};	2368	$value = $value * $self->{scale} + $self->{offset};
2273		2369
2274	$self->{knob_x} = $value - $knob_w * 0.5;	2370	$self->{knob_x} = $value - $knob_w * 0.5;
2275	$self->{knob_w} = $knob_w;	2371	$self->{knob_w} = $knob_w;
2276	});	2372	}
2277
2278	$self->SUPER::update;
2279	}
2280
2281	sub _draw {
2282	my ($self) = @_;
2283		2373
2284	$self->SUPER::_draw ();	2374	$self->SUPER::_draw ();
2285		2375
2286	glScale $self->{w}, $self->{h};	2376	glScale $self->{w}, $self->{h};
2287		2377
…		…
2781	$self->SUPER::DESTROY;	2871	$self->SUPER::DESTROY;
2782	}	2872	}
2783		2873
2784	#############################################################################	2874	#############################################################################
2785		2875
2786	package CFClient::UI::Inventory;	2876	package CFClient::UI::Buttonbar;
2787		2877
2788	our @ISA = CFClient::UI::ScrolledWindow::;	2878	our @ISA = CFClient::UI::HBox::;
2789		2879
2790	sub new {	2880	# TODO: should actualyl wrap buttons and other goodies.
2791	my $class = shift;
2792
2793	my $self = $class->SUPER::new (
2794	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2795	@_,
2796	);
2797
2798	$self
2799	}
2800
2801	sub set_items {
2802	my ($self, $items) = @_;
2803
2804	$self->{scrolled}->clear;
2805	return unless $items;
2806
2807	my @items = sort {
2808	($a->{type} <=> $b->{type})
2809	or ($a->{name} cmp $b->{name})
2810	} @$items;
2811
2812	$self->{real_items} = \@items;
2813
2814	my $row = 0;
2815	for my $item (@items) {
2816	CFClient::Item::update_widgets $item;
2817
2818	$self->{scrolled}->add (0, $row, $item->{face_widget});
2819	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2820	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2821
2822	$row++;
2823	}
2824	}
2825		2881
2826	#############################################################################	2882	#############################################################################
2827		2883
2828	package CFClient::UI::Menu;	2884	package CFClient::UI::Menu;
2829		2885
…		…
2879	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2880		2936
2881	# TODO: should use vbox->find_widget or so	2937	# TODO: should use vbox->find_widget or so
2882	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2938	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2883	$self->{hover} = $self->{item}{$HOVER};	2939	$self->{hover} = $self->{item}{$HOVER};
		2940
		2941	0
2884	}	2942	}
2885		2943
2886	sub button_up {	2944	sub button_up {
2887	my ($self, $ev, $x, $y) = @_;	2945	my ($self, $ev, $x, $y) = @_;
2888		2946
…		…
2890	undef $GRAB;	2948	undef $GRAB;
2891	$self->hide;	2949	$self->hide;
2892		2950
2893	$self->_emit ("popdown");	2951	$self->_emit ("popdown");
2894	$self->{hover}[1]->() if $self->{hover};	2952	$self->{hover}[1]->() if $self->{hover};
		2953	} else {
		2954	return 0
		2955	}
		2956
		2957	1
		2958	}
		2959
		2960	#############################################################################
		2961
		2962	package CFClient::UI::Multiplexer;
		2963
		2964	our @ISA = CFClient::UI::Container::;
		2965
		2966	sub new {
		2967	my $class = shift;
		2968
		2969	my $self = $class->SUPER::new (
		2970	@_,
		2971	);
		2972
		2973	$self->{current} = $self->{children}[0]
		2974	if @{ $self->{children} };
		2975
		2976	$self
		2977	}
		2978
		2979	sub add {
		2980	my ($self, @widgets) = @_;
		2981
		2982	$self->SUPER::add (@widgets);
		2983
		2984	$self->{current} = $self->{children}[0]
		2985	if @{ $self->{children} };
		2986	}
		2987
		2988	sub set_current_page {
		2989	my ($self, $page_or_widget) = @_;
		2990
		2991	my $widget = ref $page_or_widget
		2992	? $page_or_widget
		2993	: $self->{children}[$page_or_widget];
		2994
		2995	$self->{current} = $widget;
		2996	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2997
		2998	$self->_emit (page_changed => $self->{current});
		2999
		3000	$self->realloc;
		3001	}
		3002
		3003	sub visible_children {
		3004	$_[0]{current}
		3005	}
		3006
		3007	sub size_request {
		3008	my ($self) = @_;
		3009
		3010	$self->{current}->size_request
		3011	}
		3012
		3013	sub size_allocate {
		3014	my ($self, $w, $h) = @_;
		3015
		3016	$self->{current}->configure (0, 0, $w, $h);
		3017	}
		3018
		3019	sub _draw {
		3020	my ($self) = @_;
		3021
		3022	$self->{current}->draw;
		3023	}
		3024
		3025	#############################################################################
		3026
		3027	package CFClient::UI::Notebook;
		3028
		3029	our @ISA = CFClient::UI::VBox::;
		3030
		3031	sub new {
		3032	my $class = shift;
		3033
		3034	my $self = $class->SUPER::new (
		3035	buttonbar => (new CFClient::UI::Buttonbar),
		3036	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3037	# filter => # will be put between multiplexer and $self
		3038	@_,
		3039	);
2895	}	3040
		3041	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3042	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
		3043
		3044	$self
		3045	}
		3046
		3047	sub add {
		3048	my ($self, $title, $widget, $tooltip) = @_;
		3049
		3050	Scalar::Util::weaken $self;
		3051
		3052	$self->{buttonbar}->add (new CFClient::UI::Button
		3053	markup => $title,
		3054	tooltip => $tooltip,
		3055	on_activate => sub { $self->set_current_page ($widget) },
		3056	);
		3057
		3058	$self->{multiplexer}->add ($widget);
		3059	}
		3060
		3061	sub set_current_page {
		3062	my ($self, $page) = @_;
		3063
		3064	$self->{multiplexer}->set_current_page ($page);
		3065	$self->_emit (page_changed => $self->{multiplexer}{current});
2896	}	3066	}
2897		3067
2898	#############################################################################	3068	#############################################################################
2899		3069
2900	package CFClient::UI::Statusbox;	3070	package CFClient::UI::Statusbox;
…		…
3005	$self->SUPER::reconfigure;	3175	$self->SUPER::reconfigure;
3006	}	3176	}
3007		3177
3008	#############################################################################	3178	#############################################################################
3009		3179
3010	package CFClient::UI::Root;	3180	package CFClient::UI::Inventory;
3011		3181
3012	our @ISA = CFClient::UI::Container::;	3182	our @ISA = CFClient::UI::ScrolledWindow::;
3013
3014	use CFClient::OpenGL;
3015		3183
3016	sub new {	3184	sub new {
3017	my $class = shift;	3185	my $class = shift;
3018		3186
3019	my $self = $class->SUPER::new (	3187	my $self = $class->SUPER::new (
3020	visible => 1,	3188	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3021	@_,	3189	@_,
3022	);	3190	);
3023		3191
3024	Scalar::Util::weaken ($self->{root} = $self);
3025
3026	$self	3192	$self
3027	}	3193	}
3028		3194
3029	sub size_request {	3195	sub set_items {
3030	my ($self) = @_;
3031
3032	($self->{w}, $self->{h})
3033	}
3034
3035	sub _to_pixel {
3036	my ($coord, $size, $max) = @_;
3037
3038	$coord =
3039	$coord eq "center" ? ($max - $size) * 0.5
3040	: $coord eq "max" ? $max
3041	: $coord;
3042
3043	$coord = 0 if $coord < 0;
3044	$coord = $max - $size if $coord > $max - $size;
3045
3046	int $coord + 0.5
3047	}
3048
3049	sub size_allocate {
3050	my ($self, $w, $h) = @_;
3051
3052	for my $child ($self->children) {
3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054
3055	$X = $child->{force_x} if exists $child->{force_x};
3056	$Y = $child->{force_y} if exists $child->{force_y};
3057
3058	$X = _to_pixel $X, $W, $self->{w};
3059	$Y = _to_pixel $Y, $H, $self->{h};
3060
3061	$child->configure ($X, $Y, $W, $H);
3062	}
3063	}
3064
3065	sub coord2local {
3066	my ($self, $x, $y) = @_;
3067
3068	($x, $y)
3069	}
3070
3071	sub coord2global {
3072	my ($self, $x, $y) = @_;
3073
3074	($x, $y)
3075	}
3076
3077	sub update {
3078	my ($self) = @_;
3079
3080	$::WANT_REFRESH++;
3081	}
3082
3083	sub add {
3084	my ($self, @children) = @_;
3085
3086	$_->{is_toplevel} = 1
3087	for @children;
3088
3089	$self->SUPER::add (@children);
3090	}
3091
3092	sub remove {
3093	my ($self, @children) = @_;
3094
3095	$self->SUPER::remove (@children);
3096
3097	delete $self->{is_toplevel}
3098	for @children;
3099
3100	while (@children) {
3101	my $w = pop @children;
3102	push @children, $w->children;
3103	$w->set_invisible;
3104	}
3105	}
3106
3107	sub on_refresh {
3108	my ($self, $id, $cb) = @_;
3109
3110	$self->{refresh_hook}{$id} = $cb;
3111	}
3112
3113	sub on_post_alloc {
3114	my ($self, $id, $cb) = @_;
3115
3116	$self->{post_alloc_hook}{$id} = $cb;
3117	}
3118
3119	sub draw {
3120	my ($self) = @_;
3121
3122	while ($self->{refresh_hook}) {
3123	$_->()
3124	for values %{delete $self->{refresh_hook}};
3125	}
3126
3127	if ($self->{realloc}) {
3128	my @queue;
3129
3130	while () {
3131	if ($self->{realloc}) {
3132	#TODO use array-of-depth approach
3133
3134	use sort 'stable';
3135
3136	@queue = sort { $a->{visible} <=> $b->{visible} }
3137	@queue, values %{delete $self->{realloc}};
3138	}
3139
3140	my $widget = pop @queue \|\| last;
3141
3142	$widget->{visible} or last; # do not resize invisible widgets
3143
3144	my ($w, $h) = $widget->size_request;
3145
3146	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148
3149	$w = $widget->{force_w} if exists $widget->{force_w};
3150	$h = $widget->{force_h} if exists $widget->{force_h};
3151
3152	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
3153	\|\| delete $widget->{force_realloc}) {
3154	$widget->{req_w} = $w;
3155	$widget->{req_h} = $h;
3156
3157	$self->{size_alloc}{$widget+0} = $widget;
3158
3159	if (my $parent = $widget->{parent}) {
3160	$self->{realloc}{$parent+0} = $parent;
3161	#unshift @queue, $parent;
3162	$parent->{force_size_alloc} = 1;
3163	$self->{size_alloc}{$parent+0} = $parent;
3164	}
3165	}
3166
3167	delete $self->{realloc}{$widget+0};
3168	}
3169	}
3170
3171	while (my $size_alloc = delete $self->{size_alloc}) {
3172	my @queue = sort { $b->{visible} <=> $a->{visible} }
3173	values %$size_alloc;
3174
3175	while () {
3176	my $widget = pop @queue \|\| last;
3177
3178	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3179
3180	$w = 0 if $w < 0;
3181	$h = 0 if $h < 0;
3182
3183	$w = int $w + 0.5;
3184	$h = int $h + 0.5;
3185
3186	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
3187	$widget->{w} = $w;
3188	$widget->{h} = $h;
3189
3190	$widget->emit (size_allocate => $w, $h);
3191	}
3192	}
3193	}
3194
3195	while ($self->{post_alloc_hook}) {
3196	$_->()
3197	for values %{delete $self->{post_alloc_hook}};
3198	}
3199
3200
3201	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3202	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3203	glClear GL_COLOR_BUFFER_BIT;
3204
3205	glMatrixMode GL_PROJECTION;
3206	glLoadIdentity;
3207	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3208	glMatrixMode GL_MODELVIEW;
3209	glLoadIdentity;
3210
3211	$self->_draw;
3212	}
3213
3214	#############################################################################
3215
3216	package CFClient::UI::SpellList;
3217
3218	our @ISA = CFClient::UI::FancyFrame::;
3219
3220	sub new {
3221	my $class = shift;
3222
3223	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3224
3225	$self->add (new CFClient::UI::ScrolledWindow
3226	scrolled => $self->{spellbox} = new CFClient::UI::Table);
3227
3228	$self;
3229	}
3230
3231	# XXX: Do sorting? Argl...
3232	sub add_spell {
3233	my ($self, $spell) = @_;	3196	my ($self, $items) = @_;
3234	$self->{spells}->{$spell->{name}} = $spell;
3235		3197
3236	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face	3198	$self->{child}->clear;
3237	face => $spell->{face},	3199	return unless $items;
3238	can_hover => 1,
3239	can_events => 1,
3240	tooltip => $spell->{message});
3241		3200
3242	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label	3201	my @items = sort {
3243	text => $spell->{name},	3202	($a->{type} <=> $b->{type})
3244	can_hover => 1,	3203	or ($a->{name} cmp $b->{name})
3245	can_events => 1,	3204	} @$items;
3246	tooltip => $spell->{message},
3247	expand => 1);
3248		3205
3249	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label	3206	$self->{real_items} = \@items;
3250	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3251	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3252	expand => 1);
3253		3207
3254	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button	3208	my $row = 0;
3255	text => "bind to key",	3209	for my $item (@items) {
3256	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });	3210	CFClient::Item::update_widgets $item;
3257	}
3258		3211
3259	sub rebuild_spell_list {	3212	$self->{child}->add (0, $row, $item->{face_widget});
3260	my ($self) = @_;	3213	$self->{child}->add (1, $row, $item->{desc_widget});
3261	$self->{tbl_idx} = 0;	3214	$self->{child}->add (2, $row, $item->{weight_widget});
3262	$self->add_spell ($_) for values %{$self->{spells}};
3263	}
3264		3215
3265	sub remove_spell {	3216	$row++;
3266	my ($self, $spell) = @_;	3217	}
3267	delete $self->{spells}->{$spell->{name}};
3268	$self->rebuild_spell_list;
3269	}	3218	}
3270		3219
3271	#############################################################################	3220	#############################################################################
3272		3221
3273	package CFClient::UI::BindEditor;	3222	package CFClient::UI::BindEditor;
…		…
3368	$rec = $::CONN->stop_record if $::CONN;	3317	$rec = $::CONN->stop_record if $::CONN;
3369	return unless ref $rec eq 'ARRAY';	3318	return unless ref $rec eq 'ARRAY';
3370	$self->set_command_list ($rec);	3319	$self->set_command_list ($rec);
3371	}	3320	}
3372		3321
3373	# if $commit is true, the binding will be set after the user entered a key combo	3322
		3323	sub ask_for_bind_and_commit {
		3324	my ($self) = @_;
		3325	$self->ask_for_bind (1);
		3326	}
		3327
3374	sub ask_for_bind {	3328	sub ask_for_bind {
3375	my ($self, $commit) = @_;	3329	my ($self, $commit) = @_;
3376		3330
3377	CFClient::Binder::open_binding_dialog (sub {	3331	CFClient::Binder::open_binding_dialog (sub {
3378	my ($mod, $sym) = @_;	3332	my ($mod, $sym) = @_;
…		…
3460	}	3414	}
3461	}	3415	}
3462		3416
3463	#############################################################################	3417	#############################################################################
3464		3418
		3419	package CFClient::UI::SpellList;
		3420
		3421	our @ISA = CFClient::UI::Table::;
		3422
		3423	sub new {
		3424	my $class = shift;
		3425
		3426	my $self = $class->SUPER::new (
		3427	binding => [],
		3428	commands => [],
		3429	@_,
		3430	)
		3431	}
		3432
		3433	# XXX: Do sorting? Argl...
		3434	sub add_spell {
		3435	my ($self, $spell) = @_;
		3436	$self->{spells}->{$spell->{name}} = $spell;
		3437
		3438	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3439	face => $spell->{face},
		3440	can_hover => 1,
		3441	can_events => 1,
		3442	tooltip => $spell->{message});
		3443
		3444	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3445	text => $spell->{name},
		3446	can_hover => 1,
		3447	can_events => 1,
		3448	tooltip => $spell->{message},
		3449	expand => 1);
		3450
		3451	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3452	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3453	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
		3454	expand => 1);
		3455
		3456	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3457	text => "bind to key",
		3458	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3459	}
		3460
		3461	sub rebuild_spell_list {
		3462	my ($self) = @_;
		3463	$self->{tbl_idx} = 0;
		3464	$self->add_spell ($_) for values %{$self->{spells}};
		3465	}
		3466
		3467	sub remove_spell {
		3468	my ($self, $spell) = @_;
		3469	delete $self->{spells}->{$spell->{name}};
		3470	$self->rebuild_spell_list;
		3471	}
		3472
		3473	#############################################################################
		3474
		3475	package CFClient::UI::Root;
		3476
		3477	our @ISA = CFClient::UI::Container::;
		3478
		3479	use CFClient::OpenGL;
		3480
		3481	sub new {
		3482	my $class = shift;
		3483
		3484	my $self = $class->SUPER::new (
		3485	visible => 1,
		3486	@_,
		3487	);
		3488
		3489	Scalar::Util::weaken ($self->{root} = $self);
		3490
		3491	$self
		3492	}
		3493
		3494	sub size_request {
		3495	my ($self) = @_;
		3496
		3497	($self->{w}, $self->{h})
		3498	}
		3499
		3500	sub _to_pixel {
		3501	my ($coord, $size, $max) = @_;
		3502
		3503	$coord =
		3504	$coord eq "center" ? ($max - $size) * 0.5
		3505	: $coord eq "max" ? $max
		3506	: $coord;
		3507
		3508	$coord = 0 if $coord < 0;
		3509	$coord = $max - $size if $coord > $max - $size;
		3510
		3511	int $coord + 0.5
		3512	}
		3513
		3514	sub size_allocate {
		3515	my ($self, $w, $h) = @_;
		3516
		3517	for my $child ($self->children) {
		3518	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		3519
		3520	$X = $child->{force_x} if exists $child->{force_x};
		3521	$Y = $child->{force_y} if exists $child->{force_y};
		3522
		3523	$X = _to_pixel $X, $W, $self->{w};
		3524	$Y = _to_pixel $Y, $H, $self->{h};
		3525
		3526	$child->configure ($X, $Y, $W, $H);
		3527	}
		3528	}
		3529
		3530	sub coord2local {
		3531	my ($self, $x, $y) = @_;
		3532
		3533	($x, $y)
		3534	}
		3535
		3536	sub coord2global {
		3537	my ($self, $x, $y) = @_;
		3538
		3539	($x, $y)
		3540	}
		3541
		3542	sub update {
		3543	my ($self) = @_;
		3544
		3545	$::WANT_REFRESH++;
		3546	}
		3547
		3548	sub add {
		3549	my ($self, @children) = @_;
		3550
		3551	$_->{is_toplevel} = 1
		3552	for @children;
		3553
		3554	$self->SUPER::add (@children);
		3555	}
		3556
		3557	sub remove {
		3558	my ($self, @children) = @_;
		3559
		3560	$self->SUPER::remove (@children);
		3561
		3562	delete $self->{is_toplevel}
		3563	for @children;
		3564
		3565	while (@children) {
		3566	my $w = pop @children;
		3567	push @children, $w->children;
		3568	$w->set_invisible;
		3569	}
		3570	}
		3571
		3572	sub on_refresh {
		3573	my ($self, $id, $cb) = @_;
		3574
		3575	$self->{refresh_hook}{$id} = $cb;
		3576	}
		3577
		3578	sub on_post_alloc {
		3579	my ($self, $id, $cb) = @_;
		3580
		3581	$self->{post_alloc_hook}{$id} = $cb;
		3582	}
		3583
		3584	sub draw {
		3585	my ($self) = @_;
		3586
		3587	while ($self->{refresh_hook}) {
		3588	$_->()
		3589	for values %{delete $self->{refresh_hook}};
		3590	}
		3591
		3592	if ($self->{realloc}) {
		3593	my %queue;
		3594	my @queue;
		3595	my $widget;
		3596
		3597	outer:
		3598	while () {
		3599	if (my $realloc = delete $self->{realloc}) {
		3600	for $widget (values %$realloc) {
		3601	$widget->{visible} or next; # do not resize invisible widgets
		3602
		3603	$queue{$widget+0}++ and next; # duplicates are common
		3604
		3605	push @{ $queue[$widget->{visible}] }, $widget;
		3606	}
		3607	}
		3608
		3609	while () {
		3610	@queue or last outer;
		3611
		3612	$widget = pop @{ $queue[-1] \|\| [] }
		3613	and last;
		3614
		3615	pop @queue;
		3616	}
		3617
		3618	delete $queue{$widget+0};
		3619
		3620	my ($w, $h) = $widget->size_request;
		3621
		3622	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3623	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3624
		3625	$w = $widget->{force_w} if exists $widget->{force_w};
		3626	$h = $widget->{force_h} if exists $widget->{force_h};
		3627
		3628	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
		3629	\|\| delete $widget->{force_realloc}) {
		3630	$widget->{req_w} = $w;
		3631	$widget->{req_h} = $h;
		3632
		3633	$self->{size_alloc}{$widget+0} = $widget;
		3634
		3635	if (my $parent = $widget->{parent}) {
		3636	$self->{realloc}{$parent+0} = $parent
		3637	unless $queue{$parent+0};
		3638
		3639	$parent->{force_size_alloc} = 1;
		3640	$self->{size_alloc}{$parent+0} = $parent;
		3641	}
		3642	}
		3643
		3644	delete $self->{realloc}{$widget+0};
		3645	}
		3646	}
		3647
		3648	while (my $size_alloc = delete $self->{size_alloc}) {
		3649	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3650	values %$size_alloc;
		3651
		3652	while () {
		3653	my $widget = pop @queue \|\| last;
		3654
		3655	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
		3656
		3657	$w = 0 if $w < 0;
		3658	$h = 0 if $h < 0;
		3659
		3660	$w = int $w + 0.5;
		3661	$h = int $h + 0.5;
		3662
		3663	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3664	$widget->{old_w} = $widget->{w};
		3665	$widget->{old_h} = $widget->{h};
		3666
		3667	$widget->{w} = $w;
		3668	$widget->{h} = $h;
		3669
		3670	$widget->emit (size_allocate => $w, $h);
		3671	}
		3672	}
		3673	}
		3674
		3675	while ($self->{post_alloc_hook}) {
		3676	$_->()
		3677	for values %{delete $self->{post_alloc_hook}};
		3678	}
		3679
		3680
		3681	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		3682	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		3683	glClear GL_COLOR_BUFFER_BIT;
		3684
		3685	glMatrixMode GL_PROJECTION;
		3686	glLoadIdentity;
		3687	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
		3688	glMatrixMode GL_MODELVIEW;
		3689	glLoadIdentity;
		3690
		3691	{
		3692	package CFClient::UI::Base;
		3693
		3694	($draw_x, $draw_y, $draw_w, $draw_h) =
		3695	(0, 0, $self->{w}, $self->{h});
		3696	}
		3697
		3698	$self->_draw;
		3699	}
		3700
		3701	#############################################################################
		3702
3465	package CFClient::UI;	3703	package CFClient::UI;
3466		3704
3467	$ROOT = new CFClient::UI::Root;	3705	$ROOT = new CFClient::UI::Root;
3468	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	3706	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3469		3707

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.264 by root, Thu Jun 1 02:58:30 2006 UTC vs. Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC