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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.103 by elmex, Fri Apr 14 13:51:36 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;	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $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	}
…		…
439	}	471	}
440		472
441	sub render_chld {	473	sub render_chld {
442	my ($self) = @_;	474	my ($self) = @_;
443		475
444	$self->{texture} =	476	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445	CFClient::Texture->new_from_opengl (	477	glClearColor 0, 0, 0, 1;
446	$self->{w}, $self->{h}, sub { $self->child->draw }	478	glClear GL_COLOR_BUFFER_BIT;
447	);	479	$self->child->draw;
		480	};
448	}	481	}
449		482
450	sub size_allocate {	483	sub size_allocate {
451	my ($self, $x, $y, $w, $h) = @_;	484	my ($self, $x, $y, $w, $h) = @_;
452		485
…		…
538	# TODO: user_x, user_y, overwrite moveto?	571	# TODO: user_x, user_y, overwrite moveto?
539		572
540	$class->SUPER::new (	573	$class->SUPER::new (
541	bg => [1, 1, 1, 1],	574	bg => [1, 1, 1, 1],
542	border_bg => [1, 1, 1, 1],	575	border_bg => [1, 1, 1, 1],
543	border => $::FONTSIZE * 0.8,	576	border => int $::FONTSIZE * 0.8,
544	@_	577	@_
545	)	578	)
546	}	579	}
547		580
548	sub size_request {	581	sub size_request {
…		…
671	@_	704	@_
672	)	705	)
673	}	706	}
674		707
675	sub add {	708	sub add {
676	my ($self, $x, $y, $chld) = @_;	709	my ($self, $x, $y, $child) = @_;
677		710
		711	$child->set_parent ($self);
678	$self->{children}[$y][$x] = $chld;	712	$self->{children}[$y][$x] = $child;
679	$chld->set_parent ($self);
680		713
681	$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};
682	$self->update;	723	$self->update;
683	}	724	}
684		725
685	sub get_wh {	726	sub get_wh {
686	my ($self) = @_;	727	my ($self) = @_;
…		…
731	my $col_expand = (sum @col_expand) \|\| 1;	772	my $col_expand = (sum @col_expand) \|\| 1;
732		773
733	# linearly scale sizes	774	# linearly scale sizes
734	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	775	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	776	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		777
		778	CFClient::UI::harmonize $ws;
		779	CFClient::UI::harmonize $hs;
736		780
737	my $y;	781	my $y;
738		782
739	for my $r (0 .. $#{$self->{children}}) {	783	for my $r (0 .. $#{$self->{children}}) {
740	my $row = $self->{children}[$r]	784	my $row = $self->{children}[$r]
…		…
828	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	872	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829	$h[$_] = $alloc_h;	873	$h[$_] = $alloc_h;
830	}	874	}
831	}	875	}
832		876
		877	CFClient::UI::harmonize \@h;
		878
833	my $y = 0;	879	my $y = 0;
834	for (0 .. $#$children) {	880	for (0 .. $#$children) {
835	my $child = $children->[$_];	881	my $child = $children->[$_];
836	my $h = $h[$_];	882	my $h = $h[$_];
837	$child->size_allocate ($y, 0, $h, $w);	883	$child->size_allocate ($y, 0, $h, $w);
…		…
882		928
883	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	929	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
884	}	930	}
885	}	931	}
886		932
		933	CFClient::UI::harmonize \@h;
		934
