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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC vs.
Revision 1.121 by root, Mon Apr 17 19:21:00 2006 UTC

…		…
7		7
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $TOPLEVEL;	12	our $ROOT;
13	our $BUTTON_STATE;	13	our $BUTTON_STATE;
14		14
15	# class methods for events	15	# class methods for events
16	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
24	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	25	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $TOPLEVEL->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
30		30
31	$GRAB = $widget;	31	$GRAB = $widget;
32	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
33	}	33	}
34		34
35	$BUTTON_STATE \|= 1 << ($ev->button - 1);	35	$BUTTON_STATE \|= 1 << ($ev->button - 1);
36		36
37	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	38	}
39		39
40	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	41	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43		43
44	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
45		45
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
47		47
48	$GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	52	$grab->update if $grab;
53	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60		60
61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
65		65
66	$hover->update if $hover;	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER;	67	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}	68	}
69		69
70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
		71	}
		72
		73	# convert position array to integers
		74	sub harmonize {
		75	my ($vals) = @_;
		76
		77	my $rem = 0;
		78
		79	for (@$vals) {
		80	my $i = int $_ + $rem;
		81	$rem += $_ - $i;
		82	$_ = $i;
		83	}
71	}	84	}
72		85
73	#############################################################################	86	#############################################################################
74		87
75	package CFClient::UI::Base;	88	package CFClient::UI::Base;
…		…
99	$self	112	$self
100	}	113	}
101		114
102	sub move {	115	sub move {
103	my ($self, $x, $y, $z) = @_;	116	my ($self, $x, $y, $z) = @_;
104	$self->{x} = $x;	117	$self->{x} = int $x;
105	$self->{y} = $y;	118	$self->{y} = int $y;
106	$self->{z} = $z if defined $z;	119	$self->{z} = $z if defined $z;
107	}	120	}
108		121
109	sub needs_redraw {	122	sub needs_redraw {
110	0	123	0
…		…
133	my ($self, $x, $y, $w, $h) = @_;	146	my ($self, $x, $y, $w, $h) = @_;
134		147
135	$self->_size_allocate ($x, $y, $w, $h);	148	$self->_size_allocate ($x, $y, $w, $h);
136	}	149	}
137		150
		151	# return top left coordinates
		152	sub _topleft {
		153	my ($self, $x, $y) = @_;
		154
		155	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
		156	}
		157
