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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs.
Revision 1.121 by root, Mon Apr 17 19:21:00 2006 UTC

…		…
7		7
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $TOPLEVEL;	12	our $ROOT;
13	our $BUTTON_STATE;	13	our $BUTTON_STATE;
14		14
15	# class methods for events	15	# class methods for events
16	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
24	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	25	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $TOPLEVEL->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
30		30
31	$GRAB = $widget;	31	$GRAB = $widget;
32	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
33	}	33	}
34		34
35	$BUTTON_STATE \|= 1 << ($ev->button - 1);	35	$BUTTON_STATE \|= 1 << ($ev->button - 1);
36		36
37	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	38	}
39		39
40	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	41	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43		43
44	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
45		45
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
47		47
48	$GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	52	$grab->update if $grab;
53	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60		60
61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
65		65
66	$hover->update if $hover && $hover->{can_hover};	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	67	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}	68	}
69		69
70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
		71	}
		72
		73	# convert position array to integers
		74	sub harmonize {
		75	my ($vals) = @_;
		76
		77	my $rem = 0;
		78
		79	for (@$vals) {
		80	my $i = int $_ + $rem;
		81	$rem += $_ - $i;
		82	$_ = $i;
		83	}
71	}	84	}
72		85
73	#############################################################################	86	#############################################################################
74		87
75	package CFClient::UI::Base;	88	package CFClient::UI::Base;
…		…
99	$self	112	$self
100	}	113	}
101		114
102	sub move {	115	sub move {
103	my ($self, $x, $y, $z) = @_;	116	my ($self, $x, $y, $z) = @_;
104	$self->{x} = $x;	117	$self->{x} = int $x;
105	$self->{y} = $y;	118	$self->{y} = int $y;
106	$self->{z} = $z if defined $z;	119	$self->{z} = $z if defined $z;
107	}	120	}
108		121
109	sub needs_redraw {	122	sub needs_redraw {
110	0	123	0
…		…
133	my ($self, $x, $y, $w, $h) = @_;	146	my ($self, $x, $y, $w, $h) = @_;
134		147
135	$self->_size_allocate ($x, $y, $w, $h);	148	$self->_size_allocate ($x, $y, $w, $h);
136	}	149	}
137		150
		151	# return top left coordinates
		152	sub _topleft {
		153	my ($self, $x, $y) = @_;
		154
		155	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
		156	}
		157