887	my $y = 0;	935	my $y = 0;
888	for (0 .. $#$children) {	936	for (0 .. $#$children) {
889	my $child = $children->[$_];	937	my $child = $children->[$_];
890	my $h = $h[$_];	938	my $h = $h[$_];
891	$child->size_allocate (0, $y, $w, $h);	939	$child->size_allocate (0, $y, $w, $h);
…		…
904		952
905	sub new {	953	sub new {
906	my ($class, %arg) = @_;	954	my ($class, %arg) = @_;
907		955
908	my $self = $class->SUPER::new (	956	my $self = $class->SUPER::new (
909	fg => [1, 1, 1],	957	fg => [1, 1, 1],
910	height => $::FONTSIZE,	958	fontsize => $::FONTSIZE,
911	text => "",	959	text => "",
912	align => -1,	960	align => -1,
		961	valign => -1,
913	padding => 2,	962	padding => 2,
914	layout => new CFClient::Layout,	963	layout => new CFClient::Layout,
915	%arg	964	%arg
916	);	965	);
917		966
918	$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};
919		971
920	$self	972	$self
921	}	973	}
922		974
923	sub escape_text {	975	sub escape_text {
…		…
931	}	983	}
932		984
933	sub set_text {	985	sub set_text {
934	my ($self, $text) = @_;	986	my ($self, $text) = @_;
935		987
936	$self->{text} = $text;
937	$self->{layout}->set_markup ($text);	988	$self->{layout}->set_text ($text);
938		989
939	delete $self->{texture};	990	delete $self->{texture};
940	# $self->{w} = $self->{h} = -1;
941	$self->update;	991	$self->update;
942	}	992	}
943		993
944	sub get_text {	994	sub set_markup {
945	my ($self, $text) = @_;	995	my ($self, $markup) = @_;
946		996
947	$self->{text}	997	$self->{layout}->set_markup ($markup);
		998
		999	delete $self->{texture};
		1000	$self->update;
948	}	1001	}
949		1002
950	sub size_request {	1003	sub size_request {
951	my ($self) = @_;	1004	my ($self) = @_;
952		1005
953	$self->{layout}->set_width;	1006	$self->{layout}->set_width;
954	$self->{layout}->set_height ($self->{height});	1007	$self->{layout}->set_height ($self->{fontsize});
		1008
955	my ($w, $h) = $self->{layout}->size;	1009	my ($w, $h) = $self->{layout}->size;
956		1010
957	(	1011	(
958	$w + $self->{padding} * 2,	1012	$w + $self->{padding} * 2,
959	$h + $self->{padding} * 2,	1013	$h + $self->{padding} * 2,
…		…
978	sub _draw {	1032	sub _draw {
979	my ($self) = @_;	1033	my ($self) = @_;
980		1034
981	my $tex = $self->{texture} \|\|= do {	1035	my $tex = $self->{texture} \|\|= do {
982	$self->{layout}->set_width ($self->{w});	1036	$self->{layout}->set_width ($self->{w});
983	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1037	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
984	new_from_layout CFClient::Texture $self->{layout}	1038	new_from_layout CFClient::Texture $self->{layout}
985	};	1039	};
986		1040
987	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
988	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989	glEnable GL_TEXTURE_2D;	1043	glEnable GL_TEXTURE_2D;
990	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1044	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991		1045
992	glColor @{$self->{fg}};	1046	glColor @{$self->{fg}};
993		1047
994	my $x =	1048	my $x =
995	$self->{align} < 0 ? $self->{padding}	1049	$self->{align} < 0 ? $self->{padding}
996	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1050	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997	: ($self->{w} - $tex->{w}) * 0.5;	1051	: ($self->{w} - $tex->{w}) * 0.5;
998		1052
999	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;	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
1000	$tex->draw_quad (0, 0);	1058	$tex->draw_quad (int $x, int $y);
1001		1059
1002	glDisable GL_TEXTURE_2D;	1060	glDisable GL_TEXTURE_2D;
1003	glDisable GL_BLEND;	1061	glDisable GL_BLEND;
1004	}	1062	}
1005		1063
1006	#############################################################################	1064	#############################################################################
1007		1065
1008	package CFClient::UI::Entry;	1066	package CFClient::UI::EntryBase;
1009		1067
1010	our @ISA = CFClient::UI::Label::;	1068	our @ISA = CFClient::UI::Label::;
1011		1069
1012	use SDL;	1070	use SDL;
1013	use SDL::OpenGL;	1071	use SDL::OpenGL;
…		…
1020	bg => [0, 0, 0, 0.2],	1078	bg => [0, 0, 0, 0.2],
1021	active_bg => [1, 1, 1, 0.5],	1079	active_bg => [1, 1, 1, 0.5],
1022	active_fg => [0, 0, 0],	1080	active_fg => [0, 0, 0],
1023	can_hover => 1,	1081	can_hover => 1,
1024	can_focus => 1,	1082	can_focus => 1,
		1083	valign => 0,
1025	@_	1084	@_
1026	)	1085	)
1027	}	1086	}
1028		1087
1029	sub _set_text {	1088	sub _set_text {
1030	my ($self, $text) = @_;	1089	my ($self, $text) = @_;
1031		1090
1032	my $old_text = $self->{text};	1091	delete $self->{cur_h};
		1092
		1093	return if $self->{text} eq $text;
1033		1094
1034	$self->{last_activity} = $::NOW;	1095	$self->{last_activity} = $::NOW;
1035
1036	$self->{text} = $text;	1096	$self->{text} = $text;
1037	$self->{layout}->set_width ($self->{w});
1038	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1039		1097
1040	$text =~ s/./*/g if $self->{hidden};	1098	$text =~ s/./*/g if $self->{hidden};
		1099	$self->{layout}->set_text ("$text ");
1041		1100
1042	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1101	$self->emit (changed => $self->{text});
		1102	}
1043		1103
1044	$text = substr $text, 0, $self->{cursor};	1104	sub get_text {
1045	utf8::encode $text;	1105	$_[0]{text}
1046
1047	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050	if $old_text ne $self->{text};
1051	}	1106	}
1052		1107
1053	sub size_request {	1108	sub size_request {
1054	my ($self) = @_;	1109	my ($self) = @_;
1055		1110
…		…
1159		1214
1160	$self->SUPER::_draw;	1215	$self->SUPER::_draw;
1161		1216
1162	#TODO: force update every cursor change :(	1217	#TODO: force update every cursor change :(
1163	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
1164	glColor @{$self->{fg}};	1227	glColor @{$self->{fg}};
1165	glBegin GL_LINES;	1228	glBegin GL_LINES;
1166	glVertex $self->{cur_x}, $self->{cur_y};	1229	glVertex $self->{cur_x}, $self->{cur_y};
1167	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1230	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1168	glEnd;	1231	glEnd;
1169	}	1232	}
1170	}	1233	}
1171		1234
1172	package CFClient::UI::LineEntry;	1235	package CFClient::UI::Entry;
1173		1236
1174	our @ISA = CFClient::UI::Entry::;	1237	our @ISA = CFClient::UI::EntryBase::;
1175		1238
1176	use SDL;	1239	use SDL;
1177	use SDL::OpenGL;	1240	use SDL::OpenGL;
1178		1241
1179	sub key_down {	1242	sub key_down {
…		…
1228		1291
1229	sub _draw {	1292	sub _draw {
1230	my ($self) = @_;	1293	my ($self) = @_;
1231		1294
1232	local $self->{fg} = $self->{fg};	1295	local $self->{fg} = $self->{fg};
1233	my $tex = $tex[0];
1234
1235	glEnable GL_BLEND;
1236	glEnable GL_TEXTURE_2D;
1237	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238		1296
1239	if ($GRAB == $self) {	1297	if ($GRAB == $self) {
1240	$self->{fg} = $self->{active_fg};	1298	$self->{fg} = $self->{active_fg};
1241	}	1299	}
1242		1300
1243	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;
1244	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;
1245		1306
1246	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1307	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247		1308
1248	glDisable GL_TEXTURE_2D;	1309	glDisable GL_TEXTURE_2D;
1249	glDisable GL_BLEND;	1310	glDisable GL_BLEND;
1250		1311
1251	$self->SUPER::_draw;	1312	$self->SUPER::_draw;
…		…
1424	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1485	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1486	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426		1487
1427	my ($value, $lo, $hi, $page) = @{$self->{range}};	1488	my ($value, $lo, $hi, $page) = @{$self->{range}};
1428		1489
		1490	$hi = $value + 1 if $lo == $hi;
		1491
1429	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1492	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430	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
1431		1494
1432	$page = int $page * $inner_w / ($hi - $lo);	1495	$page = int $page * $inner_w / ($hi - $lo);
1433	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1496	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1465		1528
1466	sub new {	1529	sub new {
1467	my $class = shift;	1530	my $class = shift;
1468		1531
1469	my $self = $class->SUPER::new (	1532	my $self = $class->SUPER::new (
		1533	req_w => $::WIDTH / 6,
		1534	req_h => $::HEIGHT / 6,
		1535	fontsize => $::FONTSIZE,
		1536	@_,
		1537
		1538	layout => (new CFClient::Layout),
1470	par => [],	1539	par => [],
1471	@_,	1540	height => 0,
1472	children => [	1541	children => [
1473	(new CFClient::UI::Empty expand => 1),	1542	(new CFClient::UI::Empty expand => 1),
1474	(new CFClient::UI::Slider vertical => 1),	1543	(new CFClient::UI::Slider vertical => 1),
1475	],	1544	],
1476	);	1545	);
1477		1546
		1547	$self->{children}[1]->connect (changed => sub {
		1548	$self->update;
		1549	});
		1550
1478	$self	1551	$self
		1552	}
		1553
		1554	sub set_fontsize {
		1555	my ($self, $fontsize) = @_;
		1556
		1557	$self->{fontsize} = $fontsize;
		1558	$self->reflow;
		1559	}
		1560
		1561	sub text_height {
		1562	my ($self, $text) = @_;
		1563
		1564	my $layout = $self->{layout};
		1565
		1566	$layout->set_height ($self->{fontsize});
		1567	$layout->set_width ($self->{w});
		1568	$layout->set_text ($text);
		1569
		1570	($layout->size)[1]
		1571	}
		1572
		1573	sub reflow {
		1574	my ($self) = @_;
		1575
		1576	$self->{need_reflow}++;
		1577	$self->update;
		1578	}
		1579
		1580	sub size_request {
		1581	my ($self) = @_;
		1582
		1583	($self->{req_w}, $self->{req_h})
		1584	}
		1585
		1586	sub size_allocate {
		1587	my ($self, $x, $y, $w, $h) = @_;
		1588
		1589	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1590
		1591	$self->{layout}->set_height ($self->{fontsize});
		1592	$self->{layout}->set_width ($self->{w});
		1593
		1594	$self->reflow;
1479	}	1595	}
1480		1596
1481	sub add_paragraph {	1597	sub add_paragraph {
1482	my ($self, $color, $text) = @_;	1598	my ($self, $color, $text) = @_;
1483		1599
		1600	#TODO: intelligently "reformat" paragraph
		1601
		1602	my $height = $self->text_height ($text);
		1603
		1604	$self->{height} += $height;
		1605
1484	push @{$self->{par}}, [$color, $text];	1606	push @{$self->{par}}, [$height, $color, $text];
1485	my $count = scalar @{$self->{par}};	1607
1486	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];	1608	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1487	$self->{children}[1]->update;	1609	$self->{children}[1]->update;
1488	}	1610	}
1489		1611
		1612	sub update {
		1613	my ($self) = @_;
		1614
		1615	$self->SUPER::update;
		1616
		1617	return unless $self->{h} > 0;
		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
		1635	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1636	glClearColor 0, 0, 0, 1;
		1637	glClear GL_COLOR_BUFFER_BIT;
		1638
		1639	glEnable GL_BLEND;
		1640	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1641	glEnable GL_TEXTURE_2D;
		1642	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1643
		1644	my $top = int $self->{children}[1]{range}[0];
		1645
		1646	my $y0 = $top;
		1647	my $y1 = $top + $self->{h};
		1648
		1649	my $y = 0;
		1650
		1651	my $layout = $self->{layout};
		1652
		1653	for my $par (@{$self->{par}}) {
		1654	my $h = $par->[0];
		1655
		1656	if ($y0 < $y + $h && $y < $y1) {
		1657	$layout->set_text ($par->[2]);
		1658
		1659	glColor @{ $par->[1] };
		1660	my ($W, $H) = $layout->size;
		1661	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1662	}
		1663
		1664	$y += $h;
		1665	}
		1666
		1667	glDisable GL_TEXTURE_2D;
		1668	glDisable GL_BLEND;
		1669	};
		1670	});
		1671	}
		1672
