[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.125 by root, Mon Apr 17 20:52:15 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	}	263	}
230		264
231	sub get_parent {	265	sub check_size {
232	$_[0]->{parent}	266	my ($self) = @_;
		267
		268	my ($w, $h) = $self->size_request;
		269
		270	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
		271	$self->{req_w} = $w;
		272	$self->{req_h} = $h;
		273
		274	$self->{parent}->check_size
		275	if $self->{parent};
		276	}
233	}	277	}
234		278
235	sub update {	279	sub update {
236	my ($self) = @_;	280	my ($self) = @_;
237		281
…		…
326		370
327	$self	371	$self
328	}	372	}
329		373
330	sub add {	374	sub add {
331	my ($self, $chld) = @_;	375	my ($self, $child) = @_;
332		376
333	$chld->set_parent ($self);	377	$child->set_parent ($self);
		378
		379	use sort 'stable';
334		380
335	$self->{children} = [	381	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	382	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	383	@{$self->{children}}, $child
338	];	384	];
339		385
340	$self->{w} = $self->{h} = -1;	386	$self->{w} = $self->{h} = -1;
341	$self->update;	387	$self->update;
342	}	388	}
…		…
344	sub remove {	390	sub remove {
345	my ($self, $widget) = @_;	391	my ($self, $widget) = @_;
346		392
347	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	393	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348		394
349	$self->size_allocate (0, 0, $self->{w}, $self->{h});	395	$self->check_size;
350	}	396	}
351		397
352	sub find_widget {	398	sub find_widget {
353	my ($self, $x, $y) = @_;	399	my ($self, $x, $y) = @_;
354		400
…		…
474	$tex->draw_quad (0, 0, $w, $h);	520	$tex->draw_quad (0, 0, $w, $h);
475		521
476	glDisable GL_BLEND;	522	glDisable GL_BLEND;
477	glDisable GL_TEXTURE_2D;	523	glDisable GL_TEXTURE_2D;
478	}	524	}
		525
		526	#############################################################################
		527
		528	package CFClient::UI::ViewPort;
		529
		530	our @ISA = CFClient::UI::Window::;
		531
		532	sub new { die }
		533
		534	sub size_request {
		535	my ($self) = @_;
		536
		537	@$self{qw(child_w child_h)} = $self->child->size_request;
		538	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		539
		540	@$self{qw(child_w child_h)}
		541	}
		542
		543	sub size_allocate {
		544	my ($self, $x, $y, $w, $h) = @_;
		545
		546	$self->_size_allocate ($x, $y, $w, $h) or return;
		547	}
		548
		549	sub _draw {
		550	my ($self) = @_;
		551
		552	$self->{children}[1]->draw;
		553	}
		554
479		555
480	#############################################################################	556	#############################################################################
481		557
482	package CFClient::UI::Frame;	558	package CFClient::UI::Frame;
483		559
…		…
539	# TODO: user_x, user_y, overwrite moveto?	615	# TODO: user_x, user_y, overwrite moveto?
540		616
541	$class->SUPER::new (	617	$class->SUPER::new (
542	bg => [1, 1, 1, 1],	618	bg => [1, 1, 1, 1],
543	border_bg => [1, 1, 1, 1],	619	border_bg => [1, 1, 1, 1],
544	border => $::FONTSIZE * 0.8,	620	border => int $::FONTSIZE * 0.8,
545	@_	621	@_
546	)	622	)
547	}	623	}
548		624
549	sub size_request {	625	sub size_request {
…		…
672	@_	748	@_
673	)	749	)
674	}	750	}
675		751
676	sub add {	752	sub add {
677	my ($self, $x, $y, $chld) = @_;	753	my ($self, $x, $y, $child) = @_;
678		754
		755	$child->set_parent ($self);
679	$self->{children}[$y][$x] = $chld;	756	$self->{children}[$y][$x] = $child;
680	$chld->set_parent ($self);
681		757
682	$self->{w} = $self->{h} = -1;	758	$self->{w} = $self->{h} = -1;
		759	$self->update;
		760	}
		761
		762	# TODO: move to container class maybe? send childs a signal on removal?
		763	sub clear {
		764	my ($self) = @_;
		765
		766	delete $self->{children};
683	$self->update;	767	$self->update;
684	}	768	}
685		769
686	sub get_wh {	770	sub get_wh {
687	my ($self) = @_;	771	my ($self) = @_;
…		…
733		817
734	# linearly scale sizes	818	# linearly scale sizes
735	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	819	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	820	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
737		821
738	$_ = int $_ for @$ws; #TODO: avoid rounding problems	822	CFClient::UI::harmonize $ws;
739	$_ = int $_ for @$hs; #TODO: avoid rounding problems	823	CFClient::UI::harmonize $hs;
740		824
741	my $y;	825	my $y;
742		826
743	for my $r (0 .. $#{$self->{children}}) {	827	for my $r (0 .. $#{$self->{children}}) {
744	my $row = $self->{children}[$r]	828	my $row = $self->{children}[$r]
…		…
806	}	890	}
807		891
808	sub size_allocate {	892	sub size_allocate {
809	my ($self, $x, $y, $w, $h) = @_;	893	my ($self, $x, $y, $w, $h) = @_;
810		894
811	$self->_size_allocate ($x, $y, $w, $h);	895	$self->_size_allocate ($x, $y, $w, $h) or return;
812		896
813	($h, $w) = ($w, $h);	897	($h, $w) = ($w, $h);
814		898
815	my $children = $self->{children};	899	my $children = $self->{children};
816		900
…		…
832	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	916	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833	$h[$_] = $alloc_h;	917	$h[$_] = $alloc_h;
834	}	918	}
835	}	919	}
836		920
		921	CFClient::UI::harmonize \@h;
		922
