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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC vs.
Revision 1.123 by root, Mon Apr 17 19:50:22 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 { }
…		…
190	glPopMatrix;	225	glPopMatrix;
191		226
192	if ($self == $HOVER && $self->{can_hover}) {	227	if ($self == $HOVER && $self->{can_hover}) {
193	my ($x, $y) = @$self{qw(x y)};	228	my ($x, $y) = @$self{qw(x y)};
194		229
195	glColor 0, 0, 1, 0.2;	230	glColor 1, 0.8, 0.5, 0.2;
196	glEnable GL_BLEND;	231	glEnable GL_BLEND;
197	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	232	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198	glBegin GL_QUADS;	233	glBegin GL_QUADS;
199	glVertex $x , $y;	234	glVertex $x , $y;
200	glVertex $x + $self->{w}, $y;	235	glVertex $x + $self->{w}, $y;
…		…
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) = @_;
…		…
732	my $col_expand = (sum @col_expand) \|\| 1;	772	my $col_expand = (sum @col_expand) \|\| 1;
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;
		777
		778	CFClient::UI::harmonize $ws;
		779	CFClient::UI::harmonize $hs;
737		780
738	my $y;	781	my $y;
739		782
740	for my $r (0 .. $#{$self->{children}}) {	783	for my $r (0 .. $#{$self->{children}}) {
741	my $row = $self->{children}[$r]	784	my $row = $self->{children}[$r]
…		…
829	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	872	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830	$h[$_] = $alloc_h;	873	$h[$_] = $alloc_h;
831	}	874	}
832	}	875	}
833		876
		877	CFClient::UI::harmonize \@h;
		878
834	my $y = 0;	879	my $y = 0;
835	for (0 .. $#$children) {	880	for (0 .. $#$children) {
836	my $child = $children->[$_];	881	my $child = $children->[$_];
837	my $h = int $h[$_];	882	my $h = $h[$_];
838	$child->size_allocate ($y, 0, $h, $w);	883	$child->size_allocate ($y, 0, $h, $w);
839		884
840	$y += $h;	885	$y += $h;
841	}	886	}
842	}	887	}
…		…
883		928
884	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	929	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
885	}	930	}
886	}	931	}
887		932
		933	CFClient::UI::harmonize \@h;
		934