138	# translate global coordinates to local coordinate system	158	# translate global coordinates to local coordinate system
139	sub translate {	159	sub coord2local {
140	my ($self, $x, $y) = @_;	160	my ($self, $x, $y) = @_;
141		161
142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	162	my ($X, $Y) = $self->_topleft;
		163	($x - $X, $y - $Y)
		164	}
		165
		166	# translate local coordinates to global coordinate system
		167	sub coord2global {
		168	my ($self, $x, $y) = @_;
		169
		170	my ($X, $Y) = $self->_topleft;
		171	($x + $X, $y + $Y)
143	}	172	}
144		173
145	sub focus_in {	174	sub focus_in {
146	my ($self) = @_;	175	my ($self) = @_;
147		176
148	return if $FOCUS == $self;	177	return if $FOCUS == $self;
149	return unless $self->{can_focus};	178	return unless $self->{can_focus};
150		179
151	my $focus = $FOCUS; $FOCUS = $self;	180	my $focus = $FOCUS; $FOCUS = $self;
		181
		182	$self->emit (focus_in => $focus);
		183
152	$focus->update if $focus;	184	$focus->update if $focus;
153	$FOCUS->update;	185	$FOCUS->update;
154	}	186	}
155		187
156	sub focus_out {	188	sub focus_out {
157	my ($self) = @_;	189	my ($self) = @_;
158		190
159	return unless $FOCUS == $self;	191	return unless $FOCUS == $self;
160		192
161	my $focus = $FOCUS; undef $FOCUS;	193	my $focus = $FOCUS; undef $FOCUS;
		194
		195	$self->emit (focus_out => $focus);
		196
162	$focus->update if $focus; #?	197	$focus->update if $focus; #?
163	}	198	}
164		199
165	sub mouse_motion { }	200	sub mouse_motion { }
166	sub button_up { }	201	sub button_up { }
…		…
220		255
221	()	256	()
222	}	257	}
223		258
224	sub set_parent {	259	sub set_parent {
225	my ($self, $par) = @_;	260	my ($self, $parent) = @_;
226		261
227	$self->{parent} = $par;
228	Scalar::Util::weaken $self->{parent};	262	Scalar::Util::weaken ($self->{parent} = $parent);
229	}
230
231	sub get_parent {
232	$_[0]->{parent}
233	}	263	}
234		264
235	sub update {	265	sub update {
236	my ($self) = @_;	266	my ($self) = @_;
237		267
…		…
326		356
327	$self	357	$self
328	}	358	}
329		359
330	sub add {	360	sub add {
331	my ($self, $chld) = @_;	361	my ($self, $child) = @_;
332		362
333	$chld->set_parent ($self);	363	$child->set_parent ($self);
		364
		365	use sort 'stable';
334		366
335	$self->{children} = [	367	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	368	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	369	@{$self->{children}}, $child
338	];	370	];
339		371
340	$self->{w} = $self->{h} = -1;	372	$self->{w} = $self->{h} = -1;
341	$self->update;	373	$self->update;
342	}	374	}
…		…
439	}	471	}
440		472
441	sub render_chld {	473	sub render_chld {
442	my ($self) = @_;	474	my ($self) = @_;
443		475
444	$self->{texture} =	476	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445	CFClient::Texture->new_from_opengl (	477	glClearColor 0, 0, 0, 1;
446	$self->{w}, $self->{h}, sub { $self->child->draw }	478	glClear GL_COLOR_BUFFER_BIT;
447	);	479	$self->child->draw;
		480	};
448	}	481	}
449		482
450	sub size_allocate {	483	sub size_allocate {
451	my ($self, $x, $y, $w, $h) = @_;	484	my ($self, $x, $y, $w, $h) = @_;
452		485
…		…
538	# TODO: user_x, user_y, overwrite moveto?	571	# TODO: user_x, user_y, overwrite moveto?
539		572
540	$class->SUPER::new (	573	$class->SUPER::new (
541	bg => [1, 1, 1, 1],	574	bg => [1, 1, 1, 1],
542	border_bg => [1, 1, 1, 1],	575	border_bg => [1, 1, 1, 1],
543	border => $::FONTSIZE * 0.8,	576	border => int $::FONTSIZE * 0.8,
544	@_	577	@_
545	)	578	)
546	}	579	}
547		580
548	sub size_request {	581	sub size_request {
…		…
639	# TODO: repeat texture not scale	672	# TODO: repeat texture not scale
640	my $rep_x = $cw / $bg->{w};	673	my $rep_x = $cw / $bg->{w};
641	my $rep_y = $ch / $bg->{h};	674	my $rep_y = $ch / $bg->{h};
642		675
643	glColor @{ $self->{bg} };	676	glColor @{ $self->{bg} };
		677
		678	$bg->{s} = $rep_x;
		679	$bg->{t} = $rep_y;
		680	$bg->{wrap_mode} = 1;
644	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	681	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
645		682
646	glDisable GL_TEXTURE_2D;	683	glDisable GL_TEXTURE_2D;
647	glDisable GL_BLEND;	684	glDisable GL_BLEND;
648		685
…		…
667	@_	704	@_
668	)	705	)
669	}	706	}
670		707
671	sub add {	708	sub add {
672	my ($self, $x, $y, $chld) = @_;	709	my ($self, $x, $y, $child) = @_;
673		710
		711	$child->set_parent ($self);
674	$self->{children}[$y][$x] = $chld;	712	$self->{children}[$y][$x] = $child;
675	$chld->set_parent ($self);
676		713
677	$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};
678	$self->update;	723	$self->update;
679	}	724	}
680		725
681	sub get_wh {	726	sub get_wh {
682	my ($self) = @_;	727	my ($self) = @_;
…		…
727	my $col_expand = (sum @col_expand) \|\| 1;	772	my $col_expand = (sum @col_expand) \|\| 1;
728		773
729	# linearly scale sizes	774	# linearly scale sizes
730	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	775	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731	$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;
732		780
733	my $y;	781	my $y;
734		782
735	for my $r (0 .. $#{$self->{children}}) {	783	for my $r (0 .. $#{$self->{children}}) {
736	my $row = $self->{children}[$r]	784	my $row = $self->{children}[$r]
…		…
824	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	872	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825	$h[$_] = $alloc_h;	873	$h[$_] = $alloc_h;
826	}	874	}
827	}	875	}
828		876
		877	CFClient::UI::harmonize \@h;
		878
829	my $y = 0;	879	my $y = 0;
830	for (0 .. $#$children) {	880	for (0 .. $#$children) {
831	my $child = $children->[$_];	881	my $child = $children->[$_];
832	my $h = $h[$_];	882	my $h = $h[$_];
833	$child->size_allocate ($y, 0, $h, $w);	883	$child->size_allocate ($y, 0, $h, $w);
…		…
878		928
879	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	929	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
880	}	930	}
881	}	931	}
882		932
		933	CFClient::UI::harmonize \@h;
		934