837	my $y = 0;	923	my $y = 0;
838	for (0 .. $#$children) {	924	for (0 .. $#$children) {
839	my $child = $children->[$_];	925	my $child = $children->[$_];
840	my $h = int $h[$_];	926	my $h = $h[$_];
841	$child->size_allocate ($y, 0, $h, $w);	927	$child->size_allocate ($y, 0, $h, $w);
842		928
843	$y += $h;	929	$y += $h;
844	}	930	}
		931
		932	1
845	}	933	}
846		934
847	#############################################################################	935	#############################################################################
848		936
849	package CFClient::UI::VBox;	937	package CFClient::UI::VBox;
…		…
864	}	952	}
865		953
866	sub size_allocate {	954	sub size_allocate {
867	my ($self, $x, $y, $w, $h) = @_;	955	my ($self, $x, $y, $w, $h) = @_;
868		956
869	$self->_size_allocate ($x, $y, $w, $h);	957	$self->_size_allocate ($x, $y, $w, $h) or return;
870		958
871	my $children = $self->{children};	959	my $children = $self->{children};
872		960
873	my @h = map +($_->size_request)[1], @$children;	961	my @h = map +($_->size_request)[1], @$children;
874		962
…		…
886		974
887	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	975	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888	}	976	}
889	}	977	}
890		978
		979	CFClient::UI::harmonize \@h;
		980
891	my $y = 0;	981	my $y = 0;
892	for (0 .. $#$children) {	982	for (0 .. $#$children) {
893	my $child = $children->[$_];	983	my $child = $children->[$_];
894	my $h = int $h[$_];	984	my $h = $h[$_];
895	$child->size_allocate (0, $y, $w, $h);	985	$child->size_allocate (0, $y, $w, $h);
896		986
897	$y += $h;	987	$y += $h;
898	}	988	}
		989
		990	1
899	}	991	}
900		992
901	#############################################################################	993	#############################################################################
902		994
903	package CFClient::UI::Label;	995	package CFClient::UI::Label;
…		…
912	my $self = $class->SUPER::new (	1004	my $self = $class->SUPER::new (
913	fg => [1, 1, 1],	1005	fg => [1, 1, 1],
914	fontsize => $::FONTSIZE,	1006	fontsize => $::FONTSIZE,
915	text => "",	1007	text => "",
916	align => -1,	1008	align => -1,
		1009	valign => -1,
917	padding => 2,	1010	padding => 2,
918	layout => new CFClient::Layout,	1011	layout => new CFClient::Layout,
919	%arg	1012	%arg
920	);	1013	);
921		1014
922	$self->set_text ($self->{text});	1015	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
		1016
		1017	$self->set_text (delete $self->{text}) if exists $self->{text};
		1018	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