138	# translate global coordinates to local coordinate system	158	# translate global coordinates to local coordinate system
139	sub translate {	159	sub coord2local {
140	my ($self, $x, $y) = @_;	160	my ($self, $x, $y) = @_;
141		161
142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	162	my ($X, $Y) = $self->_topleft;
		163	($x - $X, $y - $Y)
		164	}
		165
		166	# translate local coordinates to global coordinate system
		167	sub coord2global {
		168	my ($self, $x, $y) = @_;
		169
		170	my ($X, $Y) = $self->_topleft;
		171	($x + $X, $y + $Y)
143	}	172	}
144		173
145	sub focus_in {	174	sub focus_in {
146	my ($self) = @_;	175	my ($self) = @_;
147		176
148	return if $FOCUS == $self;	177	return if $FOCUS == $self;
149	return unless $self->{can_focus};	178	return unless $self->{can_focus};
150		179
151	my $focus = $FOCUS; $FOCUS = $self;	180	my $focus = $FOCUS; $FOCUS = $self;
		181
		182	$self->emit (focus_in => $focus);
		183
152	$focus->update if $focus;	184	$focus->update if $focus;
153	$FOCUS->update;	185	$FOCUS->update;
154	}	186	}
155		187
156	sub focus_out {	188	sub focus_out {
157	my ($self) = @_;	189	my ($self) = @_;
158		190
159	return unless $FOCUS == $self;	191	return unless $FOCUS == $self;
160		192
161	my $focus = $FOCUS; undef $FOCUS;	193	my $focus = $FOCUS; undef $FOCUS;
		194
		195	$self->emit (focus_out => $focus);
		196
162	$focus->update if $focus; #?	197	$focus->update if $focus; #?
163	}	198	}
164		199
165	sub mouse_motion { }	200	sub mouse_motion { }
166	sub button_up { }	201	sub button_up { }
…		…
220		255
221	()	256	()
222	}	257	}
223		258
224	sub set_parent {	259	sub set_parent {
225	my ($self, $par) = @_;	260	my ($self, $parent) = @_;
226		261
227	$self->{parent} = $par;
228	Scalar::Util::weaken $self->{parent};	262	Scalar::Util::weaken ($self->{parent} = $parent);
229	}
230
231	sub get_parent {
232	$_[0]->{parent}
233	}	263	}
234		264
235	sub update {	265	sub update {
236	my ($self) = @_;	266	my ($self) = @_;
237		267
…		…
326		356
327	$self	357	$self
328	}	358	}
329		359
330	sub add {	360	sub add {
331	my ($self, $chld) = @_;	361	my ($self, $child) = @_;
332		362
333	$chld->set_parent ($self);	363	$child->set_parent ($self);
		364
		365	use sort 'stable';
334		366
335	$self->{children} = [	367	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	368	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	369	@{$self->{children}}, $child
338	];	370	];
339		371
340	$self->{w} = $self->{h} = -1;	372	$self->{w} = $self->{h} = -1;
341	$self->update;	373	$self->update;
342	}	374	}
…		…
539	# TODO: user_x, user_y, overwrite moveto?	571	# TODO: user_x, user_y, overwrite moveto?
540		572
541	$class->SUPER::new (	573	$class->SUPER::new (
542	bg => [1, 1, 1, 1],	574	bg => [1, 1, 1, 1],
543	border_bg => [1, 1, 1, 1],	575	border_bg => [1, 1, 1, 1],
544	border => $::FONTSIZE * 0.8,	576	border => int $::FONTSIZE * 0.8,
545	@_	577	@_
546	)	578	)
547	}	579	}
548		580
549	sub size_request {	581	sub size_request {
…		…
672	@_	704	@_
673	)	705	)
674	}	706	}
675		707
676	sub add {	708	sub add {
677	my ($self, $x, $y, $chld) = @_;	709	my ($self, $x, $y, $child) = @_;
678		710
		711	$child->set_parent ($self);
679	$self->{children}[$y][$x] = $chld;	712	$self->{children}[$y][$x] = $child;
680	$chld->set_parent ($self);
681		713
682	$self->{w} = $self->{h} = -1;	714	$self->{w} = $self->{h} = -1;
		715	$self->update;
		716	}
		717
		718	# TODO: move to container class maybe? send childs a signal on removal?
		719	sub clear {
		720	my ($self) = @_;
		721
		722	delete $self->{children};
683	$self->update;	723	$self->update;
684	}	724	}
685		725
686	sub get_wh {	726	sub get_wh {
687	my ($self) = @_;	727	my ($self) = @_;
…		…
733		773
734	# linearly scale sizes	774	# linearly scale sizes
735	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	775	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	776	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
737		777
738	$_ = int $_ for @$ws; #TODO: avoid rounding problems	778	CFClient::UI::harmonize $ws;
739	$_ = int $_ for @$hs; #TODO: avoid rounding problems	779	CFClient::UI::harmonize $hs;
740		780
741	my $y;	781	my $y;
742		782
743	for my $r (0 .. $#{$self->{children}}) {	783	for my $r (0 .. $#{$self->{children}}) {
744	my $row = $self->{children}[$r]	784	my $row = $self->{children}[$r]
…		…
832	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	872	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833	$h[$_] = $alloc_h;	873	$h[$_] = $alloc_h;
834	}	874	}
835	}	875	}
836		876
		877	CFClient::UI::harmonize \@h;
		878
