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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.259 by root, Tue May 30 07:13:09 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}
		1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1528	}	1599	}
1529		1600
1530	sub set_fontsize {	1601	sub set_fontsize {
1531	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1532		1603
…		…
1547	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1548	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1549	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551		1622
1552	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1553		1625
		1626	unless (exists $self->{ox}) {
1554	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1557		1630
1558	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1561
1562	$tex
1563	};	1634	};
1564		1635
1565	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567		1638
…		…
1662	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1663	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1664	$self->_emit ('escape');	1735	$self->_emit ('escape');
1665	} elsif ($uni) {	1736	} elsif ($uni) {
1666	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1667	}	1740	}
1668		1741
1669	$self->_set_text ($text);	1742	$self->_set_text ($text);
1670		1743
1671	$self->realloc;	1744	$self->realloc;
		1745
		1746	1
1672	}	1747	}
1673		1748
1674	sub focus_in {	1749	sub focus_in {
1675	my ($self) = @_;	1750	my ($self) = @_;
1676		1751
…		…
1691	utf8::encode $text;	1766	utf8::encode $text;
1692	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1693		1768
1694	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1695	$self->update;	1770	$self->update;
		1771
		1772	1
1696	}	1773	}
1697		1774
1698	sub mouse_motion {	1775	sub mouse_motion {
1699	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1700	# 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
1701	}	1780	}
1702		1781
1703	sub _draw {	1782	sub _draw {
1704	my ($self) = @_;	1783	my ($self) = @_;
1705		1784
…		…
1782	} else {	1861	} else {
1783	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1784	}	1863	}
1785		1864
1786	} else {	1865	} else {
1787	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1788	}	1869	1
1789
1790	}	1870	}
1791		1871
1792	#############################################################################	1872	#############################################################################
1793		1873
1794	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1823	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1824		1904
1825	$self->emit ("activate")	1905	$self->emit ("activate")
1826	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1827	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1828	}	1910	}
1829		1911
1830	sub _draw {	1912	sub _draw {
1831	my ($self) = @_;	1913	my ($self) = @_;
1832		1914
…		…
1886		1968
1887	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1969	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1970	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889	$self->{state} = !$self->{state};	1971	$self->{state} = !$self->{state};
1890	$self->_emit (changed => $self->{state});	1972	$self->_emit (changed => $self->{state});
		1973	} else {
		1974	return 0
		1975	}
		1976
1891	}	1977	1
1892	}	1978	}
1893		1979
1894	sub _draw {	1980	sub _draw {
1895	my ($self) = @_;	1981	my ($self) = @_;
1896		1982
…		…
2234		2320
2235	$self->SUPER::button_down ($ev, $x, $y);	2321	$self->SUPER::button_down ($ev, $x, $y);
2236		2322
2237	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2323	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238		2324
2239	$self->mouse_motion ($ev, $x, $y);	2325	$self->mouse_motion ($ev, $x, $y)
2240	}	2326	}
2241		2327
2242	sub mouse_motion {	2328	sub mouse_motion {
2243	my ($self, $ev, $x, $y) = @_;	2329	my ($self, $ev, $x, $y) = @_;
2244		2330
…		…
2248	my (undef, $lo, $hi, $page) = @{$self->{range}};	2334	my (undef, $lo, $hi, $page) = @{$self->{range}};
2249		2335
2250	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2336	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251		2337
2252	$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
2253	}	2343	1
2254	}	2344	}
2255		2345
2256	sub update {	2346	sub update {
2257	my ($self) = @_;	2347	my ($self) = @_;
2258		2348
2259	$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}) {
2260	$self->set_value ($self->{range}[0]);	2357	$self->set_value ($self->{range}[0]);
2261		2358
2262	my ($value, $lo, $hi, $page) = @{$self->{range}};	2359	my ($value, $lo, $hi, $page) = @{$self->{range}};
2263	my $range = ($hi - $page - $lo) \|\| 1e-100;	2360	my $range = ($hi - $page - $lo) \|\| 1e-100;
2264		2361
…		…
2270	$value = ($value - $lo) / $range;	2367	$value = ($value - $lo) / $range;
2271	$value = $value * $self->{scale} + $self->{offset};	2368	$value = $value * $self->{scale} + $self->{offset};
2272		2369
2273	$self->{knob_x} = $value - $knob_w * 0.5;	2370	$self->{knob_x} = $value - $knob_w * 0.5;
2274	$self->{knob_w} = $knob_w;	2371	$self->{knob_w} = $knob_w;
2275	});	2372	}
2276
2277	$self->SUPER::update;
2278	}
2279
2280	sub _draw {
2281	my ($self) = @_;
2282		2373
2283	$self->SUPER::_draw ();	2374	$self->SUPER::_draw ();
2284		2375
2285	glScale $self->{w}, $self->{h};	2376	glScale $self->{w}, $self->{h};
2286		2377
…		…
2780	$self->SUPER::DESTROY;	2871	$self->SUPER::DESTROY;
2781	}	2872	}
2782		2873
2783	#############################################################################	2874	#############################################################################
2784		2875
2785	package CFClient::UI::Inventory;	2876	package CFClient::UI::Buttonbar;
2786		2877
2787	our @ISA = CFClient::UI::ScrolledWindow::;	2878	our @ISA = CFClient::UI::HBox::;
2788		2879
2789	sub new {	2880	# TODO: should actualyl wrap buttons and other goodies.
2790	my $class = shift;
2791
2792	my $self = $class->SUPER::new (
2793	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794	@_,
2795	);
2796
2797	$self
2798	}
2799
2800	sub set_items {
2801	my ($self, $items) = @_;
2802
2803	$self->{scrolled}->clear;
2804	return unless $items;
2805
2806	my @items = sort {
2807	($a->{type} <=> $b->{type})
2808	or ($a->{name} cmp $b->{name})
2809	} @$items;
2810
2811	$self->{real_items} = \@items;
2812
2813	my $row = 0;
2814	for my $item (@items) {
2815	CFClient::Item::update_widgets $item;
2816
2817	$self->{scrolled}->add (0, $row, $item->{face_widget});
2818	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2819	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821	$row++;
2822	}
2823	}
2824		2881
2825	#############################################################################	2882	#############################################################################
2826		2883
2827	package CFClient::UI::Menu;	2884	package CFClient::UI::Menu;
2828		2885
…		…
2878	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2879		2936
2880	# TODO: should use vbox->find_widget or so	2937	# TODO: should use vbox->find_widget or so
2881	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2938	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882	$self->{hover} = $self->{item}{$HOVER};	2939	$self->{hover} = $self->{item}{$HOVER};
		2940
		2941	0
