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

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.126 by root, Mon Apr 17 20:59:20 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.126 by root, Mon Apr 17 20:59:20 2006 UTC