837	my $y = 0;	879	my $y = 0;
838	for (0 .. $#$children) {	880	for (0 .. $#$children) {
839	my $child = $children->[$_];	881	my $child = $children->[$_];
840	my $h = int $h[$_];	882	my $h = $h[$_];
841	$child->size_allocate ($y, 0, $h, $w);	883	$child->size_allocate ($y, 0, $h, $w);
842		884
843	$y += $h;	885	$y += $h;
844	}	886	}
845	}	887	}
…		…
886		928
887	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	929	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888	}	930	}
889	}	931	}
890		932
		933	CFClient::UI::harmonize \@h;
		934
891	my $y = 0;	935	my $y = 0;
892	for (0 .. $#$children) {	936	for (0 .. $#$children) {
893	my $child = $children->[$_];	937	my $child = $children->[$_];
894	my $h = int $h[$_];	938	my $h = $h[$_];
895	$child->size_allocate (0, $y, $w, $h);	939	$child->size_allocate (0, $y, $w, $h);
896		940
897	$y += $h;	941	$y += $h;
898	}	942	}
899	}	943	}
…		…
912	my $self = $class->SUPER::new (	956	my $self = $class->SUPER::new (
913	fg => [1, 1, 1],	957	fg => [1, 1, 1],
914	fontsize => $::FONTSIZE,	958	fontsize => $::FONTSIZE,
915	text => "",	959	text => "",
916	align => -1,	960	align => -1,
		961	valign => -1,
917	padding => 2,	962	padding => 2,
918	layout => new CFClient::Layout,	963	layout => new CFClient::Layout,
919	%arg	964	%arg
920	);	965	);
921		966
922	$self->set_text ($self->{text});	967	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
		968
		969	$self->set_text (delete $self->{text}) if exists $self->{text};
		970	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