1490	sub _draw {	1673	sub _draw {
1491	my ($self) = @_;	1674	my ($self) = @_;
1492		1675
1493	my $par = $self->{par};	1676	if ($self->{texture}) {
1494
1495	my $bottom = (scalar @$par) - 1;
1496
1497	my $w = $self->{children}[0]{w};
1498	my $y = $self->{h};
1499
1500	glEnable GL_BLEND;
1501	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1502	glEnable GL_TEXTURE_2D;	1677	glEnable GL_TEXTURE_2D;
1503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1678	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1504		1679	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1505	# TODO: everything!
1506	while ($y > 0 && $bottom >= 0) {
1507	my $par = $par->[$bottom--];
1508
1509	my $layout = new CFClient::Layout;
1510
1511	$layout->set_height ($::FONTSIZE);
1512	$layout->set_width ($w);
1513	$layout->set_text ($par->[1]);
1514	my $tex = new_from_layout CFClient::Texture $layout;
1515	$y -= $tex->{h};
1516
1517	glColor @{ $par->[0] };
1518	$tex->draw_quad (0, $y);
1519	}
1520
1521	glDisable GL_TEXTURE_2D;	1680	glDisable GL_TEXTURE_2D;
1522	glDisable GL_BLEND;	1681	}
		1682
		1683	$self->{children}[1]->draw;
		1684
1523	}	1685	}
1524		1686
1525	#############################################################################	1687	#############################################################################
1526		1688
1527	package CFClient::UI::MapWidget;	1689	package CFClient::UI::MapWidget;
…		…
1551	}	1713	}
1552		1714
1553	sub key_up {	1715	sub key_up {
1554	}	1716	}
1555		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
1556	sub size_request {	1752	sub size_request {
1557	(	1753	(
1558	1 + 32 * int $::WIDTH / 32,	1754	1 + 32 * int $::WIDTH / 32,
1559	1 + 32 * int $::HEIGHT / 32,	1755	1 + 32 * int $::HEIGHT / 32,
1560	)	1756	)
…		…
1568	}	1764	}
1569		1765
1570	sub draw {	1766	sub draw {
1571	my ($self) = @_;	1767	my ($self) = @_;
1572		1768
1573	$self->{need_update}++;#d#
1574	if (delete $self->{need_update}) {	1769	if (delete $self->{need_update}) {
1575	glNewList $self->{list}, GL_COMPILE;	1770	glNewList $self->{list}, GL_COMPILE;
1576		1771
1577	my $sw = int $::WIDTH / 32;
1578	my $sh = int $::HEIGHT / 32;
1579
1580	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
1581	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);
1582		1782
1583	if ($::CFG->{fow_enable}) {	1783	if ($::CFG->{fow_enable}) {
1584	if ($::CFG->{fow_smooth}) { # smooth fog of war	1784	if ($::CFG->{fow_smooth}) { # smooth fog of war
1585	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1785	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1586	glConvolutionFilter2D	1786	glConvolutionFilter2D
…		…
1594	0.1, 0.1, 0.1,	1794	0.1, 0.1, 0.1,
1595	;	1795	;
1596	glEnable GL_CONVOLUTION_2D;	1796	glEnable GL_CONVOLUTION_2D;
1597	}	1797	}
1598		1798
1599	my $tex = new CFClient::Texture	1799	$self->{fow_texture} = new CFClient::Texture
1600	w => $w,	1800	w => $w,
1601	h => $h,	1801	h => $h,
1602	data => $data,	1802	data => $data,
1603	internalformat => GL_ALPHA,	1803	internalformat => GL_ALPHA,
1604	format => GL_ALPHA;	1804	format => GL_ALPHA;
1605		1805
1606	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1806	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1607		1807
1608	glEnable GL_BLEND;	1808	glEnable GL_BLEND;
		1809	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1609	glEnable GL_TEXTURE_2D;	1810	glEnable GL_TEXTURE_2D;
1610	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1611		1812
1612	glColor +($::CFG->{fow_intensity}) x 3, 1;	1813	glColor +($::CFG->{fow_intensity}) x 3, 1;
1613	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1814	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1614		1815
1615	glDisable GL_TEXTURE_2D;	1816	glDisable GL_TEXTURE_2D;
1616	glDisable GL_BLEND;	1817	glDisable GL_BLEND;
1617	}	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
1618	}	1843	}
1619		1844
1620	glEndList;	1845	glEndList;
1621	}	1846	}
1622		1847
		1848	glPushMatrix;