888	my $y = 0;	935	my $y = 0;
889	for (0 .. $#$children) {	936	for (0 .. $#$children) {
890	my $child = $children->[$_];	937	my $child = $children->[$_];
891	my $h = int $h[$_];	938	my $h = $h[$_];
892	$child->size_allocate (0, $y, $w, $h);	939	$child->size_allocate (0, $y, $w, $h);
893		940
894	$y += $h;	941	$y += $h;
895	}	942	}
896	}	943	}
…		…
909	my $self = $class->SUPER::new (	956	my $self = $class->SUPER::new (
910	fg => [1, 1, 1],	957	fg => [1, 1, 1],
911	fontsize => $::FONTSIZE,	958	fontsize => $::FONTSIZE,
912	text => "",	959	text => "",
913	align => -1,	960	align => -1,
		961	valign => -1,
914	padding => 2,	962	padding => 2,
915	layout => new CFClient::Layout,	963	layout => new CFClient::Layout,
916	%arg	964	%arg
917	);	965	);
918		966
919	$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};
920		971
921	$self	972	$self
922	}	973	}
923		974
924	sub escape_text {	975	sub escape_text {
…		…
932	}	983	}
933		984
934	sub set_text {	985	sub set_text {
935	my ($self, $text) = @_;	986	my ($self, $text) = @_;
936		987
937	$self->{text} = $text;
938	$self->{layout}->set_markup ($text);	988	$self->{layout}->set_text ($text);
939		989
940	delete $self->{texture};	990	delete $self->{texture};
941	# $self->{w} = $self->{h} = -1;
942	$self->update;	991	$self->update;
943	}	992	}
944		993
945	sub get_text {	994	sub set_markup {
946	my ($self, $text) = @_;	995	my ($self, $markup) = @_;
947		996
948	$self->{text}	997	$self->{layout}->set_markup ($markup);
		998
		999	delete $self->{texture};
		1000	$self->update;
949	}	1001	}
950		1002
951	sub size_request {	1003	sub size_request {
952	my ($self) = @_;	1004	my ($self) = @_;
953		1005
954	$self->{layout}->set_width;	1006	$self->{layout}->set_width;
955	$self->{layout}->set_height ($self->{fontsize});	1007	$self->{layout}->set_height ($self->{fontsize});
		1008
956	my ($w, $h) = $self->{layout}->size;	1009	my ($w, $h) = $self->{layout}->size;
957		1010
958	(	1011	(
959	$w + $self->{padding} * 2,	1012	$w + $self->{padding} * 2,
960	$h + $self->{padding} * 2,	1013	$h + $self->{padding} * 2,
…		…
979	sub _draw {	1032	sub _draw {
980	my ($self) = @_;	1033	my ($self) = @_;
981		1034
982	my $tex = $self->{texture} \|\|= do {	1035	my $tex = $self->{texture} \|\|= do {
983	$self->{layout}->set_width ($self->{w});	1036	$self->{layout}->set_width ($self->{w});
984	$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});
985	new_from_layout CFClient::Texture $self->{layout}	1038	new_from_layout CFClient::Texture $self->{layout}
986	};	1039	};
987		1040
988	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
989	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
990	glEnable GL_TEXTURE_2D;	1043	glEnable GL_TEXTURE_2D;
991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1044	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
992		1045
993	glColor @{$self->{fg}};	1046	glColor @{$self->{fg}};
994		1047
995	my $x =	1048	$self->{ox} = int (
996	$self->{align} < 0 ? $self->{padding}	1049	$self->{align} < 0 ? $self->{padding}
997	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1050	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
998	: ($self->{w} - $tex->{w}) * 0.5;	1051	: ($self->{w} - $tex->{w}) * 0.5
		1052	);
999		1053
1000	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);	1054	$self->{oy} = int (
		1055	$self->{valign} < 0 ? $self->{padding}
		1056	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1057	: ($self->{h} - $tex->{h}) * 0.5
		1058	);
		1059
		1060	$tex->draw_quad ($self->{ox}, $self->{oy});
1001		1061
1002	glDisable GL_TEXTURE_2D;	1062	glDisable GL_TEXTURE_2D;
1003	glDisable GL_BLEND;	1063	glDisable GL_BLEND;
1004	}	1064	}
1005		1065
1006	#############################################################################	1066	#############################################################################
1007		1067
1008	package CFClient::UI::Entry;	1068	package CFClient::UI::EntryBase;
1009		1069
1010	our @ISA = CFClient::UI::Label::;	1070	our @ISA = CFClient::UI::Label::;
1011		1071
1012	use SDL;	1072	use SDL;
1013	use SDL::OpenGL;	1073	use SDL::OpenGL;
…		…
1020	bg => [0, 0, 0, 0.2],	1080	bg => [0, 0, 0, 0.2],
1021	active_bg => [1, 1, 1, 0.5],	1081	active_bg => [1, 1, 1, 0.5],
1022	active_fg => [0, 0, 0],	1082	active_fg => [0, 0, 0],
1023	can_hover => 1,	1083	can_hover => 1,
1024	can_focus => 1,	1084	can_focus => 1,
		1085	valign => 0,
1025	@_	1086	@_
1026	)	1087	)
1027	}	1088	}
1028		1089
1029	sub _set_text {	1090	sub _set_text {
1030	my ($self, $text) = @_;	1091	my ($self, $text) = @_;
1031		1092
1032	my $old_text = $self->{text};	1093	delete $self->{cur_h};
		1094
		1095	return if $self->{text} eq $text;
1033		1096
1034	$self->{last_activity} = $::NOW;	1097	$self->{last_activity} = $::NOW;
1035
1036	$self->{text} = $text;	1098	$self->{text} = $text;
1037	$self->{layout}->set_width ($self->{w});
1038	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039		1099
1040	$text =~ s/./*/g if $self->{hidden};	1100	$text =~ s/./*/g if $self->{hidden};
		1101	$self->{layout}->set_text ("$text ");
1041		1102
1042	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1103	$self->emit (changed => $self->{text});
		1104	}
1043		1105
1044	$text = substr $text, 0, $self->{cursor};	1106	sub get_text {
1045	utf8::encode $text;	1107	$_[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	}	1108	}
1052		1109
1053	sub size_request {	1110	sub size_request {
1054	my ($self) = @_;	1111	my ($self) = @_;
1055		1112
…		…
1159		1216
1160	$self->SUPER::_draw;	1217	$self->SUPER::_draw;
1161		1218
1162	#TODO: force update every cursor change :(	1219	#TODO: force update every cursor change :(
1163	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1220	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1221
		1222	unless (exists $self->{cur_h}) {
		1223	my $text = substr $self->{text}, 0, $self->{cursor};
		1224	utf8::encode $text;
		1225
		1226	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1227	}
		1228
1164	glColor @{$self->{fg}};	1229	glColor @{$self->{fg}};
1165	glBegin GL_LINES;	1230	glBegin GL_LINES;
1166	glVertex $self->{cur_x}, $self->{cur_y};
1167	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1231	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1232	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1168	glEnd;	1233	glEnd;
1169	}	1234	}
1170	}	1235	}
1171		1236
1172	package CFClient::UI::LineEntry;	1237	package CFClient::UI::Entry;
1173		1238
1174	our @ISA = CFClient::UI::Entry::;	1239	our @ISA = CFClient::UI::EntryBase::;
1175		1240
1176	use SDL;	1241	use SDL;
1177	use SDL::OpenGL;	1242	use SDL::OpenGL;
1178		1243
1179	sub key_down {	1244	sub key_down {
…		…
1209		1274
1210	$class->SUPER::new (	1275	$class->SUPER::new (
1211	padding => 4,	1276	padding => 4,
1212	fg => [1, 1, 1],	1277	fg => [1, 1, 1],
1213	bg => [1, 1, 1, 0.2],	1278	bg => [1, 1, 1, 0.2],
1214	active_fg => [1, 1, 0],	1279	active_fg => [0, 0, 1],
1215	can_hover => 1,	1280	can_hover => 1,
1216	@_	1281	@_
1217	)	1282	)
1218	}	1283	}
1219		1284
…		…
1228		1293
1229	sub _draw {	1294	sub _draw {
1230	my ($self) = @_;	1295	my ($self) = @_;
1231		1296
1232	local $self->{fg} = $self->{fg};	1297	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		1298
1239	if ($GRAB == $self) {	1299	if ($GRAB == $self) {
1240	$self->{fg} = $self->{active_fg};	1300	$self->{fg} = $self->{active_fg};
1241	}	1301	}
1242		1302
1243	glBindTexture GL_TEXTURE_2D, $tex->{name};	1303	glEnable GL_BLEND;
		1304	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1305	glEnable GL_TEXTURE_2D;
1244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1306	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1307	glColor 0, 0, 0, 1;
1245		1308
1246	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1309	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247		1310
1248	glDisable GL_TEXTURE_2D;	1311	glDisable GL_TEXTURE_2D;
1249	glDisable GL_BLEND;	1312	glDisable GL_BLEND;
1250		1313
1251	$self->SUPER::_draw;	1314	$self->SUPER::_draw;
…		…
1424	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1487	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1488	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426		1489
1427	my ($value, $lo, $hi, $page) = @{$self->{range}};	1490	my ($value, $lo, $hi, $page) = @{$self->{range}};
1428		1491
		1492	$hi = $value + 1 if $lo == $hi;
		1493
1429	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1494	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1495	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431		1496
1432	$page = int $page * $inner_w / ($hi - $lo);	1497	$page = int $page * $inner_w / ($hi - $lo);
1433	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1498	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1479	(new CFClient::UI::Empty expand => 1),	1544	(new CFClient::UI::Empty expand => 1),
1480	(new CFClient::UI::Slider vertical => 1),	1545	(new CFClient::UI::Slider vertical => 1),
1481	],	1546	],
1482	);	1547	);
1483		1548
		1549	$self->{children}[1]->connect (changed => sub {
		1550	$self->update;
		1551	});
		1552