923		971
924	$self	972	$self
925	}	973	}
926		974
927	sub escape_text {	975	sub escape_text {
…		…
935	}	983	}
936		984
937	sub set_text {	985	sub set_text {
938	my ($self, $text) = @_;	986	my ($self, $text) = @_;
939		987
940	$self->{text} = $text;
941	$self->{layout}->set_markup ($text);	988	$self->{layout}->set_text ($text);
942		989
943	delete $self->{texture};	990	delete $self->{texture};
944	# $self->{w} = $self->{h} = -1;
945	$self->update;	991	$self->update;
946	}	992	}
947		993
948	sub get_text {	994	sub set_markup {
949	my ($self, $text) = @_;	995	my ($self, $markup) = @_;
950		996
951	$self->{text}	997	$self->{layout}->set_markup ($markup);
		998
		999	delete $self->{texture};
		1000	$self->update;
952	}	1001	}
953		1002
954	sub size_request {	1003	sub size_request {
955	my ($self) = @_;	1004	my ($self) = @_;
956		1005
957	$self->{layout}->set_width;	1006	$self->{layout}->set_width;
958	$self->{layout}->set_height ($self->{fontsize});	1007	$self->{layout}->set_height ($self->{fontsize});
		1008
959	my ($w, $h) = $self->{layout}->size;	1009	my ($w, $h) = $self->{layout}->size;
960		1010
961	(	1011	(
962	$w + $self->{padding} * 2,	1012	$w + $self->{padding} * 2,
963	$h + $self->{padding} * 2,	1013	$h + $self->{padding} * 2,
…		…
982	sub _draw {	1032	sub _draw {
983	my ($self) = @_;	1033	my ($self) = @_;
984		1034
985	my $tex = $self->{texture} \|\|= do {	1035	my $tex = $self->{texture} \|\|= do {
986	$self->{layout}->set_width ($self->{w});	1036	$self->{layout}->set_width ($self->{w});
987	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});	1037	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
988	new_from_layout CFClient::Texture $self->{layout}	1038	new_from_layout CFClient::Texture $self->{layout}
989	};	1039	};
990		1040
991	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
992	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
998	my $x =	1048	my $x =
999	$self->{align} < 0 ? $self->{padding}	1049	$self->{align} < 0 ? $self->{padding}
1000	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1050	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001	: ($self->{w} - $tex->{w}) * 0.5;	1051	: ($self->{w} - $tex->{w}) * 0.5;
1002		1052
1003	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);	1053	my $y =
		1054	$self->{valign} < 0 ? $self->{padding}
		1055	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1056	: ($self->{h} - $tex->{h}) * 0.5;
		1057
		1058	$tex->draw_quad (int $x, int $y);
1004		1059
1005	glDisable GL_TEXTURE_2D;	1060	glDisable GL_TEXTURE_2D;
1006	glDisable GL_BLEND;	1061	glDisable GL_BLEND;
1007	}	1062	}
1008		1063
1009	#############################################################################	1064	#############################################################################
1010		1065
1011	package CFClient::UI::Entry;	1066	package CFClient::UI::EntryBase;
1012		1067
1013	our @ISA = CFClient::UI::Label::;	1068	our @ISA = CFClient::UI::Label::;
1014		1069
1015	use SDL;	1070	use SDL;
1016	use SDL::OpenGL;	1071	use SDL::OpenGL;
…		…
1023	bg => [0, 0, 0, 0.2],	1078	bg => [0, 0, 0, 0.2],
1024	active_bg => [1, 1, 1, 0.5],	1079	active_bg => [1, 1, 1, 0.5],
1025	active_fg => [0, 0, 0],	1080	active_fg => [0, 0, 0],
1026	can_hover => 1,	1081	can_hover => 1,
1027	can_focus => 1,	1082	can_focus => 1,
		1083	valign => 0,
1028	@_	1084	@_
1029	)	1085	)
1030	}	1086	}
1031		1087
1032	sub _set_text {	1088	sub _set_text {
1033	my ($self, $text) = @_;	1089	my ($self, $text) = @_;
1034		1090
1035	my $old_text = $self->{text};	1091	delete $self->{cur_h};
		1092
		1093	return if $self->{text} eq $text;
1036		1094
1037	$self->{last_activity} = $::NOW;	1095	$self->{last_activity} = $::NOW;
1038
1039	$self->{text} = $text;	1096	$self->{text} = $text;
1040	$self->{layout}->set_width ($self->{w});
1041	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1042		1097
1043	$text =~ s/./*/g if $self->{hidden};	1098	$text =~ s/./*/g if $self->{hidden};
		1099	$self->{layout}->set_text ("$text ");
1044		1100
1045	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1101	$self->emit (changed => $self->{text});
		1102	}
1046		1103
1047	$text = substr $text, 0, $self->{cursor};	1104	sub get_text {
1048	utf8::encode $text;	1105	$_[0]{text}
1049
1050	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053	if $old_text ne $self->{text};
1054	}	1106	}
1055		1107
1056	sub size_request {	1108	sub size_request {
1057	my ($self) = @_;	1109	my ($self) = @_;
1058		1110
…		…
1162		1214
1163	$self->SUPER::_draw;	1215	$self->SUPER::_draw;
1164		1216
1165	#TODO: force update every cursor change :(	1217	#TODO: force update every cursor change :(
1166	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1218	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1219
		1220	unless (exists $self->{cur_h}) {
		1221	my $text = substr $self->{text}, 0, $self->{cursor};
		1222	utf8::encode $text;
		1223
		1224	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1225	}
		1226
1167	glColor @{$self->{fg}};	1227	glColor @{$self->{fg}};
1168	glBegin GL_LINES;	1228	glBegin GL_LINES;
1169	glVertex $self->{cur_x}, $self->{cur_y};	1229	glVertex $self->{cur_x}, $self->{cur_y};
1170	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1230	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1171	glEnd;	1231	glEnd;
1172	}	1232	}
1173	}	1233	}
1174		1234
1175	package CFClient::UI::LineEntry;	1235	package CFClient::UI::Entry;
1176		1236
1177	our @ISA = CFClient::UI::Entry::;	1237	our @ISA = CFClient::UI::EntryBase::;
1178		1238
1179	use SDL;	1239	use SDL;
1180	use SDL::OpenGL;	1240	use SDL::OpenGL;
1181		1241
1182	sub key_down {	1242	sub key_down {
…		…
1231		1291
1232	sub _draw {	1292	sub _draw {
1233	my ($self) = @_;	1293	my ($self) = @_;
1234		1294
1235	local $self->{fg} = $self->{fg};	1295	local $self->{fg} = $self->{fg};
1236	my $tex = $tex[0];
1237
1238	glEnable GL_BLEND;
1239	glEnable GL_TEXTURE_2D;
1240	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241		1296
1242	if ($GRAB == $self) {	1297	if ($GRAB == $self) {
1243	$self->{fg} = $self->{active_fg};	1298	$self->{fg} = $self->{active_fg};
1244	}	1299	}
1245		1300
1246	glBindTexture GL_TEXTURE_2D, $tex->{name};	1301	glEnable GL_BLEND;
		1302	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1303	glEnable GL_TEXTURE_2D;
1247	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1304	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1305	glColor 0, 0, 0, 1;
1248		1306
1249	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1307	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1250		1308
1251	glDisable GL_TEXTURE_2D;	1309	glDisable GL_TEXTURE_2D;
1252	glDisable GL_BLEND;	1310	glDisable GL_BLEND;
1253		1311
1254	$self->SUPER::_draw;	1312	$self->SUPER::_draw;
…		…
1427	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1485	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1428	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1486	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1429		1487
1430	my ($value, $lo, $hi, $page) = @{$self->{range}};	1488	my ($value, $lo, $hi, $page) = @{$self->{range}};
1431		1489
		1490	$hi = $value + 1 if $lo == $hi;
		1491
1432	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1492	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1433	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1493	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1434		1494
1435	$page = int $page * $inner_w / ($hi - $lo);	1495	$page = int $page * $inner_w / ($hi - $lo);
1436	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1496	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1482	(new CFClient::UI::Empty expand => 1),	1542	(new CFClient::UI::Empty expand => 1),
1483	(new CFClient::UI::Slider vertical => 1),	1543	(new CFClient::UI::Slider vertical => 1),
1484	],	1544	],
1485	);	1545	);
1486		1546
		1547	$self->{children}[1]->connect (changed => sub {
		1548	$self->update;
		1549	});
		1550