923		1019
924	$self	1020	$self
925	}	1021	}
926		1022
927	sub escape_text {	1023	sub escape_text {
…		…
935	}	1031	}
936		1032
937	sub set_text {	1033	sub set_text {
938	my ($self, $text) = @_;	1034	my ($self, $text) = @_;
939		1035
940	$self->{text} = $text;
941	$self->{layout}->set_markup ($text);	1036	$self->{layout}->set_text ($text);
942		1037
943	delete $self->{texture};	1038	delete $self->{texture};
944	# $self->{w} = $self->{h} = -1;
945	$self->update;	1039	$self->update;
946	}	1040	}
947		1041
948	sub get_text {	1042	sub set_markup {
949	my ($self, $text) = @_;	1043	my ($self, $markup) = @_;
950		1044
951	$self->{text}	1045	$self->{layout}->set_markup ($markup);
		1046
		1047	delete $self->{texture};
		1048	$self->update;
952	}	1049	}
953		1050
954	sub size_request {	1051	sub size_request {
955	my ($self) = @_;	1052	my ($self) = @_;
956		1053
957	$self->{layout}->set_width;	1054	$self->{layout}->set_width;
958	$self->{layout}->set_height ($self->{fontsize});	1055	$self->{layout}->set_height ($self->{fontsize});
		1056
959	my ($w, $h) = $self->{layout}->size;	1057	my ($w, $h) = $self->{layout}->size;
960		1058
961	(	1059	(
962	$w + $self->{padding} * 2,	1060	$w + $self->{padding} * 2,
963	$h + $self->{padding} * 2,	1061	$h + $self->{padding} * 2,
…		…
982	sub _draw {	1080	sub _draw {
983	my ($self) = @_;	1081	my ($self) = @_;
984		1082
985	my $tex = $self->{texture} \|\|= do {	1083	my $tex = $self->{texture} \|\|= do {
986	$self->{layout}->set_width ($self->{w});	1084	$self->{layout}->set_width ($self->{w});
987	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});	1085	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
988	new_from_layout CFClient::Texture $self->{layout}	1086	new_from_layout CFClient::Texture $self->{layout}
989	};	1087	};
990		1088
991	glEnable GL_BLEND;	1089	glEnable GL_BLEND;
992	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1090	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993	glEnable GL_TEXTURE_2D;	1091	glEnable GL_TEXTURE_2D;
994	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1092	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
995		1093
996	glColor @{$self->{fg}};	1094	glColor @{$self->{fg}};
997		1095
998	my $x =	1096	$self->{ox} = int (
999	$self->{align} < 0 ? $self->{padding}	1097	$self->{align} < 0 ? $self->{padding}
1000	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1098	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001	: ($self->{w} - $tex->{w}) * 0.5;	1099	: ($self->{w} - $tex->{w}) * 0.5
		1100	);
1002		1101
1003	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);	1102	$self->{oy} = int (
		1103	$self->{valign} < 0 ? $self->{padding}
		1104	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1105	: ($self->{h} - $tex->{h}) * 0.5
		1106	);
		1107
		1108	$tex->draw_quad ($self->{ox}, $self->{oy});
1004		1109
1005	glDisable GL_TEXTURE_2D;	1110	glDisable GL_TEXTURE_2D;
1006	glDisable GL_BLEND;	1111	glDisable GL_BLEND;
1007	}	1112	}
1008		1113
1009	#############################################################################	1114	#############################################################################
1010		1115
1011	package CFClient::UI::Entry;	1116	package CFClient::UI::EntryBase;
1012		1117
1013	our @ISA = CFClient::UI::Label::;	1118	our @ISA = CFClient::UI::Label::;
1014		1119
1015	use SDL;	1120	use SDL;
1016	use SDL::OpenGL;	1121	use SDL::OpenGL;
…		…
1023	bg => [0, 0, 0, 0.2],	1128	bg => [0, 0, 0, 0.2],
1024	active_bg => [1, 1, 1, 0.5],	1129	active_bg => [1, 1, 1, 0.5],
1025	active_fg => [0, 0, 0],	1130	active_fg => [0, 0, 0],
1026	can_hover => 1,	1131	can_hover => 1,
1027	can_focus => 1,	1132	can_focus => 1,
		1133	valign => 0,
1028	@_	1134	@_
1029	)	1135	)
1030	}	1136	}
1031		1137
1032	sub _set_text {	1138	sub _set_text {
1033	my ($self, $text) = @_;	1139	my ($self, $text) = @_;
1034		1140
1035	my $old_text = $self->{text};	1141	delete $self->{cur_h};
		1142
		1143	return if $self->{text} eq $text;
1036		1144
1037	$self->{last_activity} = $::NOW;	1145	$self->{last_activity} = $::NOW;
1038
1039	$self->{text} = $text;	1146	$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		1147
1043	$text =~ s/./*/g if $self->{hidden};	1148	$text =~ s/./*/g if $self->{hidden};
		1149	$self->{layout}->set_text ("$text ");
1044		1150
1045	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1151	$self->emit (changed => $self->{text});
		1152	}
1046		1153
1047	$text = substr $text, 0, $self->{cursor};	1154	sub get_text {
1048	utf8::encode $text;	1155	$_[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	}	1156	}
1055		1157
1056	sub size_request {	1158	sub size_request {
1057	my ($self) = @_;	1159	my ($self) = @_;
1058		1160
…		…
1062	}	1164	}
1063		1165
1064	sub size_allocate {	1166	sub size_allocate {
1065	my ($self, $x, $y, $w, $h) = @_;	1167	my ($self, $x, $y, $w, $h) = @_;
1066		1168
1067	$self->SUPER::size_allocate ($x, $y, $w, $h);	1169	$self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1068		1170
1069	$self->_set_text ($self->{text});	1171	$self->_set_text ($self->{text});
1070	}	1172	}
1071		1173
1072	sub set_text {	1174	sub set_text {
…		…
1162		1264
1163	$self->SUPER::_draw;	1265	$self->SUPER::_draw;
1164		1266
1165	#TODO: force update every cursor change :(	1267	#TODO: force update every cursor change :(
1166	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1268	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1269
		1270	unless (exists $self->{cur_h}) {
		1271	my $text = substr $self->{text}, 0, $self->{cursor};
		1272	utf8::encode $text;
		1273
		1274	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1275	}
		1276
1167	glColor @{$self->{fg}};	1277	glColor @{$self->{fg}};
1168	glBegin GL_LINES;	1278	glBegin GL_LINES;
1169	glVertex $self->{cur_x}, $self->{cur_y};
1170	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1279	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1280	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1171	glEnd;	1281	glEnd;
1172	}	1282	}
1173	}	1283	}
1174		1284
1175	package CFClient::UI::LineEntry;	1285	package CFClient::UI::Entry;
1176		1286
1177	our @ISA = CFClient::UI::Entry::;	1287	our @ISA = CFClient::UI::EntryBase::;
1178		1288
1179	use SDL;	1289	use SDL;
1180	use SDL::OpenGL;	1290	use SDL::OpenGL;
1181		1291
1182	sub key_down {	1292	sub key_down {
…		…
1212		1322
1213	$class->SUPER::new (	1323	$class->SUPER::new (
1214	padding => 4,	1324	padding => 4,
1215	fg => [1, 1, 1],	1325	fg => [1, 1, 1],
1216	bg => [1, 1, 1, 0.2],	1326	bg => [1, 1, 1, 0.2],
1217	active_fg => [1, 1, 0],	1327	active_fg => [0, 0, 1],
1218	can_hover => 1,	1328	can_hover => 1,
1219	@_	1329	@_
1220	)	1330	)
1221	}	1331	}
1222		1332
…		…
1231		1341
1232	sub _draw {	1342	sub _draw {
1233	my ($self) = @_;	1343	my ($self) = @_;
1234		1344
1235	local $self->{fg} = $self->{fg};	1345	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		1346
1242	if ($GRAB == $self) {	1347	if ($GRAB == $self) {
1243	$self->{fg} = $self->{active_fg};	1348	$self->{fg} = $self->{active_fg};
1244	}	1349	}
1245		1350
1246	glBindTexture GL_TEXTURE_2D, $tex->{name};	1351	glEnable GL_BLEND;
		1352	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1353	glEnable GL_TEXTURE_2D;
1247	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1354	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1355	glColor 0, 0, 0, 1;
1248		1356
1249	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1357	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1250		1358
1251	glDisable GL_TEXTURE_2D;	1359	glDisable GL_TEXTURE_2D;
1252	glDisable GL_BLEND;	1360	glDisable GL_BLEND;
1253		1361
1254	$self->SUPER::_draw;	1362	$self->SUPER::_draw;
…		…
1287	}	1395	}
1288		1396
1289	sub size_allocate {	1397	sub size_allocate {
1290	my ($self, $x, $y, $w, $h) = @_;	1398	my ($self, $x, $y, $w, $h) = @_;
1291		1399
1292	$self->_size_allocate ($x, $y, $w, $h);	1400	$self->_size_allocate ($x, $y, $w, $h) or return;
1293	}	1401	}
1294		1402
1295	sub button_down {	1403	sub button_down {
1296	my ($self, $ev, $x, $y) = @_;	1404	my ($self, $ev, $x, $y) = @_;
1297		1405
…		…
1321		1429
1322	$tex->draw_quad (0, 0, $s, $s);	1430	$tex->draw_quad (0, 0, $s, $s);
1323		1431
1324	glDisable GL_TEXTURE_2D;	1432	glDisable GL_TEXTURE_2D;
1325	glDisable GL_BLEND;	1433	glDisable GL_BLEND;
		1434	}
		1435
		1436	#############################################################################
		1437
		1438	package CFClient::UI::VGauge;
		1439
		1440	our @ISA = CFClient::UI::Base::;
		1441
		1442	use SDL::OpenGL;
		1443
		1444	my %tex = (
		1445	food => [
		1446	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1447	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1448	],
		1449	grace => [
		1450	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1451	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1452	],
		1453	hp => [
		1454	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1455	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1456	],
		1457	mana => [
		1458	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1459	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1460	],
		1461	);
		1462
		1463	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1464	sub new {
		1465	my $class = shift;
		1466
		1467	my $self = $class->SUPER::new (gauge => 'food', @_);
		1468
		1469	$self
		1470	}
		1471
		1472	sub size_request {
		1473	my ($self) = @_;
		1474
		1475	($self->{w}, $self->{h})
		1476	}
		1477
		1478	sub set_max {
		1479	my ($self, $max) = @_;
		1480	$self->{max_val} = $max;
		1481	}
		1482
		1483	sub set_value {
		1484	my ($self, $val, $max) = @_;
		1485
		1486	$self->set_max ($max)
		1487	if defined $max;
		1488
		1489	$max = $self->{max_val};
		1490	$self->{val} = $val;
		1491
		1492	$self->update;
		1493	}
		1494
		1495	sub _draw {
		1496	my ($self) = @_;
		1497
		1498	my $tex = $tex{$self->{gauge}};
		1499
		1500	my ($w, $h) = ($self->{w}, $self->{h});
		1501
		1502	my $ycut = $self->{val} / ($self->{max_val} \|\| 1);
		1503	$ycut = 1 if $self->{val} > $self->{max_val};
		1504
		1505	my $t1 = $tex->[0];
		1506	my $t2 = $tex->[1];
		1507
		1508	glEnable GL_BLEND;
		1509	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1510	glEnable GL_TEXTURE_2D;
		1511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1512
		1513	my $h1 = $self->{h} - $ycut * $self->{h};
		1514	my $h2 = $ycut * $self->{h};
		1515
		1516	my $yp = 0;
		1517
		1518	glBindTexture (GL_TEXTURE_2D, $t1->{name});
		1519	glBegin (GL_QUADS);
		1520	glTexCoord (0, 0); glVertex (0 , $yp);
		1521	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
		1522	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
		1523	glTexCoord (1, 0); glVertex (0 + $w, $yp);
		1524	glEnd ();
		1525
		1526	$yp += $h1;
		1527
		1528	glBindTexture (GL_TEXTURE_2D, $t2->{name});
		1529	glBegin (GL_QUADS);
		1530	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
		1531	glTexCoord (0, 1); glVertex (0 , $yp + $h2);
		1532	glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
		1533	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
		1534	glEnd ();
		1535
		1536	glDisable GL_BLEND;
		1537	glDisable GL_TEXTURE_2D;
1326	}	1538	}
1327		1539
1328	#############################################################################	1540	#############################################################################
1329		1541
1330	package CFClient::UI::Slider;	1542	package CFClient::UI::Slider;
…		…
1427	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1639	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1428	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1640	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1429		1641
1430	my ($value, $lo, $hi, $page) = @{$self->{range}};	1642	my ($value, $lo, $hi, $page) = @{$self->{range}};
1431		1643
		1644	$hi = $value + 1 if $lo == $hi;
		1645