1484	$self	1553	$self
		1554	}
		1555
		1556	sub set_fontsize {
		1557	my ($self, $fontsize) = @_;
		1558
		1559	$self->{fontsize} = $fontsize;
		1560	$self->reflow;
1485	}	1561	}
1486		1562
1487	sub text_height {	1563	sub text_height {
1488	my ($self, $text) = @_;	1564	my ($self, $text) = @_;
1489		1565
…		…
1497	}	1573	}
1498		1574
1499	sub reflow {	1575	sub reflow {
1500	my ($self) = @_;	1576	my ($self) = @_;
1501		1577
1502	my $height = 0;	1578	$self->{need_reflow}++;
1503		1579	$self->update;
1504	for (@{$self->{par}}) {
1505	$height += $_->[0] = $self->text_height ($_->[2]);
1506	}
1507
1508	$self->{height} = $height;
1509
1510	$self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1511	}	1580	}
1512		1581
1513	sub size_request {	1582	sub size_request {
1514	my ($self) = @_;	1583	my ($self) = @_;
1515		1584
…		…
1523		1592
1524	$self->{layout}->set_height ($self->{fontsize});	1593	$self->{layout}->set_height ($self->{fontsize});
1525	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1526		1595
1527	$self->reflow;	1596	$self->reflow;
1528	$self->update;
1529	}	1597	}
1530		1598
1531	sub add_paragraph {	1599	sub add_paragraph {
1532	my ($self, $color, $text) = @_;	1600	my ($self, $color, $text) = @_;
1533		1601
…		…
1548		1616
1549	$self->SUPER::update;	1617	$self->SUPER::update;
1550		1618
1551	return unless $self->{h} > 0;	1619	return unless $self->{h} > 0;
1552		1620
		1621	delete $self->{texture};
		1622
		1623	$ROOT->on_refresh ($self, sub {
		1624	if (delete $self->{need_reflow}) {
		1625	my $height = 0;
		1626
		1627	$height += $_->[0] = $self->text_height ($_->[2])
		1628	for @{$self->{par}};
		1629
		1630	$self->{height} = $height;
		1631
		1632	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1633
		1634	delete $self->{texture};
		1635	}
		1636
1553	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	1637	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554	glClearColor 0, 0, 0, 1;	1638	glClearColor 0, 0, 0, 1;
1555	glClear GL_COLOR_BUFFER_BIT;	1639	glClear GL_COLOR_BUFFER_BIT;
1556		1640
1557	my $y0 = $self->{height} - $self->{h};
1558	my $y1 = $self->{height};
1559
1560	glEnable GL_BLEND;	1641	glEnable GL_BLEND;
1561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1642	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562	glEnable GL_TEXTURE_2D;	1643	glEnable GL_TEXTURE_2D;
1563	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1644	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564		1645
		1646	my $top = int $self->{children}[1]{range}[0];
		1647
		1648	my $y0 = $top;
		1649	my $y1 = $top + $self->{h};
		1650
1565	my $y = 0;	1651	my $y = 0;
1566		1652
1567	my $layout = $self->{layout};	1653	my $layout = $self->{layout};
1568		1654
1569	for my $par (@{$self->{par}}) {	1655	for my $par (@{$self->{par}}) {
1570	my $h = $par->[0];	1656	my $h = $par->[0];
1571		1657
1572	if ($y0 < $y + $h && $y < $y1) {	1658	if ($y0 < $y + $h && $y < $y1) {
1573	$layout->set_text ($par->[2]);	1659	$layout->set_text ($par->[2]);
1574		1660
1575	glColor @{ $par->[1] };	1661	glColor @{ $par->[1] };
1576	my ($W, $H) = $layout->size;	1662	my ($W, $H) = $layout->size;
1577	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	1663	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1664	}
		1665
		1666	$y += $h;
1578	}	1667	}
1579		1668
1580	$y += $h;
1581	}
1582
1583	glDisable GL_TEXTURE_2D;	1669	glDisable GL_TEXTURE_2D;
1584	glDisable GL_BLEND;	1670	glDisable GL_BLEND;
		1671	};
1585	};	1672	});
1586	}	1673	}
1587		1674
1588	sub _draw {	1675	sub _draw {
1589	my ($self) = @_;	1676	my ($self) = @_;
1590		1677
…		…
1592	glEnable GL_TEXTURE_2D;	1679	glEnable GL_TEXTURE_2D;
1593	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	1681	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595	glDisable GL_TEXTURE_2D;	1682	glDisable GL_TEXTURE_2D;
1596	}	1683	}
		1684
		1685	$self->{children}[1]->draw;