1487	$self	1551	$self
		1552	}
		1553
		1554	sub set_fontsize {
		1555	my ($self, $fontsize) = @_;
		1556
		1557	$self->{fontsize} = $fontsize;
		1558	$self->reflow;
1488	}	1559	}
1489		1560
1490	sub text_height {	1561	sub text_height {
1491	my ($self, $text) = @_;	1562	my ($self, $text) = @_;
1492		1563
…		…
1500	}	1571	}
1501		1572
1502	sub reflow {	1573	sub reflow {
1503	my ($self) = @_;	1574	my ($self) = @_;
1504		1575
1505	my $height = 0;	1576	$self->{need_reflow}++;
1506		1577	$self->update;
1507	for (@{$self->{par}}) {
1508	$height += $_->[0] = $self->text_height ($_->[2]);
1509	}
1510
1511	$self->{height} = $height;
1512
1513	$self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1514	}	1578	}
1515		1579
1516	sub size_request {	1580	sub size_request {
1517	my ($self) = @_;	1581	my ($self) = @_;
1518		1582
…		…
1526		1590
1527	$self->{layout}->set_height ($self->{fontsize});	1591	$self->{layout}->set_height ($self->{fontsize});
1528	$self->{layout}->set_width ($self->{w});	1592	$self->{layout}->set_width ($self->{w});
1529		1593
1530	$self->reflow;	1594	$self->reflow;
1531	$self->update;
1532	}	1595	}
1533		1596
1534	sub add_paragraph {	1597	sub add_paragraph {
1535	my ($self, $color, $text) = @_;	1598	my ($self, $color, $text) = @_;
1536		1599
…		…
1551		1614
1552	$self->SUPER::update;	1615	$self->SUPER::update;
1553		1616
1554	return unless $self->{h} > 0;	1617	return unless $self->{h} > 0;
1555		1618
		1619	delete $self->{texture};
		1620
		1621	$ROOT->on_refresh ($self, sub {
		1622	if (delete $self->{need_reflow}) {
		1623	my $height = 0;
		1624
		1625	$height += $_->[0] = $self->text_height ($_->[2])
		1626	for @{$self->{par}};
		1627
		1628	$self->{height} = $height;
		1629
		1630	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1631
		1632	delete $self->{texture};
		1633	}
		1634
1556	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	1635	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1557	glClearColor 0, 0, 0, 1;	1636	glClearColor 0, 0, 0, 1;
1558	glClear GL_COLOR_BUFFER_BIT;	1637	glClear GL_COLOR_BUFFER_BIT;
1559		1638
1560	my $y0 = $self->{height} - $self->{h};
1561	my $y1 = $self->{height};
1562
1563	glEnable GL_BLEND;	1639	glEnable GL_BLEND;
1564	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1640	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1565	glEnable GL_TEXTURE_2D;	1641	glEnable GL_TEXTURE_2D;
1566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1642	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567		1643
		1644	my $top = int $self->{children}[1]{range}[0];
		1645
		1646	my $y0 = $top;
		1647	my $y1 = $top + $self->{h};
		1648
1568	my $y = 0;	1649	my $y = 0;
1569		1650
1570	my $layout = $self->{layout};	1651	my $layout = $self->{layout};
1571		1652
1572	for my $par (@{$self->{par}}) {	1653	for my $par (@{$self->{par}}) {
1573	my $h = $par->[0];	1654	my $h = $par->[0];
1574		1655
1575	if ($y0 < $y + $h && $y < $y1) {	1656	if ($y0 < $y + $h && $y < $y1) {
1576	$layout->set_text ($par->[2]);	1657	$layout->set_text ($par->[2]);
1577		1658
1578	glColor @{ $par->[1] };	1659	glColor @{ $par->[1] };
1579	my ($W, $H) = $layout->size;	1660	my ($W, $H) = $layout->size;
1580	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	1661	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1662	}
		1663
		1664	$y += $h;
1581	}	1665	}
1582		1666
1583	$y += $h;
1584	}
1585
1586	glDisable GL_TEXTURE_2D;	1667	glDisable GL_TEXTURE_2D;
1587	glDisable GL_BLEND;	1668	glDisable GL_BLEND;
		1669	};
1588	};	1670	});
1589	}	1671	}
1590		1672
1591	sub _draw {	1673	sub _draw {
1592	my ($self) = @_;	1674	my ($self) = @_;
1593		1675
…		…
1631	}	1713	}
1632		1714
1633	sub key_up {	1715	sub key_up {
1634	}	1716	}
1635		1717
		1718	sub button_down {
		1719	my ($self, $ev, $x, $y) = @_;
		1720
		1721	$self->focus_in;
		1722
		1723	if ($ev->button == 2) {
		1724	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1725	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1726
		1727	$self->{motion} = sub {
		1728	my ($ev, $x, $y) = @_;
		1729
		1730	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1731
		1732	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1733	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1734
		1735	$self->update;
		1736	};
		1737	}
		1738	}
		1739
		1740	sub button_up {
		1741	my ($self, $ev, $x, $y) = @_;
		1742
		1743	delete $self->{motion};
		1744	}
		1745
		1746	sub mouse_motion {
		1747	my ($self, $ev, $x, $y) = @_;
		1748
		1749	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1750	}
		1751