883	my $y = 0;	935	my $y = 0;
884	for (0 .. $#$children) {	936	for (0 .. $#$children) {
885	my $child = $children->[$_];	937	my $child = $children->[$_];
886	my $h = $h[$_];	938	my $h = $h[$_];
887	$child->size_allocate (0, $y, $w, $h);	939	$child->size_allocate (0, $y, $w, $h);
…		…
900		952
901	sub new {	953	sub new {
902	my ($class, %arg) = @_;	954	my ($class, %arg) = @_;
903		955
904	my $self = $class->SUPER::new (	956	my $self = $class->SUPER::new (
905	fg => [1, 1, 1],	957	fg => [1, 1, 1],
906	height => $::FONTSIZE,	958	fontsize => $::FONTSIZE,
907	text => "",	959	text => "",
908	align => -1,	960	align => -1,
		961	valign => -1,
909	padding => 2,	962	padding => 2,
910	layout => new CFClient::Layout,	963	layout => new CFClient::Layout,
911	%arg	964	%arg
912	);	965	);
913		966
914	$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};
915		971
916	$self	972	$self
917	}	973	}
918		974
919	sub escape_text {	975	sub escape_text {
…		…
927	}	983	}
928		984
929	sub set_text {	985	sub set_text {
930	my ($self, $text) = @_;	986	my ($self, $text) = @_;
931		987
932	$self->{text} = $text;
933	$self->{layout}->set_markup ($text);	988	$self->{layout}->set_text ($text);
934		989
935	delete $self->{texture};	990	delete $self->{texture};
936	# $self->{w} = $self->{h} = -1;
937	$self->update;	991	$self->update;
938	}	992	}
939		993
940	sub get_text {	994	sub set_markup {
941	my ($self, $text) = @_;	995	my ($self, $markup) = @_;
942		996
943	$self->{text}	997	$self->{layout}->set_markup ($markup);
		998
		999	delete $self->{texture};
		1000	$self->update;
944	}	1001	}
945		1002
946	sub size_request {	1003	sub size_request {
947	my ($self) = @_;	1004	my ($self) = @_;
948		1005
949	$self->{layout}->set_width;	1006	$self->{layout}->set_width;
950	$self->{layout}->set_height ($self->{height});	1007	$self->{layout}->set_height ($self->{fontsize});
		1008
951	my ($w, $h) = $self->{layout}->size;	1009	my ($w, $h) = $self->{layout}->size;
952		1010
953	(	1011	(
954	$w + $self->{padding} * 2,	1012	$w + $self->{padding} * 2,
955	$h + $self->{padding} * 2,	1013	$h + $self->{padding} * 2,
…		…
974	sub _draw {	1032	sub _draw {
975	my ($self) = @_;	1033	my ($self) = @_;
976		1034
977	my $tex = $self->{texture} \|\|= do {	1035	my $tex = $self->{texture} \|\|= do {
978	$self->{layout}->set_width ($self->{w});	1036	$self->{layout}->set_width ($self->{w});
979	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1037	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
980	new_from_layout CFClient::Texture $self->{layout}	1038	new_from_layout CFClient::Texture $self->{layout}
981	};	1039	};
982		1040
983	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
984	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985	glEnable GL_TEXTURE_2D;	1043	glEnable GL_TEXTURE_2D;
986	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1044	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987		1045
988	glColor @{$self->{fg}};	1046	glColor @{$self->{fg}};
989		1047
990	my $x =	1048	my $x =
991	$self->{align} < 0 ? $self->{padding}	1049	$self->{align} < 0 ? $self->{padding}
992	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1050	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993	: ($self->{w} - $tex->{w}) * 0.5;	1051	: ($self->{w} - $tex->{w}) * 0.5;
994		1052
995	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;	1053	my $y =
		1054	$self->{valign} < 0 ? $self->{padding}
		1055	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1056	: ($self->{h} - $tex->{h}) * 0.5;
		1057
996	$tex->draw_quad (0, 0);	1058	$tex->draw_quad (int $x, int $y);
997		1059
998	glDisable GL_TEXTURE_2D;	1060	glDisable GL_TEXTURE_2D;
999	glDisable GL_BLEND;	1061	glDisable GL_BLEND;
1000	}	1062	}
1001		1063
1002	#############################################################################	1064	#############################################################################
1003		1065
1004	package CFClient::UI::Entry;	1066	package CFClient::UI::EntryBase;
1005		1067
1006	our @ISA = CFClient::UI::Label::;	1068	our @ISA = CFClient::UI::Label::;
1007		1069
1008	use SDL;	1070	use SDL;
1009	use SDL::OpenGL;	1071	use SDL::OpenGL;
…		…
1016	bg => [0, 0, 0, 0.2],	1078	bg => [0, 0, 0, 0.2],
1017	active_bg => [1, 1, 1, 0.5],	1079	active_bg => [1, 1, 1, 0.5],
1018	active_fg => [0, 0, 0],	1080	active_fg => [0, 0, 0],
1019	can_hover => 1,	1081	can_hover => 1,
1020	can_focus => 1,	1082	can_focus => 1,
		1083	valign => 0,
1021	@_	1084	@_
1022	)	1085	)
1023	}	1086	}
1024		1087
1025	sub _set_text {	1088	sub _set_text {
1026	my ($self, $text) = @_;	1089	my ($self, $text) = @_;
1027		1090
		1091	delete $self->{cur_h};
		1092
		1093	return if $self->{text} eq $text;
		1094
1028	$self->{last_activity} = $::NOW;	1095	$self->{last_activity} = $::NOW;
1029
1030	$self->{text} = $text;	1096	$self->{text} = $text;
1031	$self->{layout}->set_width ($self->{w});
1032	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1033		1097
1034	$text =~ s/./*/g if $self->{hidden};	1098	$text =~ s/./*/g if $self->{hidden};
		1099	$self->{layout}->set_text ("$text ");
1035		1100
1036	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1101	$self->emit (changed => $self->{text});
		1102	}
1037		1103
1038	$text = substr $text, 0, $self->{cursor};	1104	sub get_text {
1039	utf8::encode $text;	1105	$_[0]{text}
1040
1041	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1042	}	1106	}
1043		1107
1044	sub size_request {	1108	sub size_request {
1045	my ($self) = @_;	1109	my ($self) = @_;
1046		1110
…		…
1085	++$self->{cursor} if $self->{cursor} < length $self->{text};	1149	++$self->{cursor} if $self->{cursor} < length $self->{text};
1086	} elsif ($sym == SDLK_HOME) {	1150	} elsif ($sym == SDLK_HOME) {
1087	$self->{cursor} = 0;	1151	$self->{cursor} = 0;
1088	} elsif ($sym == SDLK_END) {	1152	} elsif ($sym == SDLK_END) {
1089	$self->{cursor} = length $text;	1153	$self->{cursor} = length $text;
		1154	} elsif ($sym == SDLK_ESCAPE) {
		1155	$self->emit ('escape');
1090	} elsif ($uni) {	1156	} elsif ($uni) {
1091	substr $text, $self->{cursor}++, 0, chr $uni;	1157	substr $text, $self->{cursor}++, 0, chr $uni;
1092	}	1158	}
1093		1159
1094	$self->_set_text ($text);	1160	$self->_set_text ($text);
…		…
1148		1214
1149	$self->SUPER::_draw;	1215	$self->SUPER::_draw;
1150		1216
1151	#TODO: force update every cursor change :(	1217	#TODO: force update every cursor change :(
1152	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1218	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1219
		1220	unless (exists $self->{cur_h}) {
		1221	my $text = substr $self->{text}, 0, $self->{cursor};
		1222	utf8::encode $text;
		1223
		1224	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1225	}
		1226