1432	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1646	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1433	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1647	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1434		1648
1435	$page = int $page * $inner_w / ($hi - $lo);	1649	$page = int $page * $inner_w / ($hi - $lo);
1436	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1650	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1482	(new CFClient::UI::Empty expand => 1),	1696	(new CFClient::UI::Empty expand => 1),
1483	(new CFClient::UI::Slider vertical => 1),	1697	(new CFClient::UI::Slider vertical => 1),
1484	],	1698	],
1485	);	1699	);
1486		1700
		1701	$self->{children}[1]->connect (changed => sub {
		1702	$self->update;
		1703	});
		1704
1487	$self	1705	$self
		1706	}
		1707
		1708	sub set_fontsize {
		1709	my ($self, $fontsize) = @_;
		1710
		1711	$self->{fontsize} = $fontsize;
		1712	$self->reflow;
1488	}	1713	}
1489		1714
1490	sub text_height {	1715	sub text_height {
1491	my ($self, $text) = @_;	1716	my ($self, $text) = @_;
1492		1717
…		…
1500	}	1725	}
1501		1726
1502	sub reflow {	1727	sub reflow {
1503	my ($self) = @_;	1728	my ($self) = @_;
1504		1729
1505	my $height = 0;	1730	$self->{need_reflow}++;
1506		1731	$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	}	1732	}
1515		1733
1516	sub size_request {	1734	sub size_request {
1517	my ($self) = @_;	1735	my ($self) = @_;
1518		1736
…		…
1520	}	1738	}
1521		1739
1522	sub size_allocate {	1740	sub size_allocate {
1523	my ($self, $x, $y, $w, $h) = @_;	1741	my ($self, $x, $y, $w, $h) = @_;
1524		1742
1525	$self->SUPER::size_allocate ($x, $y, $w, $h);	1743	$self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1526		1744
1527	$self->{layout}->set_height ($self->{fontsize});	1745	$self->{layout}->set_height ($self->{fontsize});
1528	$self->{layout}->set_width ($self->{w});	1746	$self->{layout}->set_width ($self->{w});
1529		1747
1530	$self->reflow;	1748	$self->reflow;
…		…
1551		1769
1552	$self->SUPER::update;	1770	$self->SUPER::update;
1553		1771
1554	return unless $self->{h} > 0;	1772	return unless $self->{h} > 0;
1555		1773
		1774	delete $self->{texture};
		1775
		1776	$ROOT->on_refresh ($self, sub {
		1777	if (delete $self->{need_reflow}) {
		1778	my $height = 0;
		1779
		1780	$height += $_->[0] = $self->text_height ($_->[2])
		1781	for @{$self->{par}};
		1782
		1783	$self->{height} = $height;
		1784
		1785	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1786
		1787	delete $self->{texture};
		1788	}
		1789
1556	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	1790	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1557	glClearColor 0, 0, 0, 1;	1791	glClearColor 0, 0, 0, 1;
1558	glClear GL_COLOR_BUFFER_BIT;	1792	glClear GL_COLOR_BUFFER_BIT;
1559		1793
1560	my $y0 = $self->{height} - $self->{h};
1561	my $y1 = $self->{height};
1562
1563	glEnable GL_BLEND;	1794	glEnable GL_BLEND;
1564	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1795	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1565	glEnable GL_TEXTURE_2D;	1796	glEnable GL_TEXTURE_2D;
1566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1797	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567		1798
		1799	my $top = int $self->{children}[1]{range}[0];
		1800
		1801	my $y0 = $top;
		1802	my $y1 = $top + $self->{h};
		1803
1568	my $y = 0;	1804	my $y = 0;
1569		1805
1570	my $layout = $self->{layout};	1806	my $layout = $self->{layout};
1571		1807
1572	for my $par (@{$self->{par}}) {	1808	for my $par (@{$self->{par}}) {
1573	my $h = $par->[0];	1809	my $h = $par->[0];
1574		1810
1575	if ($y0 < $y + $h && $y < $y1) {	1811	if ($y0 < $y + $h && $y < $y1) {
1576	$layout->set_text ($par->[2]);	1812	$layout->set_text ($par->[2]);
1577		1813
1578	glColor @{ $par->[1] };	1814	glColor @{ $par->[1] };
1579	my ($W, $H) = $layout->size;	1815	my ($W, $H) = $layout->size;
1580	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	1816	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1817	}
		1818
		1819	$y += $h;
1581	}	1820	}
1582		1821
1583	$y += $h;
1584	}
1585
1586	glDisable GL_TEXTURE_2D;	1822	glDisable GL_TEXTURE_2D;
1587	glDisable GL_BLEND;	1823	glDisable GL_BLEND;
		1824	};
1588	};	1825	});
1589	}	1826	}
1590		1827
1591	sub _draw {	1828	sub _draw {
1592	my ($self) = @_;	1829	my ($self) = @_;
1593		1830
…		…
1631	}	1868	}
1632		1869
1633	sub key_up {	1870	sub key_up {
1634	}	1871	}
1635		1872
		1873	sub button_down {
		1874	my ($self, $ev, $x, $y) = @_;
		1875
		1876	$self->focus_in;
		1877
		1878	if ($ev->button == 2) {
		1879	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1880	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1881
		1882	$self->{motion} = sub {
		1883	my ($ev, $x, $y) = @_;
		1884
		1885	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1886
		1887	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1888	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1889
		1890	$self->update;
		1891	};
		1892	}
		1893	}
		1894
		1895	sub button_up {
		1896	my ($self, $ev, $x, $y) = @_;
		1897
		1898	delete $self->{motion};
		1899	}
		1900
		1901	sub mouse_motion {
		1902	my ($self, $ev, $x, $y) = @_;
		1903
		1904	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1905	}
		1906