1597		1686
1598	}	1687	}
1599		1688
1600	#############################################################################	1689	#############################################################################
1601		1690
…		…
1626	}	1715	}
1627		1716
1628	sub key_up {	1717	sub key_up {
1629	}	1718	}
1630		1719
		1720	sub button_down {
		1721	my ($self, $ev, $x, $y) = @_;
		1722
		1723	$self->focus_in;
		1724
		1725	if ($ev->button == 2) {
		1726	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1727	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1728
		1729	$self->{motion} = sub {
		1730	my ($ev, $x, $y) = @_;
		1731
		1732	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1733
		1734	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1735	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1736
		1737	$self->update;
		1738	};
		1739	}
		1740	}
		1741
		1742	sub button_up {
		1743	my ($self, $ev, $x, $y) = @_;
		1744
		1745	delete $self->{motion};
		1746	}
		1747
		1748	sub mouse_motion {
		1749	my ($self, $ev, $x, $y) = @_;
		1750
		1751	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1752	}
		1753
1631	sub size_request {	1754	sub size_request {
1632	(	1755	(
1633	1 + 32 * int $::WIDTH / 32,	1756	1 + 32 * int $::WIDTH / 32,
1634	1 + 32 * int $::HEIGHT / 32,	1757	1 + 32 * int $::HEIGHT / 32,
1635	)	1758	)
…		…
1643	}	1766	}
1644		1767
1645	sub draw {	1768	sub draw {
1646	my ($self) = @_;	1769	my ($self) = @_;
1647		1770
1648	$self->{need_update}++;#d#
1649	if (delete $self->{need_update}) {	1771	if (delete $self->{need_update}) {
1650	glNewList $self->{list}, GL_COMPILE;	1772	glNewList $self->{list}, GL_COMPILE;
1651		1773
1652	my $sw = int $::WIDTH / 32;
1653	my $sh = int $::HEIGHT / 32;
1654
1655	if ($::MAP) {	1774	if ($::MAP) {
		1775	my $sw = int $::WIDTH / 32;
		1776	my $sh = int $::HEIGHT / 32;
		1777
		1778	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1779	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1780
		1781	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1782
1656	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1783	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1657		1784
1658	if ($::CFG->{fow_enable}) {	1785	if ($::CFG->{fow_enable}) {
1659	if ($::CFG->{fow_smooth}) { # smooth fog of war	1786	if ($::CFG->{fow_smooth}) { # smooth fog of war
1660	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1787	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1661	glConvolutionFilter2D	1788	glConvolutionFilter2D
…		…
1669	0.1, 0.1, 0.1,	1796	0.1, 0.1, 0.1,
1670	;	1797	;
1671	glEnable GL_CONVOLUTION_2D;	1798	glEnable GL_CONVOLUTION_2D;
1672	}	1799	}
1673		1800
1674	my $tex = new CFClient::Texture	1801	$self->{fow_texture} = new CFClient::Texture
1675	w => $w,	1802	w => $w,
1676	h => $h,	1803	h => $h,
1677	data => $data,	1804	data => $data,
1678	internalformat => GL_ALPHA,	1805	internalformat => GL_ALPHA,
1679	format => GL_ALPHA;	1806	format => GL_ALPHA;
1680		1807
1681	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1808	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1682		1809
1683	glEnable GL_BLEND;	1810	glEnable GL_BLEND;
		1811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1684	glEnable GL_TEXTURE_2D;	1812	glEnable GL_TEXTURE_2D;
1685	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686		1814
1687	glColor +($::CFG->{fow_intensity}) x 3, 1;	1815	glColor +($::CFG->{fow_intensity}) x 3, 1;
1688	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1816	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1689		1817
1690	glDisable GL_TEXTURE_2D;	1818	glDisable GL_TEXTURE_2D;
1691	glDisable GL_BLEND;	1819	glDisable GL_BLEND;
1692	}	1820	}
		1821
		1822	# HACK BEGIN
		1823	{
		1824	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1825	my ($w, $h) = (250, 250);
		1826
		1827	glEnable GL_BLEND;
		1828	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1829	glEnable GL_TEXTURE_2D;
		1830	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1831
		1832	$self->{mapmap_texture} =
		1833	new CFClient::Texture
		1834	w => $w,
		1835	h => $h,
		1836	data => $::MAP->mapmap ($w, $h),
		1837	type => GL_UNSIGNED_INT_8_8_8_8_REV;
		1838
		1839	$self->{mapmap_texture}->draw_quad (100, 100);
		1840
		1841	glDisable GL_TEXTURE_2D;
		1842	glDisable GL_BLEND;
		1843	}
		1844	# HACK END
1693	}	1845	}
1694		1846
1695	glEndList;	1847	glEndList;
1696	}	1848	}
1697		1849
		1850	glPushMatrix;
1698	glCallList $self->{list};	1851	glCallList $self->{list};
		1852	glPopMatrix;
1699		1853
1700	if ($FOCUS != $self) {	1854	if ($FOCUS != $self) {
1701	glColor 64/255, 64/255, 64/255;	1855	glColor 64/255, 64/255, 64/255;
1702	glLogicOp GL_AND;	1856	glLogicOp GL_AND;
1703	glEnable GL_COLOR_LOGIC_OP;	1857	glEnable GL_COLOR_LOGIC_OP;
…		…
1732		1886
1733	my $mod = $ev->key_mod;	1887	my $mod = $ev->key_mod;
1734	my $sym = $ev->key_sym;	1888	my $sym = $ev->key_sym;
1735		1889
1736	if ($sym == SDLK_KP5) {	1890	if ($sym == SDLK_KP5) {
1737	$::CONN->user_send ("command stay fire");	1891	$::CONN->user_send ("stay fire");
1738	} elsif ($sym == SDLK_a) {	1892	} elsif ($sym == SDLK_a) {
1739	$::CONN->user_send ("command apply");	1893	$::CONN->user_send ("apply");
1740	} elsif ($sym == SDLK_QUOTE) {	1894	} elsif ($sym == SDLK_QUOTE) {
1741	$self->emit ('activate_console');	1895	$self->emit ('activate_console');
1742	} elsif ($sym == SDLK_SLASH) {	1896	} elsif ($sym == SDLK_SLASH) {
1743	$self->emit ('activate_console' => '/');	1897	$self->emit ('activate_console' => '/');
1744	} elsif (exists $DIR{$sym}) {	1898	} elsif (exists $DIR{$sym}) {
1745	if ($mod & KMOD_SHIFT) {	1899	if ($mod & KMOD_SHIFT) {
1746	$self->{shft}++;	1900	$self->{shft}++;
1747	$::CONN->user_send ("command fire $DIR{$sym}[0]");	1901	$::CONN->user_send ("fire $DIR{$sym}[0]");
1748	} elsif ($mod & KMOD_CTRL) {	1902	} elsif ($mod & KMOD_CTRL) {
1749	$self->{ctrl}++;	1903	$self->{ctrl}++;
1750	$::CONN->user_send ("command run $DIR{$sym}[0]");	1904	$::CONN->user_send ("run $DIR{$sym}[0]");
1751	} else {	1905	} else {
1752	$::CONN->user_send ("command $DIR{$sym}[1]");	1906	$::CONN->user_send ("$DIR{$sym}[1]");
1753	}	1907	}
1754	}	1908	}
1755	}	1909	}
1756		1910
1757	sub key_up {	1911	sub key_up {
…		…
1759		1913
1760	my $mod = $ev->key_mod;	1914	my $mod = $ev->key_mod;
1761	my $sym = $ev->key_sym;	1915	my $sym = $ev->key_sym;
1762		1916
1763	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1917	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1764	$::CONN->user_send ("command fire_stop");	1918	$::CONN->user_send ("fire_stop");
1765	}	1919	}
1766	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1920	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1767	$::CONN->user_send ("command run_stop");	1921	$::CONN->user_send ("run_stop");
1768	}	1922	}
1769	}	1923	}
1770		1924
1771	#############################################################################	1925	#############################################################################
1772		1926
…		…
1836	sub toggle_flopper {	1990	sub toggle_flopper {
1837	my ($self) = @_;	1991	my ($self) = @_;
1838		1992
1839	# TODO: use animation	1993	# TODO: use animation
1840	if ($self->{state} = !$self->{state}) {	1994	if ($self->{state} = !$self->{state}) {
1841	$CFClient::UI::TOPLEVEL->add ($self->{other});	1995	$CFClient::UI::ROOT->add ($self->{other});
1842	$self->{other}->move (	1996	$self->{other}->move ($self->coord2global (0, $self->{h}));
1843	($::WIDTH - $self->{other}{w}) * 0.5,	1997	$self->emit ("open");
1844	($::HEIGHT - $self->{other}{h}) * 0.5,
1845	);
1846	} else {	1998	} else {
1847	$CFClient::UI::TOPLEVEL->remove ($self->{other});	1999	$CFClient::UI::ROOT->remove ($self->{other});
		2000	$self->emit ("close");
1848	}	2001	}
1849	}
1850		2002
1851	#############################################################################	2003	$self->emit (changed => $self->{state});
		2004	}