1153	glColor @{$self->{fg}};	1227	glColor @{$self->{fg}};
1154	glBegin GL_LINES;	1228	glBegin GL_LINES;
1155	glVertex $self->{cur_x}, $self->{cur_y};	1229	glVertex $self->{cur_x}, $self->{cur_y};
1156	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1230	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1157	glEnd;	1231	glEnd;
1158	}	1232	}
1159	}	1233	}
1160		1234
1161	package CFClient::UI::LineEntry;	1235	package CFClient::UI::Entry;
1162		1236
1163	our @ISA = CFClient::UI::Entry::;	1237	our @ISA = CFClient::UI::EntryBase::;
1164		1238
1165	use SDL;	1239	use SDL;
1166	use SDL::OpenGL;	1240	use SDL::OpenGL;
1167		1241
1168	sub key_down {	1242	sub key_down {
…		…
1217		1291
1218	sub _draw {	1292	sub _draw {
1219	my ($self) = @_;	1293	my ($self) = @_;
1220		1294
1221	local $self->{fg} = $self->{fg};	1295	local $self->{fg} = $self->{fg};
1222	my $tex = $tex[0];
1223
1224	glEnable GL_BLEND;
1225	glEnable GL_TEXTURE_2D;
1226	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1227		1296
1228	if ($GRAB == $self) {	1297	if ($GRAB == $self) {
1229	$self->{fg} = $self->{active_fg};	1298	$self->{fg} = $self->{active_fg};
1230	}	1299	}
1231		1300
1232	glBindTexture GL_TEXTURE_2D, $tex->{name};	1301	glEnable GL_BLEND;
		1302	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1303	glEnable GL_TEXTURE_2D;
1233	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1304	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1305	glColor 0, 0, 0, 1;
1234		1306
1235	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1307	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1236		1308
1237	glDisable GL_TEXTURE_2D;	1309	glDisable GL_TEXTURE_2D;
1238	glDisable GL_BLEND;	1310	glDisable GL_BLEND;
1239		1311
1240	$self->SUPER::_draw;	1312	$self->SUPER::_draw;
…		…
1243	#############################################################################	1315	#############################################################################
1244		1316
1245	package CFClient::UI::CheckBox;	1317	package CFClient::UI::CheckBox;
1246		1318
1247	our @ISA = CFClient::UI::DrawBG::;	1319	our @ISA = CFClient::UI::DrawBG::;
		1320
		1321	my @tex =
		1322	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1323	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1248		1324
1249	use SDL;	1325	use SDL;
1250	use SDL::OpenGL;	1326	use SDL::OpenGL;
1251		1327
1252	sub new {	1328	sub new {
…		…
1290	$self->SUPER::_draw;	1366	$self->SUPER::_draw;
1291		1367
1292	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1368	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1293		1369
1294	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1370	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1295		1371
1296	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1372	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1297		1373
1298	glBegin GL_LINE_LOOP;	1374	glEnable GL_BLEND;
1299	glVertex 0 , 0;	1375	glEnable GL_TEXTURE_2D;
1300	glVertex 0 , $s;	1376	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1301	glVertex $s, $s;
1302	glVertex $s, 0;
1303	glEnd;
1304		1377
1305	if ($self->{state}) {	1378	my $tex = $self->{state} ? $tex[1] : $tex[0];
1306	glBegin GL_LINES;	1379
1307	glVertex 0 , 0;	1380	$tex->draw_quad (0, 0, $s, $s);
1308	glVertex $s, $s;	1381
1309	glVertex $s, 0;	1382	glDisable GL_TEXTURE_2D;
1310	glVertex 0 , $s;	1383	glDisable GL_BLEND;
1311	glEnd;
1312	}
1313	}	1384	}
1314		1385
1315	#############################################################################	1386	#############################################################################
1316		1387
1317	package CFClient::UI::Slider;	1388	package CFClient::UI::Slider;
…		…
1340	range => [0, 0, 100, 10],	1411	range => [0, 0, 100, 10],
1341	req_w => 40,	1412	req_w => 40,
1342	req_h => 13,	1413	req_h => 13,
1343	vertical => 0,	1414	vertical => 0,
1344	can_hover => 1,	1415	can_hover => 1,
		1416	inner_pad => 5,
1345	@_	1417	@_
1346	);	1418	);
1347		1419
1348	$self	1420	$self
1349	}	1421	}
…		…
1370	if ($GRAB == $self) {	1442	if ($GRAB == $self) {
1371	my ($value, $lo, $hi, $page) = @{$self->{range}};	1443	my ($value, $lo, $hi, $page) = @{$self->{range}};
1372		1444
1373	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1445	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1374		1446
		1447	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1448	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1449
		1450	$x -= $inner_pad_px; # substract the padding
1375	$x = $x * ($hi - $lo) / $w + $lo;	1451	$x = $x * ($hi - $lo) / $inner_w + $lo;
1376	$x = $lo if $x < $lo;	1452	$x = $lo if $x < $lo;
1377	$x = $hi - $page if $x > $hi - $page;	1453	$x = $hi - $page if $x > $hi - $page;
1378	$self->{range}[0] = $x;	1454	$self->{range}[0] = $x;
1379		1455
1380	$self->emit (changed => $x);	1456	$self->emit (changed => $x);
1381	$self->update;	1457	$self->update;
1382	}	1458	}
		1459	}
		1460
		1461	# the inner_* stuff is for generating a padding for the slider handle,
		1462	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1463	# correct propably, but it does the job for now
		1464	sub _calc_inner_pad_px {
		1465	my ($self, $w) = @_;
		1466	($w / 100) * $self->{inner_pad} # % to pixels
1383	}	1467	}
1384		1468
1385	sub _draw {	1469	sub _draw {
1386	my ($self) = @_;	1470	my ($self) = @_;
1387		1471
…		…
1401	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1485	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1402	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1486	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1403		1487
1404	my ($value, $lo, $hi, $page) = @{$self->{range}};	1488	my ($value, $lo, $hi, $page) = @{$self->{range}};
1405		1489
1406	# the inner_* stuff is for generating a padding for the slider handle,	1490	$hi = $value + 1 if $lo == $hi;
1407	# so that the handle doesn't leave the texture. This calculation isn't 100%	1491
1408	# correct propably, but it does the job for now	1492	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1409	my $inner_pad = 5; # 5% of width for slider bg texture border
1410	my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1411	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1493	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1412		1494
1413	$page = int $page * $inner_w / ($hi - $lo);	1495	$page = int $page * $inner_w / ($hi - $lo);
1414	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1496	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1415		1497
1416	$w -= $page;	1498	$w -= $page;
…		…
1446		1528
1447	sub new {	1529	sub new {
1448	my $class = shift;	1530	my $class = shift;
1449		1531
1450	my $self = $class->SUPER::new (	1532	my $self = $class->SUPER::new (
		1533	req_w => $::WIDTH / 6,
		1534	req_h => $::HEIGHT / 6,
		1535	fontsize => $::FONTSIZE,
		1536	@_,
		1537
		1538	layout => (new CFClient::Layout),
1451	par => [],	1539	par => [],
1452	@_,	1540	height => 0,
1453	children => [	1541	children => [
1454	(new CFClient::UI::Empty expand => 1),	1542	(new CFClient::UI::Empty expand => 1),
1455	(new CFClient::UI::Slider vertical => 1),	1543	(new CFClient::UI::Slider vertical => 1),
1456	],	1544	],
1457	);	1545	);
1458		1546
		1547	$self->{children}[1]->connect (changed => sub {
		1548	$self->update;
		1549	});
		1550
1459	$self	1551	$self
		1552	}
		1553
		1554	sub set_fontsize {
		1555	my ($self, $fontsize) = @_;
		1556
		1557	$self->{fontsize} = $fontsize;
		1558	$self->reflow;
		1559	}
		1560
		1561	sub text_height {
		1562	my ($self, $text) = @_;
		1563
		1564	my $layout = $self->{layout};
		1565
		1566	$layout->set_height ($self->{fontsize});
		1567	$layout->set_width ($self->{w});
		1568	$layout->set_text ($text);
		1569
		1570	($layout->size)[1]
		1571	}
		1572
		1573	sub reflow {
		1574	my ($self) = @_;
		1575
		1576	$self->{need_reflow}++;
		1577	$self->update;
		1578	}
		1579
		1580	sub size_request {
		1581	my ($self) = @_;
		1582
		1583	($self->{req_w}, $self->{req_h})
		1584	}
		1585
		1586	sub size_allocate {
		1587	my ($self, $x, $y, $w, $h) = @_;
		1588
		1589	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1590
		1591	$self->{layout}->set_height ($self->{fontsize});
		1592	$self->{layout}->set_width ($self->{w});
		1593
		1594	$self->reflow;
1460	}	1595	}
1461		1596
1462	sub add_paragraph {	1597	sub add_paragraph {
1463	my ($self, $color, $text) = @_;	1598	my ($self, $color, $text) = @_;
1464		1599
		1600	#TODO: intelligently "reformat" paragraph
		1601
		1602	my $height = $self->text_height ($text);
		1603
		1604	$self->{height} += $height;
		1605
1465	push @{$self->{par}}, [$color, $text];	1606	push @{$self->{par}}, [$height, $color, $text];
1466	my $count = scalar @{$self->{par}};	1607
1467	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];	1608	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1468	$self->{children}[1]->update;	1609	$self->{children}[1]->update;
1469	}	1610	}
1470		1611
		1612	sub update {
		1613	my ($self) = @_;
		1614
		1615	$self->SUPER::update;
		1616
		1617	return unless $self->{h} > 0;
		1618
		1619	delete $self->{texture};
		1620
		1621	$ROOT->on_refresh ($self, sub {
		1622	if (delete $self->{need_reflow}) {
		1623	my $height = 0;
		1624
		1625	$height += $_->[0] = $self->text_height ($_->[2])
		1626	for @{$self->{par}};
		1627
		1628	$self->{height} = $height;
		1629
		1630	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1631
		1632	delete $self->{texture};
		1633	}
		1634
		1635	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1636	glClearColor 0, 0, 0, 1;
		1637	glClear GL_COLOR_BUFFER_BIT;
		1638
		1639	glEnable GL_BLEND;
		1640	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1641	glEnable GL_TEXTURE_2D;
		1642	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1643
		1644	my $top = int $self->{children}[1]{range}[0];
		1645
		1646	my $y0 = $top;
		1647	my $y1 = $top + $self->{h};
		1648
		1649	my $y = 0;
		1650
		1651	my $layout = $self->{layout};
		1652
		1653	for my $par (@{$self->{par}}) {
		1654	my $h = $par->[0];
		1655
		1656	if ($y0 < $y + $h && $y < $y1) {
		1657	$layout->set_text ($par->[2]);
		1658
		1659	glColor @{ $par->[1] };
		1660	my ($W, $H) = $layout->size;
		1661	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1662	}
		1663
		1664	$y += $h;
		1665	}
		1666
		1667	glDisable GL_TEXTURE_2D;
		1668	glDisable GL_BLEND;
		1669	};
		1670	});
		1671	}
		1672