1636	sub size_request {	1907	sub size_request {
1637	(	1908	(
1638	1 + 32 * int $::WIDTH / 32,	1909	1 + 32 * int $::WIDTH / 32,
1639	1 + 32 * int $::HEIGHT / 32,	1910	1 + 32 * int $::HEIGHT / 32,
1640	)	1911	)
…		…
1648	}	1919	}
1649		1920
1650	sub draw {	1921	sub draw {
1651	my ($self) = @_;	1922	my ($self) = @_;
1652		1923
1653	$self->{need_update}++;#d#
1654	if (delete $self->{need_update}) {	1924	if (delete $self->{need_update}) {
1655	glNewList $self->{list}, GL_COMPILE;	1925	glNewList $self->{list}, GL_COMPILE;
1656		1926
1657	my $sw = int $::WIDTH / 32;
1658	my $sh = int $::HEIGHT / 32;
1659
1660	if ($::MAP) {	1927	if ($::MAP) {
		1928	my $sw = int $::WIDTH / 32;
		1929	my $sh = int $::HEIGHT / 32;
		1930
		1931	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1932	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1933
		1934	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1935
1661	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1936	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1662		1937
1663	if ($::CFG->{fow_enable}) {	1938	if ($::CFG->{fow_enable}) {
1664	if ($::CFG->{fow_smooth}) { # smooth fog of war	1939	if ($::CFG->{fow_smooth}) { # smooth fog of war
1665	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1940	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1666	glConvolutionFilter2D	1941	glConvolutionFilter2D
…		…
1674	0.1, 0.1, 0.1,	1949	0.1, 0.1, 0.1,
1675	;	1950	;
1676	glEnable GL_CONVOLUTION_2D;	1951	glEnable GL_CONVOLUTION_2D;
1677	}	1952	}
1678		1953
1679	my $tex = new CFClient::Texture	1954	$self->{fow_texture} = new CFClient::Texture
1680	w => $w,	1955	w => $w,
1681	h => $h,	1956	h => $h,
1682	data => $data,	1957	data => $data,
1683	internalformat => GL_ALPHA,	1958	internalformat => GL_ALPHA,
1684	format => GL_ALPHA;	1959	format => GL_ALPHA;
1685		1960
1686	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1961	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1687		1962
1688	glEnable GL_BLEND;	1963	glEnable GL_BLEND;
		1964	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1689	glEnable GL_TEXTURE_2D;	1965	glEnable GL_TEXTURE_2D;
1690	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1966	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1691		1967
1692	glColor +($::CFG->{fow_intensity}) x 3, 1;	1968	glColor +($::CFG->{fow_intensity}) x 3, 1;
1693	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1969	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1694		1970
1695	glDisable GL_TEXTURE_2D;	1971	glDisable GL_TEXTURE_2D;
1696	glDisable GL_BLEND;	1972	glDisable GL_BLEND;
1697	}	1973	}
		1974
		1975	# HACK BEGIN
		1976	{
		1977	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1978	my ($w, $h) = (250, 250);
		1979
		1980	glEnable GL_BLEND;
		1981	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1982	glEnable GL_TEXTURE_2D;
		1983	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1984
		1985	$self->{mapmap_texture} =
		1986	new CFClient::Texture
		1987	w => $w,
		1988	h => $h,
		1989	data => $::MAP->mapmap ($w, $h),
		1990	type => GL_UNSIGNED_INT_8_8_8_8_REV;
		1991
		1992	$self->{mapmap_texture}->draw_quad (100, 100);
		1993
		1994	glDisable GL_TEXTURE_2D;
		1995	glDisable GL_BLEND;
		1996	}
		1997	# HACK END
1698	}	1998	}
1699		1999
1700	glEndList;	2000	glEndList;
1701	}	2001	}
1702		2002
		2003	glPushMatrix;
1703	glCallList $self->{list};	2004	glCallList $self->{list};
		2005	glPopMatrix;
1704		2006
1705	if ($FOCUS != $self) {	2007	if ($FOCUS != $self) {
1706	glColor 64/255, 64/255, 64/255;	2008	glColor 64/255, 64/255, 64/255;
1707	glLogicOp GL_AND;	2009	glLogicOp GL_AND;
1708	glEnable GL_COLOR_LOGIC_OP;	2010	glEnable GL_COLOR_LOGIC_OP;
…		…
1737		2039
1738	my $mod = $ev->key_mod;	2040	my $mod = $ev->key_mod;
1739	my $sym = $ev->key_sym;	2041	my $sym = $ev->key_sym;
1740		2042
1741	if ($sym == SDLK_KP5) {	2043	if ($sym == SDLK_KP5) {
1742	$::CONN->user_send ("command stay fire");	2044	$::CONN->user_send ("stay fire");
1743	} elsif ($sym == SDLK_a) {	2045	} elsif ($sym == SDLK_a) {
1744	$::CONN->user_send ("command apply");	2046	$::CONN->user_send ("apply");
1745	} elsif ($sym == SDLK_QUOTE) {	2047	} elsif ($sym == SDLK_QUOTE) {
1746	$self->emit ('activate_console');	2048	$self->emit ('activate_console');
1747	} elsif ($sym == SDLK_SLASH) {	2049	} elsif ($sym == SDLK_SLASH) {
1748	$self->emit ('activate_console' => '/');	2050	$self->emit ('activate_console' => '/');
1749	} elsif (exists $DIR{$sym}) {	2051	} elsif (exists $DIR{$sym}) {
1750	if ($mod & KMOD_SHIFT) {	2052	if ($mod & KMOD_SHIFT) {
1751	$self->{shft}++;	2053	$self->{shft}++;
1752	$::CONN->user_send ("command fire $DIR{$sym}[0]");	2054	$::CONN->user_send ("fire $DIR{$sym}[0]");
1753	} elsif ($mod & KMOD_CTRL) {	2055	} elsif ($mod & KMOD_CTRL) {
1754	$self->{ctrl}++;	2056	$self->{ctrl}++;
1755	$::CONN->user_send ("command run $DIR{$sym}[0]");	2057	$::CONN->user_send ("run $DIR{$sym}[0]");
1756	} else {	2058	} else {
1757	$::CONN->user_send ("command $DIR{$sym}[1]");	2059	$::CONN->user_send ("$DIR{$sym}[1]");
1758	}	2060	}
1759	}	2061	}
1760	}	2062	}
1761		2063
1762	sub key_up {	2064	sub key_up {
…		…
1764		2066
1765	my $mod = $ev->key_mod;	2067	my $mod = $ev->key_mod;
1766	my $sym = $ev->key_sym;	2068	my $sym = $ev->key_sym;
1767		2069
1768	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2070	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1769	$::CONN->user_send ("command fire_stop");	2071	$::CONN->user_send ("fire_stop");
1770	}	2072	}
1771	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2073	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1772	$::CONN->user_send ("command run_stop");	2074	$::CONN->user_send ("run_stop");
1773	}	2075	}
1774	}	2076	}
1775		2077
1776	#############################################################################	2078	#############################################################################
1777		2079
…		…
1841	sub toggle_flopper {	2143	sub toggle_flopper {
1842	my ($self) = @_;	2144	my ($self) = @_;
1843		2145
1844	# TODO: use animation	2146	# TODO: use animation
1845	if ($self->{state} = !$self->{state}) {	2147	if ($self->{state} = !$self->{state}) {
1846	$CFClient::UI::TOPLEVEL->add ($self->{other});	2148	$CFClient::UI::ROOT->add ($self->{other});
1847	$self->{other}->move (	2149	$self->{other}->move ($self->coord2global (0, $self->{h}));
1848	($::WIDTH - $self->{other}{w}) * 0.5,	2150	$self->emit ("open");
1849	($::HEIGHT - $self->{other}{h}) * 0.5,
1850	);
1851	} else {	2151	} else {
1852	$CFClient::UI::TOPLEVEL->remove ($self->{other});	2152	$CFClient::UI::ROOT->remove ($self->{other});
		2153	$self->emit ("close");
1853	}	2154	}
1854	}
1855		2155
1856	#############################################################################	2156	$self->emit (changed => $self->{state});
		2157	}