1623	glCallList $self->{list};	1849	glCallList $self->{list};
		1850	glPopMatrix;
1624		1851
1625	if ($FOCUS != $self) {	1852	if ($FOCUS != $self) {
1626	glColor 64/255, 64/255, 64/255;	1853	glColor 64/255, 64/255, 64/255;
1627	glLogicOp GL_AND;	1854	glLogicOp GL_AND;
1628	glEnable GL_COLOR_LOGIC_OP;	1855	glEnable GL_COLOR_LOGIC_OP;
…		…
1662	$::CONN->user_send ("command stay fire");	1889	$::CONN->user_send ("command stay fire");
1663	} elsif ($sym == SDLK_a) {	1890	} elsif ($sym == SDLK_a) {
1664	$::CONN->user_send ("command apply");	1891	$::CONN->user_send ("command apply");
1665	} elsif ($sym == SDLK_QUOTE) {	1892	} elsif ($sym == SDLK_QUOTE) {
1666	$self->emit ('activate_console');	1893	$self->emit ('activate_console');
		1894	} elsif ($sym == SDLK_SLASH) {
		1895	$self->emit ('activate_console' => '/');
1667	} elsif (exists $DIR{$sym}) {	1896	} elsif (exists $DIR{$sym}) {
1668	if ($mod & KMOD_SHIFT) {	1897	if ($mod & KMOD_SHIFT) {
1669	$self->{shft}++;	1898	$self->{shft}++;
1670	$::CONN->user_send ("command fire $DIR{$sym}[0]");	1899	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1671	} elsif ($mod & KMOD_CTRL) {	1900	} elsif ($mod & KMOD_CTRL) {
…		…
1759	sub toggle_flopper {	1988	sub toggle_flopper {
1760	my ($self) = @_;	1989	my ($self) = @_;
1761		1990
1762	# TODO: use animation	1991	# TODO: use animation
1763	if ($self->{state} = !$self->{state}) {	1992	if ($self->{state} = !$self->{state}) {
1764	$CFClient::UI::TOPLEVEL->add ($self->{other});	1993	$CFClient::UI::ROOT->add ($self->{other});
1765	$self->{other}->move (	1994	$self->{other}->move ($self->coord2global (0, $self->{h}));
1766	($::WIDTH - $self->{other}{w}) * 0.5,	1995	$self->emit ("open");
1767	($::HEIGHT - $self->{other}{h}) * 0.5,
1768	);
1769	} else {	1996	} else {
1770	$CFClient::UI::TOPLEVEL->remove ($self->{other});	1997	$CFClient::UI::ROOT->remove ($self->{other});
		1998	$self->emit ("close");
1771	}	1999	}
1772	}
1773		2000
1774	#############################################################################	2001	$self->emit (changed => $self->{state});
		2002	}
1775		2003
		2004	#############################################################################
		2005
1776	package CFClient::UI::Toplevel;	2006	package CFClient::UI::Root;
1777		2007
1778	our @ISA = CFClient::UI::Container::;	2008	our @ISA = CFClient::UI::Container::;
		2009
		2010	use SDL::OpenGL;
1779		2011
1780	sub size_request {	2012	sub size_request {
1781	($::WIDTH, $::HEIGHT)	2013	($::WIDTH, $::HEIGHT)
1782	}	2014	}
1783		2015
…		…
1788		2020
1789	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2021	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1790	for @{$self->{children}};	2022	for @{$self->{children}};
1791	}	2023	}
1792		2024
1793	sub translate {	2025	sub _topleft {
1794	my ($self, $x, $y) = @_;	2026	my ($self, $x, $y) = @_;
1795		2027
1796	($x, $y)	2028	($x, $y)
1797	}	2029	}
1798		2030
…		…
1806	sub add {	2038	sub add {
1807	my ($self, $widget) = @_;	2039	my ($self, $widget) = @_;
1808		2040
1809	$self->SUPER::add ($widget);	2041	$self->SUPER::add ($widget);
1810		2042
1811	$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;
1812	}	2050	}
1813		2051
1814	sub draw {	2052	sub draw {
1815	my ($self) = @_;	2053	my ($self) = @_;
1816		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
1817	$self->_draw;	2069	$self->_draw;
1818	}	2070	}
1819		2071
1820	#############################################################################	2072	#############################################################################
1821		2073
1822	package CFClient::UI;	2074	package CFClient::UI;
1823		2075
1824	$TOPLEVEL = new CFClient::UI::Toplevel;	2076	$ROOT = new CFClient::UI::Root;
1825		2077
1826	1	2078	1
1827		2079

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.103 by elmex, Fri Apr 14 13:51:36 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.103 by elmex, Fri Apr 14 13:51:36 2006 UTC vs.
Revision 1.121 by root, Mon Apr 17 19:21:00 2006 UTC