1471	sub _draw {	1673	sub _draw {
1472	my ($self) = @_;	1674	my ($self) = @_;
1473		1675
1474	my $par = $self->{par};	1676	if ($self->{texture}) {
1475
1476	my $bottom = (scalar @$par) - 1;
1477
1478	my $w = $self->{children}[0]{w};
1479	my $y = $self->{h};
1480
1481	glEnable GL_BLEND;
1482	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483	glEnable GL_TEXTURE_2D;	1677	glEnable GL_TEXTURE_2D;
1484	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1678	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1485		1679	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1486	# TODO: everything!
1487	while ($y > 0 && $bottom >= 0) {
1488	my $par = $par->[$bottom--];
1489
1490	my $layout = new CFClient::Layout;
1491
1492	$layout->set_height ($::FONTSIZE);
1493	$layout->set_width ($w);
1494	$layout->set_text ($par->[1]);
1495	my $tex = new_from_layout CFClient::Texture $layout;
1496	$y -= $tex->{h};
1497
1498	glColor @{ $par->[0] };
1499	$tex->draw_quad (0, $y);
1500	}
1501
1502	glDisable GL_TEXTURE_2D;	1680	glDisable GL_TEXTURE_2D;
1503	glDisable GL_BLEND;	1681	}
		1682
		1683	$self->{children}[1]->draw;
		1684
1504	}	1685	}
1505		1686
1506	#############################################################################	1687	#############################################################################
1507		1688
1508	package CFClient::UI::MapWidget;	1689	package CFClient::UI::MapWidget;
…		…
1532	}	1713	}
1533		1714
1534	sub key_up {	1715	sub key_up {
1535	}	1716	}
1536		1717
		1718	sub button_down {
		1719	my ($self, $ev, $x, $y) = @_;
		1720
		1721	$self->focus_in;
		1722
		1723	if ($ev->button == 2) {
		1724	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1725	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1726
		1727	$self->{motion} = sub {
		1728	my ($ev, $x, $y) = @_;
		1729
		1730	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1731
		1732	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1733	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1734
		1735	$self->update;
		1736	};
		1737	}
		1738	}
		1739
		1740	sub button_up {
		1741	my ($self, $ev, $x, $y) = @_;
		1742
		1743	delete $self->{motion};
		1744	}
		1745
		1746	sub mouse_motion {
		1747	my ($self, $ev, $x, $y) = @_;
		1748
		1749	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1750	}
		1751