1857		2158
		2159	#############################################################################
		2160
1858	package CFClient::UI::Toplevel;	2161	package CFClient::UI::Root;
1859		2162
1860	our @ISA = CFClient::UI::Container::;	2163	our @ISA = CFClient::UI::Container::;
		2164
		2165	use SDL::OpenGL;
		2166
		2167	sub check_size {
		2168	my ($self) = @_;
		2169
		2170	$self->size_allocate (0, 0, $::WITH, $::HEIGHT);
		2171	}
1861		2172
1862	sub size_request {	2173	sub size_request {
1863	($::WIDTH, $::HEIGHT)	2174	($::WIDTH, $::HEIGHT)
1864	}	2175	}
1865		2176
…		…
1870		2181
1871	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2182	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1872	for @{$self->{children}};	2183	for @{$self->{children}};
1873	}	2184	}
1874		2185
1875	sub translate {	2186	sub _topleft {
1876	my ($self, $x, $y) = @_;	2187	my ($self, $x, $y) = @_;
1877		2188
1878	($x, $y)	2189	($x, $y)
1879	}	2190	}
1880		2191
1881	sub update {	2192	sub update {
1882	my ($self) = @_;	2193	my ($self) = @_;
1883		2194
1884	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2195	$self->check_size;
1885	::refresh ();	2196	::refresh ();
1886	}	2197	}
1887		2198
1888	sub add {	2199	sub add {
1889	my ($self, $widget) = @_;	2200	my ($self, $widget) = @_;
1890		2201
1891	$self->SUPER::add ($widget);	2202	$self->SUPER::add ($widget);
1892		2203
1893	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2204	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
		2205	}
		2206
		2207	sub on_refresh {
		2208	my ($self, $id, $cb) = @_;
		2209
		2210	$self->{refresh_hook}{$id} = $cb;
1894	}	2211	}
1895		2212
1896	sub draw {	2213	sub draw {
1897	my ($self) = @_;	2214	my ($self) = @_;
1898		2215
		2216	while (my $rcb = delete $self->{refresh_hook}) {
		2217	$_->() for values %$rcb;
		2218	}
		2219
		2220	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2221	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2222	glClear GL_COLOR_BUFFER_BIT;
		2223
		2224	glMatrixMode GL_PROJECTION;
		2225	glLoadIdentity;
		2226	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2227	glMatrixMode GL_MODELVIEW;
		2228	glLoadIdentity;
		2229
1899	$self->_draw;	2230	$self->_draw;
1900	}	2231	}
1901		2232
1902	#############################################################################	2233	#############################################################################
1903		2234
1904	package CFClient::UI;	2235	package CFClient::UI;
1905		2236
1906	$TOPLEVEL = new CFClient::UI::Toplevel;	2237	$ROOT = new CFClient::UI::Root;
1907		2238
1908	1	2239	1
1909		2240

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.125 by root, Mon Apr 17 20:52:15 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.125 by root, Mon Apr 17 20:52:15 2006 UTC