1636	sub size_request {	1752	sub size_request {
1637	(	1753	(
1638	1 + 32 * int $::WIDTH / 32,	1754	1 + 32 * int $::WIDTH / 32,
1639	1 + 32 * int $::HEIGHT / 32,	1755	1 + 32 * int $::HEIGHT / 32,
1640	)	1756	)
…		…
1648	}	1764	}
1649		1765
1650	sub draw {	1766	sub draw {
1651	my ($self) = @_;	1767	my ($self) = @_;
1652		1768
1653	$self->{need_update}++;#d#
1654	if (delete $self->{need_update}) {	1769	if (delete $self->{need_update}) {
1655	glNewList $self->{list}, GL_COMPILE;	1770	glNewList $self->{list}, GL_COMPILE;
1656		1771
1657	my $sw = int $::WIDTH / 32;
1658	my $sh = int $::HEIGHT / 32;
1659
1660	if ($::MAP) {	1772	if ($::MAP) {
		1773	my $sw = int $::WIDTH / 32;
		1774	my $sh = int $::HEIGHT / 32;
		1775
		1776	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1777	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1778
		1779	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1780
1661	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1781	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1662		1782
1663	if ($::CFG->{fow_enable}) {	1783	if ($::CFG->{fow_enable}) {
1664	if ($::CFG->{fow_smooth}) { # smooth fog of war	1784	if ($::CFG->{fow_smooth}) { # smooth fog of war
1665	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1785	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1666	glConvolutionFilter2D	1786	glConvolutionFilter2D
…		…
1674	0.1, 0.1, 0.1,	1794	0.1, 0.1, 0.1,
1675	;	1795	;
1676	glEnable GL_CONVOLUTION_2D;	1796	glEnable GL_CONVOLUTION_2D;
1677	}	1797	}
1678		1798
1679	my $tex = new CFClient::Texture	1799	$self->{fow_texture} = new CFClient::Texture
1680	w => $w,	1800	w => $w,
1681	h => $h,	1801	h => $h,
1682	data => $data,	1802	data => $data,
1683	internalformat => GL_ALPHA,	1803	internalformat => GL_ALPHA,
1684	format => GL_ALPHA;	1804	format => GL_ALPHA;
1685		1805
1686	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1806	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1687		1807
1688	glEnable GL_BLEND;	1808	glEnable GL_BLEND;
		1809	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1689	glEnable GL_TEXTURE_2D;	1810	glEnable GL_TEXTURE_2D;
1690	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1691		1812
1692	glColor +($::CFG->{fow_intensity}) x 3, 1;	1813	glColor +($::CFG->{fow_intensity}) x 3, 1;
1693	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1814	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1694		1815
1695	glDisable GL_TEXTURE_2D;	1816	glDisable GL_TEXTURE_2D;
1696	glDisable GL_BLEND;	1817	glDisable GL_BLEND;
1697	}	1818	}
		1819
		1820	# HACK BEGIN
		1821	{
		1822	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1823	my ($w, $h) = (250, 250);
		1824
		1825	glEnable GL_BLEND;
		1826	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1827	glEnable GL_TEXTURE_2D;
		1828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1829
		1830	$self->{mapmap_texture} =
		1831	new CFClient::Texture
		1832	w => $w,
		1833	h => $h,
		1834	data => $::MAP->mapmap ($w, $h),
		1835	type => GL_UNSIGNED_INT_8_8_8_8_REV;
		1836
		1837	$self->{mapmap_texture}->draw_quad (100, 100);
		1838
		1839	glDisable GL_TEXTURE_2D;
		1840	glDisable GL_BLEND;
		1841	}
		1842	# HACK END
1698	}	1843	}
1699		1844
1700	glEndList;	1845	glEndList;
1701	}	1846	}
1702		1847
		1848	glPushMatrix;
1703	glCallList $self->{list};	1849	glCallList $self->{list};
		1850	glPopMatrix;
1704		1851
1705	if ($FOCUS != $self) {	1852	if ($FOCUS != $self) {
1706	glColor 64/255, 64/255, 64/255;	1853	glColor 64/255, 64/255, 64/255;
1707	glLogicOp GL_AND;	1854	glLogicOp GL_AND;
1708	glEnable GL_COLOR_LOGIC_OP;	1855	glEnable GL_COLOR_LOGIC_OP;
…		…
1841	sub toggle_flopper {	1988	sub toggle_flopper {
1842	my ($self) = @_;	1989	my ($self) = @_;
1843		1990
1844	# TODO: use animation	1991	# TODO: use animation
1845	if ($self->{state} = !$self->{state}) {	1992	if ($self->{state} = !$self->{state}) {
1846	$CFClient::UI::TOPLEVEL->add ($self->{other});	1993	$CFClient::UI::ROOT->add ($self->{other});
1847	$self->{other}->move (	1994	$self->{other}->move ($self->coord2global (0, $self->{h}));
1848	($::WIDTH - $self->{other}{w}) * 0.5,	1995	$self->emit ("open");
1849	($::HEIGHT - $self->{other}{h}) * 0.5,
1850	);
1851	} else {	1996	} else {
1852	$CFClient::UI::TOPLEVEL->remove ($self->{other});	1997	$CFClient::UI::ROOT->remove ($self->{other});
		1998	$self->emit ("close");
1853	}	1999	}
1854	}
1855		2000
1856	#############################################################################	2001	$self->emit (changed => $self->{state});
		2002	}
1857		2003
		2004	#############################################################################
		2005
1858	package CFClient::UI::Toplevel;	2006	package CFClient::UI::Root;
1859		2007
1860	our @ISA = CFClient::UI::Container::;	2008	our @ISA = CFClient::UI::Container::;
		2009
		2010	use SDL::OpenGL;
1861		2011
1862	sub size_request {	2012	sub size_request {
1863	($::WIDTH, $::HEIGHT)	2013	($::WIDTH, $::HEIGHT)
1864	}	2014	}
1865		2015
…		…
1870		2020
1871	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2021	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1872	for @{$self->{children}};	2022	for @{$self->{children}};
1873	}	2023	}
1874		2024
1875	sub translate {	2025	sub _topleft {
1876	my ($self, $x, $y) = @_;	2026	my ($self, $x, $y) = @_;
1877		2027
1878	($x, $y)	2028	($x, $y)
1879	}	2029	}
1880		2030
…		…
1888	sub add {	2038	sub add {
1889	my ($self, $widget) = @_;	2039	my ($self, $widget) = @_;
1890		2040
1891	$self->SUPER::add ($widget);	2041	$self->SUPER::add ($widget);
1892		2042
1893	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2043	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
		2044	}
		2045
		2046	sub on_refresh {
		2047	my ($self, $id, $cb) = @_;
		2048
		2049	$self->{refresh_hook}{$id} = $cb;
1894	}	2050	}
1895		2051
1896	sub draw {	2052	sub draw {
1897	my ($self) = @_;	2053	my ($self) = @_;
1898		2054
		2055	while (my $rcb = delete $self->{refresh_hook}) {
		2056	$_->() for values %$rcb;
		2057	}
		2058
		2059	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2060	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2061	glClear GL_COLOR_BUFFER_BIT;
		2062
		2063	glMatrixMode GL_PROJECTION;
		2064	glLoadIdentity;
		2065	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2066	glMatrixMode GL_MODELVIEW;
		2067	glLoadIdentity;
		2068
1899	$self->_draw;	2069	$self->_draw;
1900	}	2070	}
1901		2071
1902	#############################################################################	2072	#############################################################################
1903		2073
1904	package CFClient::UI;	2074	package CFClient::UI;
1905		2075
1906	$TOPLEVEL = new CFClient::UI::Toplevel;	2076	$ROOT = new CFClient::UI::Root;
1907		2077
1908	1	2078	1
1909		2079

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs. Revision 1.121 by root, Mon Apr 17 19:21:00 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs.
Revision 1.121 by root, Mon Apr 17 19:21:00 2006 UTC