1537	sub size_request {	1752	sub size_request {
1538	(	1753	(
1539	1 + 32 * int $::WIDTH / 32,	1754	1 + 32 * int $::WIDTH / 32,
1540	1 + 32 * int $::HEIGHT / 32,	1755	1 + 32 * int $::HEIGHT / 32,
1541	)	1756	)
…		…
1549	}	1764	}
1550		1765
1551	sub draw {	1766	sub draw {
1552	my ($self) = @_;	1767	my ($self) = @_;
1553		1768
1554	$self->{need_update}++;#d#
1555	if (delete $self->{need_update}) {	1769	if (delete $self->{need_update}) {
1556	glNewList $self->{list}, GL_COMPILE;	1770	glNewList $self->{list}, GL_COMPILE;
1557		1771
1558	my $sw = int $::WIDTH / 32;
1559	my $sh = int $::HEIGHT / 32;
1560
1561	if ($::MAP) {	1772	if ($::MAP) {
		1773	my $sw = int $::WIDTH / 32;
		1774	my $sh = int $::HEIGHT / 32;
		1775
		1776	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1777	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1778
		1779	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1780
1562	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1781	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1563		1782
1564	if ($::CFG->{fow_enable}) {	1783	if ($::CFG->{fow_enable}) {
1565	if ($::CFG->{fow_smooth}) { # smooth fog of war	1784	if ($::CFG->{fow_smooth}) { # smooth fog of war
1566	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1785	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1567	glConvolutionFilter2D	1786	glConvolutionFilter2D
…		…
1575	0.1, 0.1, 0.1,	1794	0.1, 0.1, 0.1,
1576	;	1795	;
1577	glEnable GL_CONVOLUTION_2D;	1796	glEnable GL_CONVOLUTION_2D;
1578	}	1797	}
1579		1798
1580	my $tex = new CFClient::Texture	1799	$self->{fow_texture} = new CFClient::Texture
1581	w => $w,	1800	w => $w,
1582	h => $h,	1801	h => $h,
1583	data => $data,	1802	data => $data,
1584	internalformat => GL_ALPHA,	1803	internalformat => GL_ALPHA,
1585	format => GL_ALPHA;	1804	format => GL_ALPHA;
1586		1805
1587	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1806	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1588		1807
1589	glEnable GL_BLEND;	1808	glEnable GL_BLEND;
		1809	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590	glEnable GL_TEXTURE_2D;	1810	glEnable GL_TEXTURE_2D;
1591	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1592		1812
1593	glColor +($::CFG->{fow_intensity}) x 3, 1;	1813	glColor +($::CFG->{fow_intensity}) x 3, 1;
1594	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1814	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1595		1815
1596	glDisable GL_TEXTURE_2D;	1816	glDisable GL_TEXTURE_2D;
1597	glDisable GL_BLEND;	1817	glDisable GL_BLEND;
1598	}	1818	}
		1819
		1820	# HACK BEGIN
		1821	{
		1822	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1823	my ($w, $h) = (250, 250);
		1824
		1825	glEnable GL_BLEND;
		1826	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1827	glEnable GL_TEXTURE_2D;
		1828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1829
		1830	$self->{mapmap_texture} =
		1831	new CFClient::Texture
		1832	w => $w,
		1833	h => $h,
		1834	data => $::MAP->mapmap ($w, $h),
		1835	type => GL_UNSIGNED_INT_8_8_8_8_REV;
		1836
		1837	$self->{mapmap_texture}->draw_quad (100, 100);
		1838
		1839	glDisable GL_TEXTURE_2D;
		1840	glDisable GL_BLEND;
		1841	}
		1842	# HACK END
1599	}	1843	}
1600		1844
1601	glEndList;	1845	glEndList;
1602	}	1846	}
1603		1847
		1848	glPushMatrix;
1604	glCallList $self->{list};	1849	glCallList $self->{list};
		1850	glPopMatrix;
1605		1851
1606	if ($FOCUS != $self) {	1852	if ($FOCUS != $self) {
1607	glColor 64/255, 64/255, 64/255;	1853	glColor 64/255, 64/255, 64/255;
1608	glLogicOp GL_AND;	1854	glLogicOp GL_AND;
1609	glEnable GL_COLOR_LOGIC_OP;	1855	glEnable GL_COLOR_LOGIC_OP;
…		…
1641		1887
1642	if ($sym == SDLK_KP5) {	1888	if ($sym == SDLK_KP5) {
1643	$::CONN->user_send ("command stay fire");	1889	$::CONN->user_send ("command stay fire");
1644	} elsif ($sym == SDLK_a) {	1890	} elsif ($sym == SDLK_a) {
1645	$::CONN->user_send ("command apply");	1891	$::CONN->user_send ("command apply");
		1892	} elsif ($sym == SDLK_QUOTE) {
		1893	$self->emit ('activate_console');
		1894	} elsif ($sym == SDLK_SLASH) {
		1895	$self->emit ('activate_console' => '/');
1646	} elsif (exists $DIR{$sym}) {	1896	} elsif (exists $DIR{$sym}) {
1647	if ($mod & KMOD_SHIFT) {	1897	if ($mod & KMOD_SHIFT) {
1648	$self->{shft}++;	1898	$self->{shft}++;
1649	$::CONN->user_send ("command fire $DIR{$sym}[0]");	1899	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1650	} elsif ($mod & KMOD_CTRL) {	1900	} elsif ($mod & KMOD_CTRL) {
…		…
1738	sub toggle_flopper {	1988	sub toggle_flopper {
1739	my ($self) = @_;	1989	my ($self) = @_;
1740		1990
1741	# TODO: use animation	1991	# TODO: use animation
1742	if ($self->{state} = !$self->{state}) {	1992	if ($self->{state} = !$self->{state}) {
1743	$CFClient::UI::TOPLEVEL->add ($self->{other});	1993	$CFClient::UI::ROOT->add ($self->{other});
1744	$self->{other}->move (	1994	$self->{other}->move ($self->coord2global (0, $self->{h}));
1745	($::WIDTH - $self->{other}{w}) * 0.5,	1995	$self->emit ("open");
1746	($::HEIGHT - $self->{other}{h}) * 0.5,
1747	);
1748	} else {	1996	} else {
1749	$CFClient::UI::TOPLEVEL->remove ($self->{other});	1997	$CFClient::UI::ROOT->remove ($self->{other});
		1998	$self->emit ("close");
1750	}	1999	}
1751	}
1752		2000
1753	#############################################################################	2001	$self->emit (changed => $self->{state});
		2002	}
1754		2003
		2004	#############################################################################
		2005
1755	package CFClient::UI::Toplevel;	2006	package CFClient::UI::Root;
1756		2007
1757	our @ISA = CFClient::UI::Container::;	2008	our @ISA = CFClient::UI::Container::;
		2009
		2010	use SDL::OpenGL;
1758		2011
1759	sub size_request {	2012	sub size_request {
1760	($::WIDTH, $::HEIGHT)	2013	($::WIDTH, $::HEIGHT)
1761	}	2014	}
1762		2015
…		…
1767		2020
1768	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2021	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1769	for @{$self->{children}};	2022	for @{$self->{children}};
1770	}	2023	}
1771		2024
1772	sub translate {	2025	sub _topleft {
1773	my ($self, $x, $y) = @_;	2026	my ($self, $x, $y) = @_;
1774		2027
1775	($x, $y)	2028	($x, $y)
1776	}	2029	}
1777		2030
…		…
1785	sub add {	2038	sub add {
1786	my ($self, $widget) = @_;	2039	my ($self, $widget) = @_;
1787		2040
1788	$self->SUPER::add ($widget);	2041	$self->SUPER::add ($widget);
1789		2042
1790	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2043	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
		2044	}
		2045
		2046	sub on_refresh {
		2047	my ($self, $id, $cb) = @_;
		2048
		2049	$self->{refresh_hook}{$id} = $cb;
1791	}	2050	}
1792		2051
1793	sub draw {	2052	sub draw {
1794	my ($self) = @_;	2053	my ($self) = @_;
1795		2054
		2055	while (my $rcb = delete $self->{refresh_hook}) {
		2056	$_->() for values %$rcb;
		2057	}
		2058
		2059	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2060	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2061	glClear GL_COLOR_BUFFER_BIT;
		2062
		2063	glMatrixMode GL_PROJECTION;
		2064	glLoadIdentity;
		2065	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2066	glMatrixMode GL_MODELVIEW;
		2067	glLoadIdentity;
		2068
1796	$self->_draw;	2069	$self->_draw;
1797	}	2070	}
1798		2071
1799	#############################################################################	2072	#############################################################################
1800		2073
1801	package CFClient::UI;	2074	package CFClient::UI;
1802		2075
1803	$TOPLEVEL = new CFClient::UI::Toplevel;	2076	$ROOT = new CFClient::UI::Root;
1804		2077
1805	1	2078	1
1806		2079

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC vs. Revision 1.121 by root, Mon Apr 17 19:21:00 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC vs.
Revision 1.121 by root, Mon Apr 17 19:21:00 2006 UTC