2883	}	2942	}
2884		2943
2885	sub button_up {	2944	sub button_up {
2886	my ($self, $ev, $x, $y) = @_;	2945	my ($self, $ev, $x, $y) = @_;
2887		2946
…		…
2889	undef $GRAB;	2948	undef $GRAB;
2890	$self->hide;	2949	$self->hide;
2891		2950
2892	$self->_emit ("popdown");	2951	$self->_emit ("popdown");
2893	$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	);
2894	}	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});
2895	}	3066	}
2896		3067
2897	#############################################################################	3068	#############################################################################
2898		3069
2899	package CFClient::UI::Statusbox;	3070	package CFClient::UI::Statusbox;
…		…
3004	$self->SUPER::reconfigure;	3175	$self->SUPER::reconfigure;
3005	}	3176	}
3006		3177
3007	#############################################################################	3178	#############################################################################
3008		3179
		3180	package CFClient::UI::Inventory;
		3181
		3182	our @ISA = CFClient::UI::ScrolledWindow::;
		3183
		3184	sub new {
		3185	my $class = shift;
		3186
		3187	my $self = $class->SUPER::new (
		3188	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3189	@_,
		3190	);
		3191
		3192	$self
		3193	}
		3194
		3195	sub set_items {
		3196	my ($self, $items) = @_;
		3197
		3198	$self->{child}->clear;
		3199	return unless $items;
		3200
		3201	my @items = sort {
		3202	($a->{type} <=> $b->{type})
		3203	or ($a->{name} cmp $b->{name})
		3204	} @$items;
		3205
		3206	$self->{real_items} = \@items;
		3207
		3208	my $row = 0;
		3209	for my $item (@items) {
		3210	CFClient::Item::update_widgets $item;
		3211
		3212	$self->{child}->add (0, $row, $item->{face_widget});
		3213	$self->{child}->add (1, $row, $item->{desc_widget});
		3214	$self->{child}->add (2, $row, $item->{weight_widget});
		3215
		3216	$row++;
		3217	}
		3218	}
		3219
		3220	#############################################################################
		3221
		3222	package CFClient::UI::BindEditor;
		3223
		3224	our @ISA = CFClient::UI::FancyFrame::;
		3225
		3226	sub new {
		3227	my $class = shift;
		3228
		3229	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3230
		3231	$self->add (my $vb = new CFClient::UI::VBox);
		3232
		3233
		3234	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3235	text => "start recording",
		3236	tooltip => "Start/Stops recording of actions."
		3237	."All subsequent actions after the recording started will be captured."
		3238	."The actions are displayed after the record was stopped."
		3239	."To bind the action you have to click on the 'Bind' button",
		3240	on_activate => sub {
		3241	unless ($self->{recording}) {
		3242	$self->start;
		3243	} else {
		3244	$self->stop;
		3245	}
		3246	});
		3247
		3248	$vb->add (new CFClient::UI::Label text => "Actions:");
		3249	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3250
		3251	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3252	$vb->add (my $hb = new CFClient::UI::HBox);
		3253	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3254	$hb->add (new CFClient::UI::Button
		3255	text => "bind",
		3256	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3257	on_activate => sub {
		3258	$self->ask_for_bind;
		3259	});
		3260
		3261	$vb->add (my $hb = new CFClient::UI::HBox);
		3262	$hb->add (new CFClient::UI::Button
		3263	text => "ok",
		3264	expand => 1,
		3265	tooltip => "This closes the binding editor and saves the binding",
		3266	on_activate => sub {
		3267	$self->hide;
		3268	$self->commit;
		3269	});
		3270
		3271	$hb->add (new CFClient::UI::Button
		3272	text => "cancel",
		3273	expand => 1,
		3274	tooltip => "This closes the binding editor without saving",
		3275	on_activate => sub {
		3276	$self->hide;
		3277	$self->{binding_cancel}->()
		3278	if $self->{binding_cancel};
		3279	});
		3280
		3281	$self->update_binding_widgets;
		3282
		3283	$self
		3284	}
		3285
		3286	sub commit {
		3287	my ($self) = @_;
		3288	my ($mod, $sym, $cmds) = $self->get_binding;
		3289	if ($sym != 0 && @$cmds > 0) {
		3290	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3291	."'. Don't forget 'Save Config'!");
		3292	$self->{binding_change}->($mod, $sym, $cmds)
		3293	if $self->{binding_change};
		3294	} else {
		3295	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3296	$self->{binding_cancel}->()
		3297	if $self->{binding_cancel};
		3298	}
		3299	}
		3300
		3301	sub start {
		3302	my ($self) = @_;
		3303
		3304	$self->{rec_btn}->set_text ("stop recording");
		3305	$self->{recording} = 1;
		3306	$self->clear_command_list;
		3307	$::CONN->start_record if $::CONN;
		3308	}
		3309
		3310	sub stop {
		3311	my ($self) = @_;
		3312
		3313	$self->{rec_btn}->set_text ("start recording");
		3314	$self->{recording} = 0;
		3315
		3316	my $rec;
		3317	$rec = $::CONN->stop_record if $::CONN;
		3318	return unless ref $rec eq 'ARRAY';
		3319	$self->set_command_list ($rec);
		3320	}
		3321
		3322
		3323	sub ask_for_bind_and_commit {
		3324	my ($self) = @_;
		3325	$self->ask_for_bind (1);
		3326	}
		3327
		3328	sub ask_for_bind {
		3329	my ($self, $commit) = @_;
		3330
		3331	CFClient::Binder::open_binding_dialog (sub {
		3332	my ($mod, $sym) = @_;
		3333	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3334	$self->update_binding_widgets;
		3335	$self->commit if $commit;
		3336	});
		3337	}
		3338
		3339	# $mod and $sym are the modifiers and key symbol
		3340	# $cmds is a array ref of strings (the commands)
		3341	# $cb is the callback that is executed on OK
		3342	# $ccb is the callback that is executed on CANCEL and
		3343	# when the binding was unsuccessful on OK
		3344	sub set_binding {
		3345	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3346
		3347	$self->clear_command_list;
		3348	$self->{recording} = 0;
		3349	$self->{rec_btn}->set_text ("start recording");
		3350
		3351	$self->{binding} = [$mod, $sym];
		3352	$self->{commands} = $cmds;
		3353
		3354	$self->{binding_change} = $cb;
		3355	$self->{binding_cancel} = $ccb;
		3356
		3357	$self->update_binding_widgets;
		3358	}
		3359
		3360	# this is a shortcut method that asks for a binding
		3361	# and then just binds it.
		3362	sub do_quick_binding {
		3363	my ($self, $cmds) = @_;
		3364	$self->set_binding (undef, undef, $cmds, sub {
		3365	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3366	});
		3367	$self->ask_for_bind (1);
		3368	}
		3369
		3370	sub update_binding_widgets {
		3371	my ($self) = @_;
		3372	my ($mod, $sym, $cmds) = $self->get_binding;
		3373	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3374	$self->set_command_list ($cmds);
		3375	}
		3376
		3377	sub get_binding {
		3378	my ($self) = @_;
		3379	return (
		3380	$self->{binding}->[0],
		3381	$self->{binding}->[1],
		3382	[ grep { defined $_ } @{$self->{commands}} ]
		3383	);
		3384	}
		3385
		3386	sub clear_command_list {
		3387	my ($self) = @_;
		3388	$self->{cmdbox}->clear ();
		3389	}
		3390
		3391	sub set_command_list {
		3392	my ($self, $cmds) = @_;
		3393
		3394	$self->{cmdbox}->clear ();
		3395	$self->{commands} = $cmds;
		3396
		3397	my $idx = 0;
		3398
		3399	for (@$cmds) {
		3400	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3401
		3402	my $i = $idx;
		3403	$hb->add (new CFClient::UI::Label text => $_);
		3404	$hb->add (new CFClient::UI::Button
		3405	text => "delete",
		3406	tooltip => "Deletes the action from the record",
		3407	on_activate => sub {
		3408	$self->{cmdbox}->remove ($hb);
		3409	$cmds->[$i] = undef;
		3410	});
		3411
		3412
		3413	$idx++
		3414	}
		3415	}
		3416
		3417	#############################################################################
		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