1852		2005
		2006	#############################################################################
		2007
1853	package CFClient::UI::Toplevel;	2008	package CFClient::UI::Root;
1854		2009
1855	our @ISA = CFClient::UI::Container::;	2010	our @ISA = CFClient::UI::Container::;
		2011
		2012	use SDL::OpenGL;
1856		2013
1857	sub size_request {	2014	sub size_request {
1858	($::WIDTH, $::HEIGHT)	2015	($::WIDTH, $::HEIGHT)
1859	}	2016	}
1860		2017
…		…
1865		2022
1866	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2023	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1867	for @{$self->{children}};	2024	for @{$self->{children}};
1868	}	2025	}
1869		2026
1870	sub translate {	2027	sub _topleft {
1871	my ($self, $x, $y) = @_;	2028	my ($self, $x, $y) = @_;
1872		2029
1873	($x, $y)	2030	($x, $y)
1874	}	2031	}
1875		2032
…		…
1883	sub add {	2040	sub add {
1884	my ($self, $widget) = @_;	2041	my ($self, $widget) = @_;
1885		2042
1886	$self->SUPER::add ($widget);	2043	$self->SUPER::add ($widget);
1887		2044
1888	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2045	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
		2046	}
		2047
		2048	sub on_refresh {
		2049	my ($self, $id, $cb) = @_;
		2050
		2051	$self->{refresh_hook}{$id} = $cb;
1889	}	2052	}
1890		2053
1891	sub draw {	2054	sub draw {
1892	my ($self) = @_;	2055	my ($self) = @_;
1893		2056
		2057	while (my $rcb = delete $self->{refresh_hook}) {
		2058	$_->() for values %$rcb;
		2059	}
		2060
		2061	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2062	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2063	glClear GL_COLOR_BUFFER_BIT;
		2064
		2065	glMatrixMode GL_PROJECTION;
		2066	glLoadIdentity;
		2067	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2068	glMatrixMode GL_MODELVIEW;
		2069	glLoadIdentity;
		2070
1894	$self->_draw;	2071	$self->_draw;
1895	}	2072	}
1896		2073
1897	#############################################################################	2074	#############################################################################
1898		2075
1899	package CFClient::UI;	2076	package CFClient::UI;
1900		2077
1901	$TOPLEVEL = new CFClient::UI::Toplevel;	2078	$ROOT = new CFClient::UI::Root;
1902		2079
1903	1	2080	1
1904		2081

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC vs. Revision 1.123 by root, Mon Apr 17 19:50:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC vs.
Revision 1.123 by root, Mon Apr 17 19:50:22 2006 UTC