3009	package CFClient::UI::Root;	3475	package CFClient::UI::Root;
3010		3476
3011	our @ISA = CFClient::UI::Container::;	3477	our @ISA = CFClient::UI::Container::;
3012		3478
3013	use CFClient::OpenGL;	3479	use CFClient::OpenGL;
…		…
3122	$_->()	3588	$_->()
3123	for values %{delete $self->{refresh_hook}};	3589	for values %{delete $self->{refresh_hook}};
3124	}	3590	}
3125		3591
3126	if ($self->{realloc}) {	3592	if ($self->{realloc}) {
		3593	my %queue;
3127	my @queue;	3594	my @queue;
		3595	my $widget;
3128		3596
		3597	outer:
3129	while () {	3598	while () {
3130	if ($self->{realloc}) {	3599	if (my $realloc = delete $self->{realloc}) {
3131	#TODO use array-of-depth approach	3600	for $widget (values %$realloc) {
		3601	$widget->{visible} or next; # do not resize invisible widgets
3132		3602
3133	use sort 'stable';	3603	$queue{$widget+0}++ and next; # duplicates are common
3134		3604
3135	@queue = sort { $a->{visible} <=> $b->{visible} }	3605	push @{ $queue[$widget->{visible}] }, $widget;
3136	@queue, values %{delete $self->{realloc}};	3606	}
3137	}	3607	}
3138		3608
		3609	while () {
		3610	@queue or last outer;
		3611
3139	my $widget = pop @queue \|\| last;	3612	$widget = pop @{ $queue[-1] \|\| [] }
		3613	and last;
		3614
		3615	pop @queue;
		3616	}
3140		3617
3141	$widget->{visible} or last; # do not resize invisible widgets	3618	delete $queue{$widget+0};
3142		3619
3143	my ($w, $h) = $widget->size_request;	3620	my ($w, $h) = $widget->size_request;
3144		3621
3145	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3622	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3623	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
…		…
3154	$widget->{req_h} = $h;	3631	$widget->{req_h} = $h;
3155		3632
3156	$self->{size_alloc}{$widget+0} = $widget;	3633	$self->{size_alloc}{$widget+0} = $widget;
3157		3634
3158	if (my $parent = $widget->{parent}) {	3635	if (my $parent = $widget->{parent}) {
3159	$self->{realloc}{$parent+0} = $parent;	3636	$self->{realloc}{$parent+0} = $parent
3160	#unshift @queue, $parent;	3637	unless $queue{$parent+0};
		3638
3161	$parent->{force_size_alloc} = 1;	3639	$parent->{force_size_alloc} = 1;
3162	$self->{size_alloc}{$parent+0} = $parent;	3640	$self->{size_alloc}{$parent+0} = $parent;
3163	}	3641	}
3164	}	3642	}
3165		3643
…		…
3181		3659
3182	$w = int $w + 0.5;	3660	$w = int $w + 0.5;
3183	$h = int $h + 0.5;	3661	$h = int $h + 0.5;
3184		3662
3185	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	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
3186	$widget->{w} = $w;	3667	$widget->{w} = $w;
3187	$widget->{h} = $h;	3668	$widget->{h} = $h;
3188		3669
3189	$widget->emit (size_allocate => $w, $h);	3670	$widget->emit (size_allocate => $w, $h);
3190	}	3671	}
…		…
3205	glLoadIdentity;	3686	glLoadIdentity;
3206	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3687	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207	glMatrixMode GL_MODELVIEW;	3688	glMatrixMode GL_MODELVIEW;
3208	glLoadIdentity;	3689	glLoadIdentity;
3209		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
3210	$self->_draw;	3698	$self->_draw;
3211	}	3699	}
3212		3700
3213	#############################################################################	3701	#############################################################################
3214		3702

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.259 by root, Tue May 30 07:13:09 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.259 by root, Tue May 30 07:13:09 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC